From aa97f0d6aa08e97604ca1d1209d207e79b84a3d8 Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+BrayanDSO@users.noreply.github.com>
Date: Wed, 29 Jan 2025 21:54:04 -0300
Subject: [PATCH 001/200] docs: add `Get it on Obtainium` to README (#17899)

* docs: add `Get it on Obtainium` to README
* remove amazon since all builds there are outdated
    one of these days I want to add it back but until then...

---------

Co-authored-by: Mike Hardy <github@mikehardy.net>
---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 739c28ff3f86..f8ad83eec573 100644
--- a/README.md
+++ b/README.md
@@ -48,9 +48,9 @@ Install
     <img alt="Get it on F-Droid" height="80"
         src="docs/graphics/logos/f-droid-badge.png"></a>
 
-<a href="http://www.amazon.com/gp/product/B004L1G7T2/ref=mas_pm_ankidroid_flashcards">
-    <img alt="Get it on Amazon app store" height="80"
-        src="docs/graphics/logos/amazon-badge.png"/></a>
+<a href="http://apps.obtainium.imranr.dev/redirect.html?r=obtainium://add/https://github.com/ankidroid/Anki-Android">
+    <img alt="Get it on Obtainium" height="80"
+        src="https://github.com/user-attachments/assets/713d71c5-3dec-4ec4-a3f2-8d28d025a9c6"/></a>
 
 </div>
 

From f5b3d3331b9a497f25cf16875c8597d06aae9ded Mon Sep 17 00:00:00 2001
From: SanjaySargam <sargamsanjaykumar@gmail.com>
Date: Sun, 26 Jan 2025 14:58:14 +0530
Subject: [PATCH 002/200] Add support for sharing .txt files

---
 AnkiDroid/src/main/AndroidManifest.xml        | 26 +++++++++++++++++++
 .../main/java/com/ichi2/anki/IntentHandler.kt |  1 +
 2 files changed, 27 insertions(+)

diff --git a/AnkiDroid/src/main/AndroidManifest.xml b/AnkiDroid/src/main/AndroidManifest.xml
index 54f311368645..ee619491469d 100644
--- a/AnkiDroid/src/main/AndroidManifest.xml
+++ b/AnkiDroid/src/main/AndroidManifest.xml
@@ -228,6 +228,31 @@
                     android:pathPattern=".*\\.csv"
                     android:scheme="file"
                     />
+                <!-- text files -->
+                <data
+                    android:host="*"
+                    android:mimeType="*/*"
+                    android:pathPattern=".*\\.txt"
+                    android:scheme="http"
+                    />
+                <data
+                    android:host="*"
+                    android:mimeType="*/*"
+                    android:pathPattern=".*\\.txt"
+                    android:scheme="https"
+                    />
+                <data
+                    android:host="*"
+                    android:mimeType="*/*"
+                    android:pathPattern=".*\\.txt"
+                    android:scheme="content"
+                    />
+                <data
+                    android:host="*"
+                    android:mimeType="*/*"
+                    android:pathPattern=".*\\.txt"
+                    android:scheme="file"
+                    />
             </intent-filter>
             <!-- MIME type matcher for .apkg files coming from providers like gmail which hide the file extension -->
             <intent-filter>
@@ -244,6 +269,7 @@
                 <data android:mimeType="text/comma-separated-values"/>
                 <data android:mimeType="text/csv"/>
                 <data android:mimeType="text/tsv"/>
+                <data android:mimeType="text/plain"/>
             </intent-filter>
 
             <!-- Keep it separate as when sharing image AnkiDroid would be shown with Image Occlusion label -->
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/IntentHandler.kt b/AnkiDroid/src/main/java/com/ichi2/anki/IntentHandler.kt
index 6f2075c69247..70ce3e6fac71 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/IntentHandler.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/IntentHandler.kt
@@ -305,6 +305,7 @@ class IntentHandler : AbstractIntentHandler() {
                 "text/tsv",
                 "text/comma-separated-values",
                 "text/csv",
+                "text/plain",
             )
 
         private fun isValidViewIntent(intent: Intent): Boolean {

From 3f21e3c401dccac1b95f3bd32a6a3ff7568ecdd5 Mon Sep 17 00:00:00 2001
From: lukstbit <52494258+lukstbit@users.noreply.github.com>
Date: Mon, 3 Feb 2025 16:29:32 +0200
Subject: [PATCH 003/200] Fix several ActivityNotFoundExceptions

In certain screens of the app(like shared decks and account login) the
user could trigger an ACTION_VIEW from the content, which will
delegate to our custom tabs implementation. This will call the platform
launchUrl() method which would fail if there's no app to handle it.

Also added guards for the several extensions openUrl(), the check
AdaptionUtil.hasWebBrowser() is failing in a few cases.
---
 .../java/com/ichi2/anki/utils/AndroidUtils.kt | 20 +++++++++++++++++--
 .../customtabs/CustomTabActivityHelper.kt     | 10 +++++++++-
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/utils/AndroidUtils.kt b/AnkiDroid/src/main/java/com/ichi2/anki/utils/AndroidUtils.kt
index 6a3ccbbac8b7..d191a599f8ce 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/utils/AndroidUtils.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/utils/AndroidUtils.kt
@@ -14,6 +14,7 @@
 
 package com.ichi2.anki.utils
 
+import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
@@ -28,6 +29,7 @@ import com.ichi2.anki.showThemedToast
 import com.ichi2.anki.snackbar.showSnackbar
 import com.ichi2.utils.AdaptionUtil
 import com.ichi2.utils.copyToClipboard
+import timber.log.Timber
 
 /**
  * Acquire a wake lock and release it after running [block].
@@ -73,7 +75,16 @@ fun Context.openUrl(uri: Uri) {
         }
         return
     }
-    startActivity(Intent(Intent.ACTION_VIEW, uri))
+    try {
+        startActivity(Intent(Intent.ACTION_VIEW, uri))
+    } catch (ex: Exception) {
+        Timber.w("No app found to handle opening an external url from ${this::class.java.name}")
+        if (this is FragmentActivity) {
+            showSnackbar(R.string.activity_start_failed)
+        } else {
+            showThemedToast(this, R.string.activity_start_failed, false)
+        }
+    }
 }
 
 // necessary for Fragments that are BaseSnackbarBuilderProvider to work correctly
@@ -82,7 +93,12 @@ fun Fragment.openUrl(uri: Uri) {
         showSnackbar(getString(R.string.no_browser_msg, uri.toString()))
         return
     }
-    startActivity(Intent(Intent.ACTION_VIEW, uri))
+    try {
+        startActivity(Intent(Intent.ACTION_VIEW, uri))
+    } catch (ex: ActivityNotFoundException) {
+        Timber.w("No app found to handle opening an external url from ${Fragment::class.java.name}")
+        showSnackbar(R.string.activity_start_failed)
+    }
 }
 
 fun Fragment.openUrl(
diff --git a/AnkiDroid/src/main/java/com/ichi2/compat/customtabs/CustomTabActivityHelper.kt b/AnkiDroid/src/main/java/com/ichi2/compat/customtabs/CustomTabActivityHelper.kt
index 82e55eeb893e..382681ade7d9 100644
--- a/AnkiDroid/src/main/java/com/ichi2/compat/customtabs/CustomTabActivityHelper.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/compat/customtabs/CustomTabActivityHelper.kt
@@ -15,6 +15,7 @@
 package com.ichi2.compat.customtabs
 
 import android.app.Activity
+import android.content.ActivityNotFoundException
 import android.net.Uri
 import android.os.Bundle
 import androidx.annotation.CheckResult
@@ -23,6 +24,8 @@ import androidx.browser.customtabs.CustomTabsClient
 import androidx.browser.customtabs.CustomTabsIntent
 import androidx.browser.customtabs.CustomTabsServiceConnection
 import androidx.browser.customtabs.CustomTabsSession
+import com.ichi2.anki.R
+import com.ichi2.anki.snackbar.showSnackbar
 import timber.log.Timber
 
 /**
@@ -171,7 +174,12 @@ class CustomTabActivityHelper : ServiceConnectionCallback {
                 }
             } else {
                 customTabsIntent.intent.setPackage(packageName)
-                customTabsIntent.launchUrl(activity, uri)
+                try {
+                    customTabsIntent.launchUrl(activity, uri)
+                } catch (ex: ActivityNotFoundException) {
+                    Timber.w("No app found to handle opening an external url from CustomTabsActivityHelper")
+                    activity.showSnackbar(R.string.activity_start_failed)
+                }
             }
         }
 

From 36d72441509a8c566b14bb48dbcf5c39159e13f6 Mon Sep 17 00:00:00 2001
From: Arthur Milchior <arthur@milchior.fr>
Date: Thu, 30 Jan 2025 20:28:56 +0100
Subject: [PATCH 004/200] DeckOption become closable if it's not loaded

Currently, if you try to close the Deck Options before it's loaded,
the request `anki.deckOptionsPendingChanges()` can't be executed and
the deck options remain open.

With this change, the deck options is automatically closed. Indeed, if
the webview is not loaded, there was no change to save.

This is similar to Anki's implementation.

Co-authored-by: David Allison <62114487+david-allison@users.noreply.github.com>
---
 .../java/com/ichi2/anki/pages/DeckOptions.kt  | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/pages/DeckOptions.kt b/AnkiDroid/src/main/java/com/ichi2/anki/pages/DeckOptions.kt
index 4bc71fdd722c..6ed77bc31cc4 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/pages/DeckOptions.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/pages/DeckOptions.kt
@@ -46,7 +46,10 @@ import kotlinx.coroutines.withContext
 import timber.log.Timber
 
 @NeedsTest("15130: pressing back: icon + button should return to options if the manual is open")
+@NeedsTest("17905: pressing back before the webpage is ready closes the screen")
 class DeckOptions : PageFragment() {
+    private var webViewIsReady = false
+
     /**
      * Callback enabled when the manual is opened in the deck options.
      * It requests the webview to go back to the Deck Options.
@@ -68,11 +71,16 @@ class DeckOptions : PageFragment() {
         object : OnBackPressedCallback(true) {
             override fun handleOnBackPressed() {
                 Timber.v("DeckOptions: requesting the webview to handle the user close request.")
-                webView.evaluateJavascript("anki.deckOptionsPendingChanges()") {
-                    // Callback is handled in the WebView:
-                    //  * A 'discard changes' dialog may be shown, using confirm()
-                    //  * if no changes, or changes discarded, `deckOptionsRequireClose` is called
-                    //    which PostRequestHandler handles and calls on this fragment
+                if (webViewIsReady) {
+                    webView.evaluateJavascript("anki.deckOptionsPendingChanges()") {
+                        // Callback is handled in the WebView:
+                        //  * A 'discard changes' dialog may be shown, using confirm()
+                        //  * if no changes, or changes discarded, `deckOptionsRequireClose` is called
+                        //    which PostRequestHandler handles and calls on this fragment
+                    }
+                } else {
+                    // The webview is not yet loaded, no change could have occurred, we can safely close it.
+                    actuallyClose()
                 }
             }
         }
@@ -221,6 +229,7 @@ class DeckOptions : PageFragment() {
 
     fun onWebViewReady() {
         Timber.d("WebView ready to receive input")
+        webViewIsReady = true
         webView.isVisible = true
         pageLoadingIndicator.isVisible = false
     }

From b64ce1bb8284c81fd838b5a2823c0a7a0a1b15ef Mon Sep 17 00:00:00 2001
From: AnkiDroid Translations <ankidroid@ankidroid.org>
Date: Tue, 4 Feb 2025 19:34:43 +0000
Subject: [PATCH 005/200] Updated strings from Crowdin

---
 .../src/main/res/values-cs/02-strings.xml     |   2 +-
 .../src/main/res/values-cs/07-cardbrowser.xml |  12 +--
 .../src/main/res/values-cs/10-preferences.xml |   4 +-
 .../main/res/values-es-rAR/07-cardbrowser.xml |  18 ++--
 .../main/res/values-es-rAR/10-preferences.xml |  44 ++++----
 .../values-es-rAR/16-multimedia-editor.xml    |   8 +-
 .../values-es-rAR/20-search-preference.xml    |   2 +-
 AnkiDroid/src/main/res/values-fi/01-core.xml  |  32 +++---
 .../src/main/res/values-fi/02-strings.xml     | 100 +++++++++---------
 .../src/main/res/values-fi/03-dialogs.xml     |  76 ++++++-------
 .../src/main/res/values-fi/04-network.xml     |  10 +-
 .../src/main/res/values-fi/06-statistics.xml  |   2 +-
 .../src/main/res/values-fi/07-cardbrowser.xml |  24 ++---
 .../src/main/res/values-fi/08-widget.xml      |  22 ++--
 .../src/main/res/values-fi/09-backup.xml      |   2 +-
 .../src/main/res/values-fi/10-preferences.xml |  72 ++++++-------
 .../src/main/res/values-fi/11-arrays.xml      |   6 +-
 .../res/values-fi/16-multimedia-editor.xml    |   4 +-
 .../res/values-fi/20-search-preference.xml    |   4 +-
 AnkiDroid/src/main/res/values-heb/01-core.xml |   2 +-
 .../src/main/res/values-heb/02-strings.xml    |  12 +--
 .../main/res/values-heb/07-cardbrowser.xml    |  12 +--
 .../main/res/values-heb/10-preferences.xml    |   6 +-
 AnkiDroid/src/main/res/values-iw/01-core.xml  |   2 +-
 .../src/main/res/values-iw/02-strings.xml     |  12 +--
 .../src/main/res/values-iw/07-cardbrowser.xml |  12 +--
 .../src/main/res/values-iw/10-preferences.xml |   6 +-
 .../src/main/res/values-ja/07-cardbrowser.xml |  12 +--
 AnkiDroid/src/main/res/values-ka/01-core.xml  |  16 +--
 .../src/main/res/values-ka/02-strings.xml     |  32 +++---
 .../src/main/res/values-ka/03-dialogs.xml     |  28 ++---
 .../src/main/res/values-ka/04-network.xml     |   4 +-
 .../src/main/res/values-ka/06-statistics.xml  |   2 +-
 .../src/main/res/values-ka/07-cardbrowser.xml |  16 +--
 .../src/main/res/values-ka/08-widget.xml      |  10 +-
 .../src/main/res/values-ka/10-preferences.xml |  14 +--
 .../src/main/res/values-ka/11-arrays.xml      |   2 +-
 AnkiDroid/src/main/res/values-ru/01-core.xml  |   4 +-
 .../src/main/res/values-ru/02-strings.xml     |   8 +-
 .../src/main/res/values-ru/03-dialogs.xml     |   2 +-
 .../src/main/res/values-ru/07-cardbrowser.xml |  22 ++--
 .../src/main/res/values-ru/10-preferences.xml |  12 +--
 .../src/main/res/values-ru/11-arrays.xml      |   6 +-
 .../src/main/res/values-ug/07-cardbrowser.xml |  12 +--
 AnkiDroid/src/main/res/values-uk/01-core.xml  |   8 +-
 .../src/main/res/values-uk/02-strings.xml     |  12 +--
 .../src/main/res/values-uk/07-cardbrowser.xml |  14 +--
 .../src/main/res/values-uk/08-widget.xml      |   2 +-
 .../src/main/res/values-uk/10-preferences.xml |   8 +-
 .../marketdescription-uk.txt                  |   2 +-
 50 files changed, 378 insertions(+), 378 deletions(-)

diff --git a/AnkiDroid/src/main/res/values-cs/02-strings.xml b/AnkiDroid/src/main/res/values-cs/02-strings.xml
index 3320f16face5..8e7b302c3c68 100644
--- a/AnkiDroid/src/main/res/values-cs/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-cs/02-strings.xml
@@ -312,7 +312,7 @@
     <string name="show_notes" comment="Label for toggle notes button in BrowserOptionsDialog">Poznámky</string>
     <string name="toggle_cards_notes">Přepnout karty/poznámky</string>
     <string name="truncate_content_help">Zkrátit výšku každého řádku prohlížeče, aby se zobrazily pouze první 3 řádky obsahu</string>
-    <string name="browser_options_dialog_heading">Browser options</string>
+    <string name="browser_options_dialog_heading">Možnosti prohlížeče</string>
     <string name="audio_saved">Nahrávka uložena</string>
     <string name="deleting_selected_notes">Mažou se vybrané poznámky</string>
     <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Klepnutím na hlas poslechnout
diff --git a/AnkiDroid/src/main/res/values-cs/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-cs/07-cardbrowser.xml
index b19ae664c0af..6d2231ed8b54 100644
--- a/AnkiDroid/src/main/res/values-cs/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-cs/07-cardbrowser.xml
@@ -124,10 +124,10 @@
     <string name="edit_tags_dialog" comment="Description of the shortcut that opens the edit tags dialog">Edit tags dialog</string>
     <string name="show_order_dialog" comment="Description of the shortcut that shows the order dialog">Show order dialog</string>
     <!-- Manage columns dialog -->
-    <string name="browse_manage_columns_main_heading">Columns</string>
-    <string name="browse_manage_columns">Manage columns</string>
-    <string name="user_active_columns">Active</string>
-    <string name="user_potential_columns">Available</string>
-    <string name="include_column">Include column</string>
-    <string name="exclude_column">Exclude column</string>
+    <string name="browse_manage_columns_main_heading">Sloupce</string>
+    <string name="browse_manage_columns">Spravovat sloupce</string>
+    <string name="user_active_columns">Aktivní</string>
+    <string name="user_potential_columns">Dostupné</string>
+    <string name="include_column">Přidat sloupec</string>
+    <string name="exclude_column">Odebrat sloupec</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-cs/10-preferences.xml b/AnkiDroid/src/main/res/values-cs/10-preferences.xml
index 94177b8b216a..4e64a9d8da8b 100644
--- a/AnkiDroid/src/main/res/values-cs/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-cs/10-preferences.xml
@@ -372,8 +372,8 @@
     <string name="ignore_display_cutout" maxLength="41">Ignorovat výřez displeje</string>
     <string name="hide_answer_buttons" maxLength="41">Skrýt tlačítka odpovědí</string>
     <string name="hide_hard_and_easy" maxLength="41">Skrýt tlačítka „Těžké“ a „Snadné“</string>
-    <string name="reviewer_frame_style" maxLength="41">Frame style</string>
-    <string name="reviewer_frame_style_card" maxLength="41" comment="Style name of the \'Card\' card frame of the Reviewer">Card</string>
+    <string name="reviewer_frame_style" maxLength="41">Styl rámečku</string>
+    <string name="reviewer_frame_style_card" maxLength="41" comment="Style name of the \'Card\' card frame of the Reviewer">Karta</string>
     <string name="reviewer_frame_style_box" maxLength="41" comment="Style name of the \'Box\' card frame of the Reviewer">Box</string>
     <!--Keyboard shortcuts dialog-->
     <string name="open_settings" comment="Description of the shortcut that opens the app settings">Open settings</string>
diff --git a/AnkiDroid/src/main/res/values-es-rAR/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-es-rAR/07-cardbrowser.xml
index 9cb7af618673..f71609d53ac8 100644
--- a/AnkiDroid/src/main/res/values-es-rAR/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-es-rAR/07-cardbrowser.xml
@@ -105,17 +105,17 @@
         <item quantity="other">Exportar notas</item>
     </plurals>
     <plurals name="card_browser_cards_deleted">
-        <item quantity="one">Tarjeta %d eliminada</item>
+        <item quantity="one">%d tarjeta eliminada</item>
         <item quantity="other">%d tarjetas eliminadas</item>
     </plurals>
     <!--Keyboard shortcuts dialog-->
-    <string name="edit_tags_dialog" comment="Description of the shortcut that opens the edit tags dialog">Editar diálogo de etiquetas</string>
-    <string name="show_order_dialog" comment="Description of the shortcut that shows the order dialog">Mostrar diálogo de orden</string>
+    <string name="edit_tags_dialog" comment="Description of the shortcut that opens the edit tags dialog">Editar etiquetas del diálogo</string>
+    <string name="show_order_dialog" comment="Description of the shortcut that shows the order dialog">Mostrar orden del diálogo</string>
     <!-- Manage columns dialog -->
-    <string name="browse_manage_columns_main_heading">Columns</string>
-    <string name="browse_manage_columns">Manage columns</string>
-    <string name="user_active_columns">Active</string>
-    <string name="user_potential_columns">Available</string>
-    <string name="include_column">Include column</string>
-    <string name="exclude_column">Exclude column</string>
+    <string name="browse_manage_columns_main_heading">Columnas</string>
+    <string name="browse_manage_columns">Administrar columnas</string>
+    <string name="user_active_columns">Activo</string>
+    <string name="user_potential_columns">Disponible</string>
+    <string name="include_column">Incluir columna</string>
+    <string name="exclude_column">Excluir columna</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-es-rAR/10-preferences.xml b/AnkiDroid/src/main/res/values-es-rAR/10-preferences.xml
index a5b4bdc4e409..0e70569e3799 100644
--- a/AnkiDroid/src/main/res/values-es-rAR/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-es-rAR/10-preferences.xml
@@ -47,10 +47,10 @@
     <!-- generic strings -->
     <string name="disabled">Deshabilitado</string>
     <plurals name="pref_summ_minutes">
-        <item quantity="one">%d min</item>
-        <item quantity="other">%d mins</item>
+        <item quantity="one">%d minuto</item>
+        <item quantity="other">%d minutos</item>
     </plurals>
-    <string name="pref_milliseconds">%s ms</string>
+    <string name="pref_milliseconds">%s milisegundos</string>
     <!-- TODO: move to 20-search-preference so we can contribute upstream (searchpreference_no_results)-->
     <string name="pref_search_no_results">Sin resultados</string>
     <!-- preferences.xml categories-->
@@ -58,7 +58,7 @@
     <string name="pref_cat_studying" maxLength="41">Estudiando</string>
     <string name="pref_cat_system_wide" maxLength="41">Todo el sistema</string>
     <string name="pref_cat_reviewing" maxLength="41">Repasando</string>
-    <string name="pref_cat_sync" comment="title of the sync preferences category" maxLength="41">Sincronización</string>
+    <string name="pref_cat_sync" comment="title of the sync preferences category" maxLength="41">Sincronizar</string>
     <string name="pref_cat_scheduling" maxLength="41">Programación</string>
     <string name="pref_cat_whiteboard" maxLength="41">Pizarra</string>
     <string name="pref_cat_appearance" maxLength="41">Apariencia</string>
@@ -98,7 +98,7 @@
     <string name="gestures_corner_touch" maxLength="41">Toque de 9 puntos</string>
     <string name="gestures_corner_touch_summary">Permitir gestos táctiles en las esquinas de pantalla</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Panel de navegación a pantalla completa</string>
-    <string name="gestures_fullscreen_nav_drawer_summary">Abrir el cajón de navegación cuando se desliza a la derecha desde cualquier lugar de la pantalla</string>
+    <string name="gestures_fullscreen_nav_drawer_summary">Abrir el panel de navegación cuando se desliza a la derecha desde cualquier lugar de la pantalla</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Ninguno</string>
     <string name="gestures_swipe_up" maxLength="41">Deslizar hacia arriba</string>
     <string name="gestures_swipe_down" maxLength="41">Deslizar hacia abajo</string>
@@ -115,9 +115,9 @@
     <string name="gestures_corner_tap_middle_center" maxLength="41">Tocar el centro</string>
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Tocar abajo a la izquierda</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Tocar abajo a la derecha</string>
-    <string name="gestures_shake" maxLength="41">Agitar el dispositivo</string>
-    <string name="card_browser_enable_external_context_menu">Menú ‘%s’</string>
-    <string name="card_browser_enable_external_context_menu_summary">Habilita globalmente el menú contextual ‘%s</string>
+    <string name="gestures_shake" maxLength="41">Sacudir dispositivo</string>
+    <string name="card_browser_enable_external_context_menu">‘%s’ Menú </string>
+    <string name="card_browser_enable_external_context_menu_summary">Habilitar globalmente el menú contextual ‘%s</string>
     <string name="double_scrolling_gap" maxLength="41">Doble desplazamiento</string>
     <string name="double_scrolling_gap_summ">Doblar la distancia de desplazamiento con e-Reader</string>
     <string name="swipe_sensitivity" maxLength="41">Sensibilidad de deslizado</string>
@@ -137,7 +137,7 @@
     <string name="metered_sync_title" maxLength="41">Permitir sincronización en conexiones medidas</string>
     <string name="metered_sync_summary">Si está deshabilitado, serás avisado si intentas sincronizar con una conexión medida</string>
     <string name="backup_limits_frequency">Frecuencia</string>
-    <string name="backup_limits_lifetime">Tiempo de vida</string>
+    <string name="backup_limits_lifetime">Duración</string>
     <string name="app_theme" maxLength="41">Tema</string>
     <string name="day_theme" maxLength="41">Tema del día</string>
     <string name="night_theme" maxLength="41">Tema nocturno</string>
@@ -151,7 +151,7 @@
     <string name="notification_minimum_cards_due_vibrate" maxLength="41">Vibrar</string>
     <string name="notification_minimum_cards_due_blink" maxLength="41">Luz parpadeante</string>
     <string name="select_locale_title">Seleccionar idioma</string>
-    <string name="software_render" maxLength="41">Deshabilitar el procesamiento de hardware de la tarjeta</string>
+    <string name="software_render" maxLength="41">Desactivar el hardware de la tarjeta</string>
     <string name="software_render_summ">El procesamiento de hardware es más rápido, pero puede tener problemas, específicamente en Android 8/8.1. Si no puede ver partes de la interfaz de usuario de la tarjeta, prueba esta opción.</string>
     <string name="safe_display" maxLength="41">Modo de visualización segura</string>
     <string name="safe_display_summ">Desactiva todas las animaciones y utiliza un método más seguro para presentar las tarjetas. Los dspositivos de tinta electrónica (e-ink) podrían requerir esta opción.</string>
@@ -160,10 +160,10 @@
     <string name="disable_extended_text_ui_summ">Permite el menú contextual \'huecos\' cuando está en modo horizontal.</string>
     <string name="vertical_centering" maxLength="41">Alinear al centro</string>
     <string name="vertical_centering_summ">Centra verticalmente el contenido de las tarjetas</string>
-    <string name="pref_double_tap_time_interval" maxLength="41">Intervalo de tiempo de doble toque (ms)</string>
+    <string name="pref_double_tap_time_interval" maxLength="41">Intervalo de tiempo de doble toque (milisegundos)</string>
     <string name="pref_double_tap_time_interval_summary">Un segundo toque de los botones de respuesta será ignorado si este tiempo no ha transcurrido. Esto previene doble toque accidental.</string>
     <string name="pref_show_answer_long_press_time" maxLength="41">Tiempo de pulsación larga para mostrar respuesta</string>
-    <string name="pref_show_answer_long_press_time_summary">Tiempo mínimo de pulsación antes de que el botón Mostrar Respuesta registre un toque.</string>
+    <string name="pref_show_answer_long_press_time_summary">Tiempo mínimo de presión antes de que el botón mostrar respuesta registre un toque.</string>
     <string name="show_estimates" maxLength="41">Mostar el botón tiempo</string>
     <string name="show_estimates_summ">Mostrar el tiempo para el próximo repaso encima de los botones de respuesta</string>
     <string name="show_large_answer_buttons" maxLength="41">Mostrar botones de respuestas grandes</string>
@@ -172,14 +172,14 @@
     <string name="show_top_bar_summary">Mostrar recuento de cartas, temporizador de respuesta, bandera y marca en la barra superior</string>
     <string name="show_progress" maxLength="41">Mostar restantes</string>
     <string name="show_progress_summ">Mostrar contador de tarjetas restantes</string>
-    <string name="show_eta" maxLength="41">Mostrar tiempo restante</string>
+    <string name="show_eta" maxLength="41">Mostrar ETA</string>
     <string name="show_eta_summ">Mostrar tiempo restante</string>
     <string name="use_current" maxLength="41">Mazo para nuevas tarjetas</string>
     <string name="learn_cutoff" maxLength="41">Aprender antes del límite</string>
     <string name="time_limit" maxLength="41">Límite de tiempo para Timebox</string>
-    <string name="day_offset_with_description" maxLength="41">Comienzo del día siguiente (0 es medianoche, 23 es 11PM)</string>
+    <string name="day_offset_with_description" maxLength="41">Comienzo del siguiente día</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
-        <item quantity="one">%d hora después de medianoche</item>
+        <item quantity="one">%d hour past midnight</item>
         <item quantity="other">%d horas después de medianoche</item>
     </plurals>
     <string name="pref_keep_screen_on" maxLength="41">Mantener la pantalla encendida</string>
@@ -282,7 +282,7 @@
     <string name="card_side_selection_title">Selecciona el lado de la tarjeta</string>
     <string name="card_side_question">Pregunta</string>
     <string name="card_side_answer">Respuesta</string>
-    <string name="card_side_both" maxLength="28">Preguntas y respuestas</string>
+    <string name="card_side_both" maxLength="28">Pregunta &amp; Respuesta</string>
     <string name="display_binding_card_side_question" comment="When displaying a key bind on a preference this formatter is used if the bind only applies to the question">P: %s</string>
     <string name="display_binding_card_side_answer" comment="When displaying a key bind on a preference this formatter is used if the bind only applies to the answer">R: %s</string>
     <string name="display_binding_card_side_both" comment="When displaying a key bind on a preference this formatter is used if the bind only applies to both the question and the answer">%s</string>
@@ -291,7 +291,7 @@
     <string name="bindings_already_bound">Ya vinculado a %s</string>
     <!-- Advanced -->
     <string name="pref_cat_experimental" maxLength="41" tools:ignore="UnusedResources">Experimental</string>
-    <string name="readtext_deprecation_warn">¡AnkiDroid ha introducido un mecanismo texto a voz mejor que es compatible con otros clientes Anki y que incluye más voces y mejoras de reproducción de idioma!\n\nPor favor actualice lo antes posible, ya que pronto se quitará esta configuración.</string>
+    <string name="readtext_deprecation_warn">¡AnkiDroid ha introducido un mecanismo de texto a voz mejor que es compatible con otros clientes Anki y que incluye más voces y mejoras de reproducción de idioma!\n\nPor favor actualice lo antes posible, ya que pronto se quitará esta configuración.</string>
     <string name="readtext_reviewer_warn" tools:ignore="UnusedResources">Por favor actualice al formato de texto a voz nuevo.</string>
     <!-- Developer options -->
     <string name="pref_cat_dev_options" maxLength="41">Opciones de desarrollador</string>
@@ -303,9 +303,9 @@
          #################################### Backup options ###################################
          ####################################################################################### -->
     <string name="pref__backups_help__summary"><![CDATA[AnkiDroid crea copias de seguridad de tu colección periódicamente.
-Si las copias tienen más de dos días de edad,
+Si las copias tienen más de dos días de antugüedad,
 AnkiDroid empezará a eliminar algunas de ellas para liberar espacio de almacenamiento.
-<br><br>
+ <br><br>
 Ten en cuenta que los archivos multimedia no son respaldados.
 Para estar seguro, por favor sincroniza tu colección periódicamente o crea copias de seguridad de su exportación.
 <br><br>
@@ -317,12 +317,12 @@ Puedes restaurar una colección desde una copia de seguridad en el menú de la l
     <!-- #######################################################################################
          ################################# Manage space activity ###############################
          ####################################################################################### -->
-    <string name="pref__manage_space__screen_title">Administrar espacio</string>
+    <string name="pref__manage_space__screen_title">Gestionar espacio</string>
     <!-- TextWidgetPreference widget text -->
     <string name="pref__widget_text__error" comment="Text in a small box on the end of a preference, indicating a generic error.         Must be VERY short. Can be one or two lines.">Error</string>
     <string name="pref__widget_text__calculating" comment="Text in a small box on the end of a preference,         indicating that the value, such as folder size on disk, is being calculated.         Must be VERY short. Can be one or two lines.">Calcu-\nlando&#8230;</string>
     <plurals name="pref__widget_text__n_files_n_bytes" comment="Text in a small box on the end of a preference,         showing some statistics about a folder on disk if a form of “12 files\n26 MB”.         Must be VERY short. Can be one or two lines.">
-        <item quantity="one">%1$d archivo\n%2$s</item>
+        <item quantity="one">%1$d file\n%2$s</item>
         <item quantity="other">%1$d archivos\n%2$s</item>
     </plurals>
     <!-- Delete unused media -->
@@ -346,7 +346,7 @@ Puedes restaurar una colección desde una copia de seguridad en el menú de la l
     <string name="dialog__delete_everything__message" comment="“Close the window” here refers to the activity that the user is currently seeing.         Deleting app data forcibly closes AnkiDroid, which closes the activity without animation.         On some devices the entire settings app may be closed.         User might not realize that this activity comes directly from AnkiDroid,         so it might be wise to avoid words such as “AnkiDroid or “app”.">¿Estás seguro de que quieres eliminar todos los datos? Esto incluye tu colección, archivos multimedia, copias de seguridad y preferencias.\n\nTen en cuenta: esta acción cerrará la ventana.</string>
     <!-- Delete app data -->
     <string name="pref__delete_app_data__title" maxLength="41" comment="Preference title">Eliminar datos de la aplicación</string>
-    <string name="pref__delete_app_data__summary">Eliminar los ajustos y otros datos de la aplicación</string>
+    <string name="pref__delete_app_data__summary">Eliminar los ajustes y otros datos de la aplicación</string>
     <string name="dialog__delete_app_data__title" comment="Confirmation dialog title">Eliminar datos de la aplicación</string>
     <string name="dialog__delete_app_data__message" comment="“Close the window” here refers to the activity that the user is currently seeing.         Deleting app data forcibly closes AnkiDroid, which closes the activity without animation.         On some devices the entire settings app may be closed.         User might not realize that this activity comes directly from AnkiDroid,         so it might be wise to avoid words such as “AnkiDroid or “app”.">¿Estás seguro de que quieres eliminar los datos de la aplicación? Esto incluye tus preferencias y otros datos.\n\nTen en cuenta: esta acción cerrará la ventana.</string>
     <!-- #######################################################################################
diff --git a/AnkiDroid/src/main/res/values-es-rAR/16-multimedia-editor.xml b/AnkiDroid/src/main/res/values-es-rAR/16-multimedia-editor.xml
index 9db2508020ce..b77e83e44112 100644
--- a/AnkiDroid/src/main/res/values-es-rAR/16-multimedia-editor.xml
+++ b/AnkiDroid/src/main/res/values-es-rAR/16-multimedia-editor.xml
@@ -59,7 +59,7 @@
     <!-- General -->
     <!-- not a good message, when an unexpected error happens -->
     <string name="multimedia_editor_something_wrong">Algo salió mal</string>
-    <string name="multimedia_editor_png_paste_error">Error al convertir la imagen del portapapeles a png: %s</string>
+    <string name="multimedia_editor_png_paste_error">Error al convertir la imagen del portapapeles a PNG: %s</string>
     <string name="multimedia_editor_attach_mm_content" comment="used for screen readers. Not visible to the user">Agregar contenido multimedia al campo %1$s</string>
     <!-- Audio view -->
     <!-- Message when recording fails -->
@@ -69,8 +69,8 @@
     <!-- Crop function-->
     <string name="crop_image">¿Quieres recortar esta imagen?</string>
     <string name="crop_button" maxLength="28">Recortar imagen</string>
-    <string name="save_dialog_content">El tamaño actual de la imagen es %sMB. El límite de tamaño de imagen por defecto es 1MB. ¿Deseas comprimirla?</string>
-    <string name="select_image_failed">"Error al seleccionar la imagen. Vuelve a intentarlo"</string>
-    <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Contenidos del campo</string>
+    <string name="save_dialog_content">El tamaño actual de la imagen es %sMB. El límite de tamaño de imagen por defecto es 1MB. ¿Querés comprimirla?</string>
+    <string name="select_image_failed">"Error al seleccionar la imagen. Intentalo de nuevo"</string>
+    <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Contenidos de Campo</string>
     <string name="reselect" maxLength="28">Seleccionar de nuevo</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-es-rAR/20-search-preference.xml b/AnkiDroid/src/main/res/values-es-rAR/20-search-preference.xml
index 0f6f1519fb59..bb3170c585d4 100644
--- a/AnkiDroid/src/main/res/values-es-rAR/20-search-preference.xml
+++ b/AnkiDroid/src/main/res/values-es-rAR/20-search-preference.xml
@@ -61,5 +61,5 @@
 -->
 <resources xmlns:tools="http://schemas.android.com/tools">
     <string tools:ignore="UnusedResources" name="searchpreference_search" comment="By submitting this string, you license it under the MIT License">Buscar&#8230;</string>
-    <string tools:ignore="UnusedResources" name="searchpreference_clear_history" comment="By submitting this string, you license it under the MIT License">Vaciar historia</string>
+    <string tools:ignore="UnusedResources" name="searchpreference_clear_history" comment="By submitting this string, you license it under the MIT License">Limpiar historial</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-fi/01-core.xml b/AnkiDroid/src/main/res/values-fi/01-core.xml
index 4420fc0fe4f9..8b337539ad00 100644
--- a/AnkiDroid/src/main/res/values-fi/01-core.xml
+++ b/AnkiDroid/src/main/res/values-fi/01-core.xml
@@ -61,12 +61,12 @@
         <item quantity="other">%d minuuttia jäljellä</item>
     </plurals>
     <plurals name="reviewer_window_title_hours_new">
-        <item quantity="one">%1$d hour %2$d left</item>
-        <item quantity="other">%1$d hours %2$d left</item>
+        <item quantity="one">%1$d tunti %2$d jäljellä</item>
+        <item quantity="other">%1$d tuntia %2$d jäljellä</item>
     </plurals>
     <plurals name="reviewer_window_title_days_new">
-        <item quantity="one">%1$d day %2$dh left</item>
-        <item quantity="other">%1$d days %2$dh left</item>
+        <item quantity="one">%1$d päivä %2$d tunti(a) jäljellä</item>
+        <item quantity="other">%1$d päivää %2$d tunti(a) jäljellä</item>
     </plurals>
     <string name="no_cards_placeholder_title">Kokoelma on tyhjä</string>
     <string name="no_cards_placeholder_description">Aloita korttien lisääminen\nkäyttäen + kuvaketta</string>
@@ -88,7 +88,7 @@
     <string name="rename_deck" maxLength="28">Nimeä pakka uudelleen</string>
     <string name="create_shortcut">Luo pikakuvake</string>
     <string name="browse_cards">Selaa kortteja</string>
-    <string name="edit_deck_description" comment="edit the deck description">Edit description</string>
+    <string name="edit_deck_description" comment="edit the deck description">Muuta kuvausta</string>
     <string name="menu_add" comment="A generic add button. Please inform us if you need more specific strings" maxLength="28">Lisää</string>
     <string name="menu_add_note" maxLength="28">Lisää merkintä</string>
     <string name="menu_my_account" comment="Label of the window in which the user should enter their account. This text can\'t be found in AnkiDroid directly.">Synkronoi tili</string>
@@ -101,15 +101,15 @@
     <string name="menu_suspend" maxLength="28">Keskeytä</string>
     <string name="menu_delete_note" maxLength="28">Poista merkintä</string>
     <string name="menu_flag" maxLength="41">Lippu</string>
-    <string name="rename_flag">Rename flags</string>
+    <string name="rename_flag">Nimeä liput uudelleen</string>
     <string name="menu_flag_card" maxLength="28">Lisää lippu</string>
     <string name="menu_edit_tags" maxLength="28">Muokkaa tageja</string>
     <string name="delete_note_message">Haluatko varmasti poistaa tämän merkinnän ja kaikki sen kortit?\n%s</string>
     <string name="menu_search" maxLength="28">Haku %1$s</string>
     <string name="menu_mark_note" maxLength="28">Merkitse merkintä</string>
     <string name="menu_unmark_note">Poista merkintä</string>
-    <string name="menu_enable_voice_playback" maxLength="28">Enable voice playback</string>
-    <string name="menu_disable_voice_playback">Disable voice playback</string>
+    <string name="menu_enable_voice_playback" maxLength="28">Ota äänten toisto käyttöön</string>
+    <string name="menu_disable_voice_playback">Poista äänten toisto käytöstä</string>
     <string name="new_deck">Uusi pakka</string>
     <string name="new_dynamic_deck">Uusi suodatettu pakka</string>
     <string name="directory_inaccessible">AnkiDroidin hakemisto ei ole käytettävissä</string>
@@ -129,8 +129,8 @@
     <string name="empty_deck">Tämä pakka on tyhjä</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Hae pakkaa</string>
     <string name="invalid_deck_name">Virheellinen pakan nimi</string>
-    <string name="studyoptions_congrats_finished">Congratulations! You have finished for today.</string>
-    <string name="studyoptions_congrats_next_due_in" comment="The param will be replaced with \'The next card will be ready in X time\'">Deck finished for now! %s</string>
+    <string name="studyoptions_congrats_finished">Onnittelut! Homma hoidettu tämän päivän osalta.</string>
+    <string name="studyoptions_congrats_next_due_in" comment="The param will be replaced with \'The next card will be ready in X time\'">Pakka on nyt valmis! %s</string>
     <string name="studyoptions_no_cards_due">Kortteja ei tarvitse vielä kerrata</string>
     <string name="sd_card_not_mounted">Laitteen tallennustilaa ei ole kiinnitetty</string>
     <string name="button_sync" comment="Text of the sync button" maxLength="28">Synkronoi</string>
@@ -138,9 +138,9 @@
     <string name="continue_sync" tools:ignore="UnusedResources">Jatka synkronointia</string>
     <string name="sync_cancelled" tools:ignore="UnusedResources">Synkronointi peruutettu</string>
     <string name="sync_cancel_message" tools:ignore="UnusedResources">Peruutetaan&#8230;\nTämä voi kestää jonkin aikaa.</string>
-    <string name="syncing_media">Syncing media</string>
+    <string name="syncing_media">Synkronoidaan mediaa</string>
     <string name="export_deck" maxLength="28">Vie pakka</string>
-    <string name="export_collection">Export collection</string>
+    <string name="export_collection">Vie kokoelma</string>
     <string name="nothing">Ei mitään</string>
     <!-- Card template editor -->
     <string name="title_activity_template_editor">Korttityyppi</string>
@@ -184,7 +184,7 @@
     <string name="error__etc__cannot_write_to_or_create_file">Tiedostoon %s kirjoittaminen tai sen luominen epäonnistui</string>
     <string name="directory_inaccessible_after_uninstall" comment="Dialog title if AnkiDroid can\'t access the collection once the app is installed">Kokoelma ei ole saavutettavissa</string>
     <string name="directory_inaccessible_after_uninstall_summary" comment="the parameter is the path to the AnkiDroid folder. Typically /storage/emulated/0/AnkiDroid">Emme pääse käsiksi kokoelmiisi sen jälkeen, kun AnkiDroid on poistettu Play Storen käytäntöjen muutoksen vuoksi\n\nTietosi ovat turvassa ja ne voidaan palauttaa. Ne sijaitsevat polussa\n%s\n\n\nPalauta valitsemalla alla olevista vaihtoehdoista:</string>
-    <string name="directory_revoked_after_inactivity" comment="the first parameter is WRITE_EXTERNAL_STORAGE the second parameter is the path to the AnkiDroid folder. Typically /storage/emulated/0/AnkiDroid">Android has removed AnkiDroid\'s %1$s permission due to app inactivity.\n\nYour data is safe and can be restored. It is located at\n%2$s\n\nSelect an option below to restore:</string>
+    <string name="directory_revoked_after_inactivity" comment="the first parameter is WRITE_EXTERNAL_STORAGE the second parameter is the path to the AnkiDroid folder. Typically /storage/emulated/0/AnkiDroid">Android on poistanut AnkiDroidin %1$s -käyttöoikeuden koska sovellusta ei ole käytetty.\n\nTietosi ovat turvassa ja ne voidaan palauttaa. Sijainti:\n%2$s\n\nValitse vaihtoehto alla palauttaaksesi:</string>
     <string name="restore_data_from_ankiweb">Palauta AnkiWebistä (suositellaan)</string>
     <string name="install_non_play_store_ankidroid_recommended">Palauta kansion käyttöoikeus (suositellaan)</string>
     <string name="install_non_play_store_ankidroid">Palauta kansion käyttöoikeus (edistyneille käyttäjille)</string>
@@ -196,8 +196,8 @@
     <string name="storage_access_title">Tallennustilan käyttöoikeus</string>
     <string name="storage_access_summary">Tallentaa kokoelmasi turvalliseen paikkaan, jota ei poisteta, jos sovellus poistetaan.</string>
     <string name="all_files_access_title" comment="Name of the “All files access” permission from Android 10 and after">Pääsy kaikkiin tiedostoihin</string>
-    <string name="image_occlusion">Image Occlusion</string>
-    <string name="remove_account" comment="open a website to start the deletion of an AnkiWeb account">Remove account</string>
+    <string name="image_occlusion">Kuvien peitto</string>
+    <string name="remove_account" comment="open a website to start the deletion of an AnkiWeb account">Poista tili</string>
     <!-- Instant Note Editor -->
-    <string name="instant_card" comment="This does not need to be translated literally, translate the concept of quickly adding a Cloze note with a popup. Used in the Android system context menu/share dialog.">Instant card</string>
+    <string name="instant_card" comment="This does not need to be translated literally, translate the concept of quickly adding a Cloze note with a popup. Used in the Android system context menu/share dialog.">Pikakortti</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-fi/02-strings.xml b/AnkiDroid/src/main/res/values-fi/02-strings.xml
index 9504384260d5..4551407291a0 100644
--- a/AnkiDroid/src/main/res/values-fi/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fi/02-strings.xml
@@ -84,14 +84,14 @@
     <!-- Custom study options -->
     <string name="custom_study_limit_tags">Rajoitu tiettyhin tunnisteisiin</string>
     <plurals name="studyoptions_buried_count">
-        <item quantity="one">+%d buried</item>
-        <item quantity="other">+%d buried</item>
+        <item quantity="one">+%d haudattu</item>
+        <item quantity="other">+%d haudattu</item>
     </plurals>
-    <string name="studyoptions_total_new_label">Total new cards</string>
-    <string name="studyoptions_total_label">Total cards</string>
+    <string name="studyoptions_total_new_label">Uusia kortteja yhteensä</string>
+    <string name="studyoptions_total_label">Kortteja yhteensä</string>
     <!-- Card editor -->
     <string name="cardeditor_title_edit_card" maxLength="28">Muokkaa muistiinpanoa</string>
-    <string name="discard">Discard</string>
+    <string name="discard">Hylkää</string>
     <string name="note_editor_no_cards_created">Kortteja ei luotu. Täytä lisää kenttiä</string>
     <string name="note_editor_no_cards_created_all_fields">Nykyistä muistiinpanotyyppiä käyttäviä kortteja ei ole.\nValitse toinen muistiinpanotyyppi tai valitse \"Kortit\" ja lisää korvaava kenttä.</string>
     <string name="note_editor_insert_cloze_no_cloze_note_type">Aukkotehtävät toimivat vain aukkotehtävätyyppisissä muistiinpanoissa</string>
@@ -102,7 +102,7 @@
     <string name="select">Valitse</string>
     <string name="field_remapping">%1$s (”%2$s”:sta)</string>
     <string name="confirm_map_cards_to_nothing">Kortit, joita ei ole liitetty mihinkään, poistetaan. Jos muistiinpanoon ei liity jäljelle jääviä kortteja, se katoaa. Oletko varma, että haluat jatkaa?</string>
-    <string name="missing_note_type">No note type found</string>
+    <string name="missing_note_type">Muistiinpanotyyppejä ei löytynyt</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Aikaikkuna saavutettu</string>
     <plurals name="timebox_reached">
@@ -120,7 +120,7 @@
     <string name="card_editor_reset_card" maxLength="28">Tyhjennä edistyminen</string>
     <string name="card_editor_reschedule_card" comment="Action to reschedule a card" maxLength="28">Ajasta uudelleen</string>
     <string name="card_editor_preview_card" comment="Button offering to preview some card(s)" maxLength="28">Esikatselu</string>
-    <string name="copy_as_markdown" comment="Copies text to the clipboard as Markdown" maxLength="28">Copy as Markdown</string>
+    <string name="copy_as_markdown" comment="Copies text to the clipboard as Markdown" maxLength="28">Kopioi Markdownina</string>
     <string name="preview_progress_bar_text" comment="What card we are on out of how many in card previewer progress bar">%1$d / %2$d</string>
     <string name="rename" comment="Confirm that the renaming action should be processed." maxLength="28">Nimeä uudelleen</string>
     <string name="checks_action" maxLength="28">Tarkista</string>
@@ -131,7 +131,7 @@
     <string name="delete_deck">Poistetaan pakka&#8230;</string>
     <string name="info_rate">Arvostele AnkiDroid</string>
     <string name="import_title">Tuodaan</string>
-    <string name="import_preparing_file">Preparing file for import&#8230;</string>
+    <string name="import_preparing_file">Valmistellaan tiedostoa tuontiin&#8230;</string>
     <string name="import_message_add" comment="Adding a new deck to the collection (import)">Lisää</string>
     <string name="import_message_replace_confirm">Poistetaan nykyinen kokoelma ja korvataan se tiedoston %s tiedoilla. Haluatko varmasti jatkaa?</string>
     <string name="import_dialog_message_add">Lisää “%s” kokoelmaan? Tässä voi kestää kauan</string>
@@ -159,7 +159,7 @@
         ]]></string>
     <string name="export_choice_share">Jaa</string>
     <string name="export_choice_save_to">Tallenna&#8230;</string>
-    <string name="export_saving_exported_collection">Saving exported file&#8230;</string>
+    <string name="export_saving_exported_collection">Tallennetaan viety tiedosto&#8230;</string>
     <string name="study_options" comment="Name for a preference category in Filtered deck (aka Cram deck, aka Custom study) options" maxLength="28">Valinnat</string>
     <string name="menu__deck_options" maxLength="28">Pakan asetukset</string>
     <string name="menu__study_options" comment="Menu item that opens options for a Filtered deck (aka Cram deck, aka Custom study)">Opiskeluasetukset</string>
@@ -181,13 +181,13 @@
     <!-- Import and export v2 feedback -->
     <string name="activity_start_failed">Järjestelmään ei ole asennettu sovellusta, joka voisi suorittaa tämän toiminnon.</string>
     <string name="multimedia_editor_image_compression_failed"><![CDATA[Kameran kuvat voivat olla suuria. Voit halutessasi pakata mediahakemistossa olevia kuvia ja muuttaa niiden kokoa.]]></string>
-    <string name="no_browser_msg">No browser found for opening the link: %s</string>
+    <string name="no_browser_msg">Selainta ei löytynyt linkin avaamiseksi: %s</string>
     <string name="web_page_error">Virhe ladattaessa sivua: %s</string>
     <!-- The name of the deck which corrupt cards will be moved to -->
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Tausta</string>
     <string name="choose_an_image" maxLength="41">Valitse kuva</string>
-    <string name="remove_background_image">Remove background?</string>
+    <string name="remove_background_image">Poistetaanko tausta?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Palauta oletusarvot</string>
     <string name="reviewer_tts_cloze_spoken_replacement">Tyhjä</string>
@@ -230,9 +230,9 @@
     <string name="edit_toolbar_item">Muokkaa työkalupalkin kohdetta</string>
     <string name="toolbar_item_explain_edit_or_remove">Kirjoita HTML, joka lisätään ennen ja jälkeen valitun tekstin\n\nPaina työkalupalkin kohdetta pitkään muokataksesi sitä tai poistaaksesi sen</string>
     <string name="remove_toolbar_item">Poistetaanko työkalupalkin kohde?</string>
-    <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
-    <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
-    <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
+    <string name="note_editor_image_too_large">Kuva on liian suuri, aseta kuva käsin</string>
+    <string name="note_editor_video_too_large">Videotiedosto on liian suuri, aseta video käsin</string>
+    <string name="note_editor_audio_too_large">Äänitiedosto on liian suuri, aseta ääni käsin</string>
     <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Androidin varmuuskopiointi käynnissä. Yritä uudelleen</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">Saatat joutua käyttämään iManageria, jotta AnkiDroid voi lisätä pikanäppäimiä.</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Aloitusnäyttösi ei salli AnkiDroidin lisätä pikakuvakkeita</string>
@@ -243,7 +243,7 @@
     <string name="plus_sign" comment="Label for increment button in IncrementerNumberRangePreference">+</string>
     <string name="minus_sign" comment="Label for decrement button in IncrementerNumberRangePreference">-</string>
     <!-- Used for credential empty warning message -->
-    <string name="invalid_email">Enter a valid email</string>
+    <string name="invalid_email">Anna kelvollinen sähköpostiosoite</string>
     <string name="password_empty">Salasana vaaditaan</string>
     <string name="back_pressed_once">Poistu painamalla \"takaisin\" uudestaan</string>
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
@@ -273,7 +273,7 @@
     <string name="scoped_storage_learn_more">Lisätietoja</string>
     <string name="search_card_js_api_no_results">Haku ei palauttanut tuloksia</string>
     <!--  JS Addons  -->
-    <string name="not_valid_js_addon_package">%s is not a valid JavaScript addon package</string>
+    <string name="not_valid_js_addon_package">%s ei ole kelvollinen JavaScript-lisäosa</string>
     <string name="could_not_create_dir">Hakemiston %s luonti ei onnistunut</string>
     <string name="malicious_archive_entry_outside">Haitallinen arkisto. Sisältää pääsyn kohdehakemiston ulkopuolelle: %s</string>
     <string name="malicious_archive_exceeds_limit">Haitallinen arkisto. Koko on suurempi kuin %1$s tai se sisältää yli %2$d tiedostoa</string>
@@ -282,7 +282,7 @@
     <string name="expand_tag">Laajenna tunniste \"%s\"</string>
     <!-- Manage note types -->
     <string name="field_editor_model_not_available">Kokoelmaan pääsy epäonnistui. Yritä uudelleen!</string>
-    <string name="cd_manage_notetypes_add">Add a new note type</string>
+    <string name="cd_manage_notetypes_add">Lisää uusi muistiinpanotyyppi</string>
     <!-- App Intro -->
     <string name="intro_ankidroid_tagline_one">Opiskele vähemmän</string>
     <string name="intro_ankidroid_tagline_two">Muista enemmän</string>
@@ -290,7 +290,7 @@
     <string name="intro_get_started" comment="Action to start AnkiDroid for the first time without syncing from AnkiWeb">Aloita</string>
     <string name="intro_sync_from_ankiweb">Synkronoi AnkiWebistä</string>
     <!-- IntentHandler -->
-    <string name="app_not_initialized_new">AnkiDroid is not initialized yet. Please open AnkiDroid and try again</string>
+    <string name="app_not_initialized_new">AnkiDroidia ei ole vielä alustettu. Avaa AnkiDroid ja yritä uudelleen</string>
     <string name="already_logged_in">Olet jo kirjautunut sisään</string>
     <!-- Deck Creation -->
     <string name="deck_created">Pakka luotu</string>
@@ -302,52 +302,52 @@
     <string name="show_notes" comment="Label for toggle notes button in BrowserOptionsDialog">Muistiinpanot</string>
     <string name="toggle_cards_notes">Näytä kortit/muistiinpanot</string>
     <string name="truncate_content_help">Katkaise selaimen jokaisen rivin korkeus niin, että näytetään vain 3 ensimmäistä riviä sisältöä.</string>
-    <string name="browser_options_dialog_heading">Browser options</string>
+    <string name="browser_options_dialog_heading">Selaimen asetukset</string>
     <string name="audio_saved">Äänitys tallennettu</string>
     <string name="deleting_selected_notes">Poistetaan valittuja muistiinpanoja</string>
     <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Kuuntele napauttamalla ääntä</string>
     <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Ääni tulee asentaa ennen käyttöä
     </string>
     <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Käytä silti</string>
-    <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
+    <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Tekstistä puheeksi -toiminnon virhe (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
     </string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Asenna
     </string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">       Teksti puheeksi -asetusten avaaminen ei onnistunut    </string>
-    <string name="shared_decks_login_required">Please log in to download more decks</string>
-    <string name="deck_description_field_hint">Description</string>
-    <string name="failed_to_copy">Failed to copy</string>
-    <string name="card_browser_unavailable_when_notes_mode">Unavailable in ‘Notes’ mode</string>
+    <string name="shared_decks_login_required">Kirjaudu sisään ladataksesi lisää pakkoja</string>
+    <string name="deck_description_field_hint">Kuvaus</string>
+    <string name="failed_to_copy">Kopiointi epäonnistui</string>
+    <string name="card_browser_unavailable_when_notes_mode">Ei saatavilla ”Muistiinpanot” -tilassa</string>
     <plurals name="unbury_cards_feedback">
-        <item quantity="one">%d card unburied</item>
-        <item quantity="other">%d cards unburied</item>
+        <item quantity="one">%d kortin hautaus poistettu</item>
+        <item quantity="other">%d kortin hautaus poistettu</item>
     </plurals>
-    <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
-    <string name="start_recording">Record</string>
-    <string name="stop_recording">Stop</string>
-    <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Uudelleenasettele</string>
+    <string name="start_recording">Äänitä</string>
+    <string name="stop_recording">Pysäytä</string>
+    <string name="play_recording">Toista</string>
+    <string name="next_recording">Seuraava</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
-    <string name="orphan_note_title">Cannot Delete Card Type</string>
-    <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
-    <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
+    <string name="orphan_note_title">Korttityyppiä ei voida poistaa</string>
+    <string name="orphan_note_message">Tämän korttityypin poistaminen jättää joitakin muistiinpanoja ilman kortteja.</string>
+    <string name="voice_not_supported">Ääntä ei tueta. Kokeile toista tai asenna äänimoottori.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
-    <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
-    <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
-    <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
-    <string name="select_deck" comment="Description of the shortcut that opens the deck selection dialog">Select deck</string>
-    <string name="select_note_type" comment="Description of the shortcut that shows the note selection spinner">Select note type</string>
-    <string name="tag_editor" comment="Description of the shortcut that opens the tags dialog">Tag editor</string>
-    <string name="card_template_editor_group" comment="Label for the group of shortcuts related to the card template editor">Card Template Editor</string>
-    <string name="edit_front_template" comment="Description of the shortcut that shows the question side of the card template">Edit front template</string>
-    <string name="edit_back_template" comment="Description of the shortcut that shows the answer side of the card template">Edit back template</string>
-    <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
-    <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
-    <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
-    <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
-    <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
+    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Näytä näppäinoikoteiden valintaikkuna</string>
+    <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Pakan valitsija</string>
+    <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Poista pakka ilman vahvistusta</string>
+    <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Muistiinpanoeditori</string>
+    <string name="select_deck" comment="Description of the shortcut that opens the deck selection dialog">Valitse pakka</string>
+    <string name="select_note_type" comment="Description of the shortcut that shows the note selection spinner">Valitse muistiinpanotyyppi</string>
+    <string name="tag_editor" comment="Description of the shortcut that opens the tags dialog">Tunnisteiden muokkaus</string>
+    <string name="card_template_editor_group" comment="Label for the group of shortcuts related to the card template editor">Korttimallien muokkaus</string>
+    <string name="edit_front_template" comment="Description of the shortcut that shows the question side of the card template">Muokkaa etupuolen mallia</string>
+    <string name="edit_back_template" comment="Description of the shortcut that shows the answer side of the card template">Muokkaa kääntöpuolen mallia</string>
+    <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Muokkaa tyyliä</string>
+    <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Kopioi mallipohja Markdownina</string>
+    <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Muokkaa selaimen ulkoasua</string>
+    <string name="show_shortcuts_message">Paina Alt+K näyttääksesi näppäinoikotiet</string>
+    <string name="missing_user_action_dialog_message" comment="%s is the user action number">Käyttäjän toimea %s ei ole määritetty tässä muistiinpanotyypissä. Määritä se</string>
+    <string name="directory_inaccessible_info">Lue lisää siitä, miten palauttaa pääsy tänne (%s) tai siirry asetuksiin vaihtaaksesi kokoelmakansiota</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-fi/03-dialogs.xml b/AnkiDroid/src/main/res/values-fi/03-dialogs.xml
index 951d65940cd5..b1ed56c7dee7 100644
--- a/AnkiDroid/src/main/res/values-fi/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-fi/03-dialogs.xml
@@ -49,10 +49,10 @@
     <string name="contextmenu_deckpicker_delete_deck" maxLength="28">Poista korttipakka</string>
     <string name="delete_deck_title">Poista korttipakka?</string>
     <plurals name="delete_deck_message">
-        <item quantity="one">Delete all cards in %1$s? It contains %2$d card</item>
-        <item quantity="other">Delete all cards in %1$s? It contains %2$d cards</item>
+        <item quantity="one">Poistetaanko kaikki kortit pakassa \'%1$s\'? Se sisältää %2$d kortin</item>
+        <item quantity="other">Poistetaanko kaikki kortit pakassa \'%1$s\'? Se sisältää %2$d korttia</item>
     </plurals>
-    <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
+    <string name="delete_cram_deck_message">Poistetaanko suodatettu pakka \'%1$s\'? Kaikki kortit lähetetään niiden alkuperäisiin pakkoihin.</string>
     <string name="no_tts_available_message">Yhtään puhesyntetisaattorin tukemaa kieltä ei ole käytettävissä</string>
     <string name="tts_no_tts">Ei puhetta</string>
     <string name="unused_strings">\n\nKäyttämättömät tiedostot:\n</string>
@@ -91,8 +91,8 @@
     <string name="dialog_confirm" tools:ignore="UnusedResources">Vahvista</string>
     <string name="dialog_no">Ei</string>
     <string name="dialog_yes">Kyllä</string>
-    <string name="dialog_keep">Keep</string>
-    <string name="dialog_remove">Remove</string>
+    <string name="dialog_keep">Pidä</string>
+    <string name="dialog_remove">Poista</string>
     <string name="dialog_continue">Jatka</string>
     <string name="dialog_processing">Käsitellään&#8230;</string>
     <string name="dialog_positive_create" comment="Create a new collection, probably erasing the previous one, may be necessary in case of error.">Luo</string>
@@ -103,9 +103,9 @@
     <string name="dialog_positive_repair">Korjaa</string>
     <string name="dialog_positive_replace">Korvaa</string>
     <string name="dialog_collection_path_not_dir">Annettu hakemistopolku ei ole pätevä</string>
-    <string name="dialog_invalid_custom_certificate">The provided text does not resolve to a valid PEM-encoded X509 certificate</string>
-    <string name="dialog_invalid_custom_certificate_title">Error parsing certificate</string>
-    <string name="dialog_updated_custom_certificate">Certificate updated</string>
+    <string name="dialog_invalid_custom_certificate">Annettu teksti ei vastaa kelvollista PEM-koodattua X509-varmentetta.</string>
+    <string name="dialog_invalid_custom_certificate_title">Varmenteen jäsentäminen epäonnistui</string>
+    <string name="dialog_updated_custom_certificate">Varmenne päivitetty</string>
     <!-- Media checking -->
     <string name="check_media_title">Tarkista media?</string>
     <string name="check_media_warning">Jos sinulla on suuri mediakokoelma, tämä voi kestää pitkään</string>
@@ -159,7 +159,7 @@
     <string name="failed_to_apply_background_image">Taustakuvan %s käyttöönotto epäonnistui</string>
     <string name="background_image_too_large">Pakan valintanäkymän taustakuva on liian suuri</string>
     <string name="image_max_size_allowed">Kuvan suurin sallittu koko on %d Mt</string>
-    <string name="image_dimensions_too_large">Image dimensions are too large (%1$d × %2$d)</string>
+    <string name="image_dimensions_too_large">Kuvan mitat ovat liian suuret (%1$d × %2$d)</string>
     <!-- Global Intent handler -->
     <!-- Also used by Card Browser, not renaming to save translators effort -->
     <string name="intent_handler_failed_no_storage_permission">Vaadittu tallennustilan käyttöoikeus puuttuu. Myönnä käyttöoikeus ja yritä sitten uudelleen.</string>
@@ -167,7 +167,7 @@
     <string name="boot_service_failed_to_schedule_notifications">Muistutusten asettaminen ei onnistunut</string>
     <string name="boot_service_too_many_notifications">Liian monta muistutusta asetettu. Jotkin niistä eivät näy</string>
     <!-- Locale Selection Dialog -->
-    <string name="locale_selection_dialog_title_new">Set Language</string>
+    <string name="locale_selection_dialog_title_new">Aseta kieli</string>
     <string name="locale_selection_dialog_summary">Jotkin monikieliset näppäimistöt, kuten Gboard, tukevat kielen vaihtamista tekstiä muokattaessa\n\nPyydä käyttämäsi näppäimistön tekijältä tukea \"setImeHintLocales\"-ominaisuudelle, jos näppäimistösi ei vaihda kieltä.</string>
     <!-- Help Dialog -->
     <string name="help_title_using_ankidroid">AnkiDroidin käyttäminen</string>
@@ -195,13 +195,13 @@
     <string name="help_item_ankiweb_terms_and_conditions">AnkiWebin käyttöehdot</string>
     <string name="help_title_send_exception">Lähetä vianmääritysraportti</string>
     <string name="help_dialog_exception_report_debounce">Raportti on jo lähetetty</string>
-    <string name="help_dialog_exception_report_sent">Report was sent!</string>
+    <string name="help_dialog_exception_report_sent">Raportti lähetetty!</string>
     <!--Sync-->
     <plurals name="sync_automatic_sync_needs_more_time">
         <item quantity="one">Automaattinen synkronointi voi käynnistyä %d sekunnissa</item>
         <item quantity="other">Automaattinen synkronointi voi käynnistyä %d sekunnissa</item>
     </plurals>
-    <string name="metered_sync_data_warning">Your internet provider may charge money for data use</string>
+    <string name="metered_sync_data_warning">Internet-palveluntarjoaja voi veloittaa rahaa datan käytöstä</string>
     <string name="deck_picker_new">Tässä pakassa olevien tänään näytettävien uusien korttien lukumäärä.</string>
     <string name="deck_picker_rev">Tässä pakassa olevien tänään erääntyvien korttien lukumäärä.</string>
     <string name="deck_picker_lrn">Tässä pakassa olevien opittavien korttien lukumäärä.</string>
@@ -226,41 +226,41 @@
     </string>
     <string name="dismiss_backup_warning_upgrade">        Androidin tietosuojamuutosten vuoksi tietoihisi ja automaattisiin varmuuskopioihin ei pääse käsiksi, jos sovellus poistetaan.
     </string>
-    <string name="deck_already_exists">Deck already exists</string>
-    <string name="empty_deck_name">Deck name cannot be empty</string>
-    <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
+    <string name="deck_already_exists">Pakka on jo olemassa</string>
+    <string name="empty_deck_name">Pakan nimi ei voi olla tyhjä</string>
+    <string name="create_deck_numeric_hint">Jos pakan järjestyksen kanssa onongelmia (esim. ”10” näkyy ennen ”2”:a), korvaa ”2” merkinnällä ”02”.</string>
     <!-- Set Due Date -->
-    <string name="set_due_date_match_interval" comment="when setting a card\'s due date, this checkbox also changes the interval of the card">Set interval to same value</string>
+    <string name="set_due_date_match_interval" comment="when setting a card\'s due date, this checkbox also changes the interval of the card">Aseta aikaväli samaan arvoon</string>
     <plurals name="set_due_date_single_day_label" comment="a date control is provided afterwards">
-        <item quantity="one">Show card in</item>
-        <item quantity="other">Show cards in</item>
+        <item quantity="one">Näytä kortti kun on kulunut</item>
+        <item quantity="other">Näytä kortit kun on kulunut</item>
     </plurals>
     <plurals name="set_due_date_range_label" comment="a date control is provided afterwards">
-        <item quantity="one">Show card in range</item>
-        <item quantity="other">Show cards in range</item>
+        <item quantity="one">Näytä kortti välillä</item>
+        <item quantity="other">Näytä kortit välillä</item>
     </plurals>
     <plurals name="set_due_date_label_suffix" comment="a suffix on a text field allowing a user to enter a number of days">
-        <item quantity="one">day</item>
-        <item quantity="other">days</item>
+        <item quantity="one">päivä</item>
+        <item quantity="other">päivää</item>
     </plurals>
     <string name="range_delimiter" comment="Placed between two input boxes to denote a range">–</string>
-    <string name="set_due_date_range_start" comment="\'Set Due Date\' may change the due date of a card to a random number of days in the future. This labels the \'minimum\' value of this range (inclusive)">From</string>
-    <string name="set_due_date_range_end" comment="\'Set Due Date\' may change the due date of a card to a random number of days in the future. This labels the \'maximum\' value of this range (inclusive)">To</string>
+    <string name="set_due_date_range_start" comment="\'Set Due Date\' may change the due date of a card to a random number of days in the future. This labels the \'minimum\' value of this range (inclusive)">Alkaen</string>
+    <string name="set_due_date_range_end" comment="\'Set Due Date\' may change the due date of a card to a random number of days in the future. This labels the \'maximum\' value of this range (inclusive)">Päättyen</string>
     <!-- Instant Note Editor -->
-    <string name="cloze_note_required">Cloze Type Note Required</string>
-    <string name="cloze_not_found_message">No Cloze type note found, open the Note Editor or try again after adding a Cloze type note.</string>
-    <string name="open">Open</string>
-    <string name="change_cloze_number">Change cloze number</string>
-    <string name="cloze_number">Cloze number:</string>
-    <string name="change_editor_mode">Change editor mode</string>
-    <string name="open_note_editor">Open note editor</string>
-    <string name="change_cloze_mode">Change cloze mode</string>
+    <string name="cloze_note_required">Aukkotehtävä-tyyppinen muistiinpano vaaditaan</string>
+    <string name="cloze_not_found_message">Aukkotehtävä-tyyppisiä muistiinpanoja ei löytynyt. Muokkaa muistiinpanoja ja yritä uudelleen lisäämisen jälkeen.</string>
+    <string name="open">Avaa</string>
+    <string name="change_cloze_number">Muokkaa aukkotehtävän numeroa</string>
+    <string name="cloze_number">Aukkotehtävän numero:</string>
+    <string name="change_editor_mode">Vaihda muokkaimen tilaa</string>
+    <string name="open_note_editor">Avaa muistiinpanojen muokkaus</string>
+    <string name="change_cloze_mode">Vaihda aukkotehtävätilaa</string>
     <!-- Outdated WebView dialog -->
-    <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
-    <string name="compress">Compress</string>
+    <string name="webview_update_message">Järjestelmän WebView on vanhentunut. Jotkin ominaisuudet eivät toimi oikein. Päivitä se.\n\nAsennettu versio: %1$d\nVähimmäinen vaadittu versio: %2$d</string>
+    <string name="compress">Pakkaa</string>
     <!-- Tts playback error dialog -->
-    <string name="tts_error_dialog_title">Language not supported</string>
-    <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
-    <string name="tts_error_dialog_change_button_text">Change engine</string>
-    <string name="tts_error_dialog_supported_voices_button_text">Voice options</string>
+    <string name="tts_error_dialog_title">Kieltä ei tueta</string>
+    <string name="tts_error_dialog_reason_text">Tekstistä puheeksi -moottori <b>%1$s</b> ei tue kieltä <b>%2$s</b></string>
+    <string name="tts_error_dialog_change_button_text">Vaihda moottoria</string>
+    <string name="tts_error_dialog_supported_voices_button_text">Äänen asetukset</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-fi/04-network.xml b/AnkiDroid/src/main/res/values-fi/04-network.xml
index b765f7cd7a2b..007650a0fa23 100644
--- a/AnkiDroid/src/main/res/values-fi/04-network.xml
+++ b/AnkiDroid/src/main/res/values-fi/04-network.xml
@@ -64,22 +64,22 @@
     <string name="log_out">Kirjaudu ulos</string>
     <string name="reset_password">Nollaa salasanasi</string>
     <string name="lost_mail_instructions">Unohditko sähköpostiosoitteesi?</string>
-    <string name="sign_in">Signing in</string>
+    <string name="sign_in">Kirjaudutaan</string>
     <!-- AndroidManifest.xml -->
     <string name="deckpreferences_title">Kohteen XXX asetukset</string>
     <string name="sync_title">Synkronointi</string>
     <string name="sync_log_uploading_message">Täysi synkronointi tästä laitteesta</string>
     <string name="sync_database_acknowledge">Kokoelma synkronoitu</string>
-    <string name="col_synced_media_in_background">Collection synced. Media is being synced in the background.</string>
+    <string name="col_synced_media_in_background">Kokoelma synkronoitu. Mediaa synkronoidaan taustalla.</string>
     <string name="sync_corrupt_database">Tietokanta on vioittunut. Korjaa se, ennen kuin yrität synkronoida uudelleen.\n\nKatso %s saadaksesi lisätietoja tietokannan korjaamisesta.</string>
     <!-- Please run ‘Check database’ before syncing -->
     <string name="sync_sanity_local">Paikallinen</string>
     <string name="sync_sanity_remote">Etä</string>
-    <string name="one_way_sync_title" maxLength="41">One-way sync</string>
-    <string name="one_way_sync_confirmation">One way sync requested</string>
+    <string name="one_way_sync_title" maxLength="41">Yksisuuntainen synkronointi</string>
+    <string name="one_way_sync_confirmation">Yksisuuntaista synkronointia pyydetty</string>
     <string name="full_sync_confirmation">Pyytämäsi muutos vaatii tietokannan täyden lähetyksen AnkiWebiin kun synkronoit kokoelmasi seuraavan kerran. Jos sinulla on kertauksia tai muita muutoksia odottamassa toisessa laitteessa, jota ei ole vielä synkronoitu tänne, nämä synkronoimattomat tiedot katoavat. Haluatko jatkaa?</string>
     <string name="full_sync_confirmation_upgrade">AnkiDroidin edellisessä versiossa olleen bugin takia, täydellinen syknronointi on suositeltavaa.</string>
     <!-- Deck Picker Sync Icon -->
-    <string name="sync_menu_title_one_way_sync">Sync (one-way)</string>
+    <string name="sync_menu_title_one_way_sync">Synkronoi (yksisuuntaisesti)</string>
     <string name="sync_menu_title_no_account">Synkronointi (vaatii kirjautumisen)</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-fi/06-statistics.xml b/AnkiDroid/src/main/res/values-fi/06-statistics.xml
index a50118f626c8..b1d1d7aab9bf 100644
--- a/AnkiDroid/src/main/res/values-fi/06-statistics.xml
+++ b/AnkiDroid/src/main/res/values-fi/06-statistics.xml
@@ -44,5 +44,5 @@
 ~ this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <resources>
-    <string name="open_statistics" comment="Description of the shortcut that opens the statistics page">Open statistics</string>
+    <string name="open_statistics" comment="Description of the shortcut that opens the statistics page">Avaa tilastot</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-fi/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-fi/07-cardbrowser.xml
index fe2e1f488b96..1e8256ebc94f 100644
--- a/AnkiDroid/src/main/res/values-fi/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-fi/07-cardbrowser.xml
@@ -70,11 +70,11 @@
     <string name="card_browser_list_my_searches_new_name">Nimi nykyiselle haulle</string>
     <string name="card_browser_list_my_searches_new_search_error_empty_name">Hakua ei voi tallentaa ilman nimeä.</string>
     <string name="card_browser_list_my_searches_new_search_error_dup">Nimi on jo olemassa</string>
-    <string name="no_note_to_edit">No note to edit</string>
+    <string name="no_note_to_edit">Ei muokattavaa muistiinpanoa</string>
     <string name="card_browser_list_my_searches_remove_content">Poistetaanko ”%1$s”?</string>
     <string name="card_browser_change_display_order" maxLength="28">Muuta esitysjärjestystä</string>
-    <string name="card_browser_search_hint" comment="Message displayed in the search text field in the card browser.">Search</string>
-    <string name="card_browser_cram_search" maxLength="28" comment="Menu entry to start a search.">Search</string>
+    <string name="card_browser_search_hint" comment="Message displayed in the search text field in the card browser.">Hae</string>
+    <string name="card_browser_cram_search" maxLength="28" comment="Menu entry to start a search.">Hae</string>
     <string name="card_browser_change_display_order_title">Valitse esitysjärjestys</string>
     <string name="card_details_tags">Tunnisteet</string>
     <string-array name="card_browser_order_labels">
@@ -95,7 +95,7 @@
     <string name="card_browser_search_all_decks">Etsi kaikista pakoista</string>
     <string name="card_browser_unknown_deck_name">Tuntematon</string>
     <string name="card_browser_truncate" comment="allows users to show less of a field value">Katkaise sisältö</string>
-    <string name="set_due_date_hintText" comment="plural set_due_date_label_suffix is used for parameters, parameter 1 is the plural for 0, parameter 2 is the plural for 1">Today is ‘0 %1$s’, tomorrow is ‘1 %2$s’, etc&#8230;</string>
+    <string name="set_due_date_hintText" comment="plural set_due_date_label_suffix is used for parameters, parameter 1 is the plural for 0, parameter 2 is the plural for 1">Tänään on \'0 %1$s\', huomenna \'1 %2$s\', jne&#8230;</string>
     <plurals name="card_browser_export_cards">
         <item quantity="one">Vie kortti</item>
         <item quantity="other">Vie kortteja</item>
@@ -109,13 +109,13 @@
         <item quantity="other">%d korttia poistettu</item>
     </plurals>
     <!--Keyboard shortcuts dialog-->
-    <string name="edit_tags_dialog" comment="Description of the shortcut that opens the edit tags dialog">Edit tags dialog</string>
-    <string name="show_order_dialog" comment="Description of the shortcut that shows the order dialog">Show order dialog</string>
+    <string name="edit_tags_dialog" comment="Description of the shortcut that opens the edit tags dialog">Muokkaa tunnisteiden valintaikkunaa</string>
+    <string name="show_order_dialog" comment="Description of the shortcut that shows the order dialog">Muokkaa järjestystä</string>
     <!-- Manage columns dialog -->
-    <string name="browse_manage_columns_main_heading">Columns</string>
-    <string name="browse_manage_columns">Manage columns</string>
-    <string name="user_active_columns">Active</string>
-    <string name="user_potential_columns">Available</string>
-    <string name="include_column">Include column</string>
-    <string name="exclude_column">Exclude column</string>
+    <string name="browse_manage_columns_main_heading">Sarakkeet</string>
+    <string name="browse_manage_columns">Hallitse sarakkeita</string>
+    <string name="user_active_columns">Aktiivinen</string>
+    <string name="user_potential_columns">Saatavilla</string>
+    <string name="include_column">Sisällytä sarake</string>
+    <string name="exclude_column">Jätä pois sarake</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-fi/08-widget.xml b/AnkiDroid/src/main/res/values-fi/08-widget.xml
index 7c9ced61bfb2..3f3164d33fb0 100644
--- a/AnkiDroid/src/main/res/values-fi/08-widget.xml
+++ b/AnkiDroid/src/main/res/values-fi/08-widget.xml
@@ -60,18 +60,18 @@
         <item quantity="other">%d minuuttia jäljellä</item>
     </plurals>
     <string name="widget_add_note_button">Lisää uusi AnkiDroid muistiinpano</string>
-    <string name="deck_picker_widget_description" comment="Title of the Deck Picker Widget. Displayed to the user in Android\'s Widget Selection menu">Deck Picker</string>
-    <string name="card_analysis_extra_widget_description">Card Analysis</string>
+    <string name="deck_picker_widget_description" comment="Title of the Deck Picker Widget. Displayed to the user in Android\'s Widget Selection menu">Pakan valitsija</string>
+    <string name="card_analysis_extra_widget_description">Korttien analyysi</string>
     <!-- Strings to explain usage in Deck Picker and Card Analysis Widget Configuration screen -->
-    <string name="select_decks_title" comment="Title for Deck Selection Dialog">Select decks</string>
-    <string name="select_deck_title" comment="Title for Deck Selection Dialog">Select a deck</string>
-    <string name="no_selected_deck_placeholder_title" comment="Placeholder title when no decks are selected">Select decks to display in the widget. Select decks with the + icon.</string>
-    <string name="deck_removed_from_widget" comment="Snackbar when deck is removed from widget">Deck removed</string>
-    <string name="deck_already_selected_message" comment="Snackbar when user try to select the same deck again">This deck is already selected</string>
+    <string name="select_decks_title" comment="Title for Deck Selection Dialog">Valitse pakat</string>
+    <string name="select_deck_title" comment="Title for Deck Selection Dialog">Valitse pakka</string>
+    <string name="no_selected_deck_placeholder_title" comment="Placeholder title when no decks are selected">Valitse pakat, jotka näytetään widgetissä. Käytä + kuvaketta valitsemiseen.</string>
+    <string name="deck_removed_from_widget" comment="Snackbar when deck is removed from widget">Pakka poistettu</string>
+    <string name="deck_already_selected_message" comment="Snackbar when user try to select the same deck again">Tämä pakka on jo valittu</string>
     <plurals name="deck_limit_reached">
-        <item quantity="one">You can select up to %d deck.</item>
-        <item quantity="other">You can select up to %d decks.</item>
+        <item quantity="one">Voit valita enintään %d pakan.</item>
+        <item quantity="other">Voit valita enintään %d pakkaa.</item>
     </plurals>
-    <string name="empty_widget_state" comment="To denote the widget is empty">Missing deck. Tap to reconfigure.</string>
-    <string name="empty_collection_state_in_widget" comment="To denote the collection is empty">Collection is empty, use app to add decks then reconfigure</string>
+    <string name="empty_widget_state" comment="To denote the widget is empty">Pakka puuttuu. Määritä uudelleen painamalla tästä.</string>
+    <string name="empty_collection_state_in_widget" comment="To denote the collection is empty">Kokoelma on tyhjä. Käytä sovellusta pakkojen lisäämiseen ja määritä widget sitten uudelleen.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-fi/09-backup.xml b/AnkiDroid/src/main/res/values-fi/09-backup.xml
index b4efeb5f50b8..40c590d53382 100644
--- a/AnkiDroid/src/main/res/values-fi/09-backup.xml
+++ b/AnkiDroid/src/main/res/values-fi/09-backup.xml
@@ -51,7 +51,7 @@
     <string name="backup_del_collection">Poista kokoelma ja luo uusi</string>
     <string name="backup_del_collection_question">Haluatko varmasti poistaa kokoelman ja luoda uuden?
 Tämä nollaa edistymisesi ja poistaa kaikki kortit!</string>
-    <string name="backup_one_way_sync_from_server">One-way sync from server</string>
+    <string name="backup_one_way_sync_from_server">Yhdensuuntainen synkronointi palvelimelta</string>
     <string name="backup_full_sync_from_server_question">Haluatko todella korvata kokoelmasi AnkiWebin kokoelmalla? Kaikki edellisen synkronoinnin jälkeen tapahtunyt opiskelu ja lisätyt tiedot unohdetaan!</string>
     <string name="error_handling_title">Virheiden käsittely</string>
     <string name="error_handling_options" comment="In a warning message, the label of the suggested action that the user should take">Asetukset</string>
diff --git a/AnkiDroid/src/main/res/values-fi/10-preferences.xml b/AnkiDroid/src/main/res/values-fi/10-preferences.xml
index f001c51545b6..7ffae0db66d1 100644
--- a/AnkiDroid/src/main/res/values-fi/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-fi/10-preferences.xml
@@ -162,18 +162,18 @@
     <string name="vertical_centering_summ">Keskitä korttien sisältö pystysuunnassa</string>
     <string name="pref_double_tap_time_interval" maxLength="41">Kaksoisnapautuksen aikaväli (millisekuntia)</string>
     <string name="pref_double_tap_time_interval_summary">Toista vastauspainikkeiden napauttamista ei oteta huomioon, jos näin kauan ei ole kulunut. Tämä estää vahingossa tapahtuvat kaksoisnapautukset</string>
-    <string name="pref_show_answer_long_press_time" maxLength="41">Show answer long-press time</string>
-    <string name="pref_show_answer_long_press_time_summary">Minimum pressing time before the show answer button registers a touch.</string>
+    <string name="pref_show_answer_long_press_time" maxLength="41">Näytä vastaus: pitkän painalluksen aika</string>
+    <string name="pref_show_answer_long_press_time_summary">Vähimmäispainallusaika, jonka jälkeen \"Näytä vastaus\" -painike rekisteröi kosketuksen.</string>
     <string name="show_estimates" maxLength="41">Näytä aika painikkeissa</string>
     <string name="show_estimates_summ">Näytä seuraava kertausaika vastauspainikkeissa</string>
     <string name="show_large_answer_buttons" maxLength="41">Näytä suuret vastauspainikkeet</string>
     <string name="show_large_answer_buttons_summ">Näytä vastauspainikkeet kahdella rivillä</string>
     <string name="show_top_bar" maxLength="41">Näytä yläpalkki</string>
-    <string name="show_top_bar_summary">Show card counts, answer timer, flag and mark in top bar</string>
+    <string name="show_top_bar_summary">Näytä korttien lukumäärät, vastausaika, lippu ja merkinnät yläpalkissa.</string>
     <string name="show_progress" maxLength="41">Näytä jäljelläoleva</string>
     <string name="show_progress_summ">Näytä jäljelläolevien korttien määrä</string>
-    <string name="show_eta" maxLength="41">Show ETA</string>
-    <string name="show_eta_summ">Show remaining time</string>
+    <string name="show_eta" maxLength="41">Näytä ETA</string>
+    <string name="show_eta_summ">Näytä jäljellä oleva aika</string>
     <string name="use_current" maxLength="41">Pakka uusille korteille</string>
     <string name="learn_cutoff" maxLength="41">Ennalta oppimisen aikaraja</string>
     <string name="time_limit" maxLength="41">Edistymisen näyttämisen aikaväli</string>
@@ -198,7 +198,7 @@
     <string name="thirdparty_apps_summary">Listaa sovellukset jotka käyttävät AnkiDroid API:ta, kuten kansioita ja työkaluja.</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Kertaaminen</string>
-    <string name="show_deck_title" maxLength="41">Show deck title</string>
+    <string name="show_deck_title" maxLength="41">Näytä pakan otsikko</string>
     <string name="accessibility" maxLength="41">Esteettömyys</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Liitä leikepöydän kuvat PNG:nä</string>
@@ -217,7 +217,7 @@
         <a href="%s">Lue lisää</a>
         ]]></string>
     <string name="custom_sync_server_base_url_title" maxLength="41">Synkronointiosoite</string>
-    <string name="custom_sync_certificate_title" maxLength="41">Custom root certificate (PEM)</string>
+    <string name="custom_sync_certificate_title" maxLength="41">Oma root-sertifikaatti (PEM)</string>
     <!-- Key Bindings -->
     <string name="keyboard">Näppäimistö</string>
     <string name="bluetooth">Bluetooth</string>
@@ -235,13 +235,13 @@
     <string name="deck_conf_cram_filter" maxLength="41">Suodatin</string>
     <string name="deck_conf_cram_search" maxLength="41" comment="Label of a text field that contains a search query.">Haku</string>
     <string name="deck_conf_cram_limit" maxLength="41">Rajoita</string>
-    <string name="deck_conf_cram_order" maxLength="41">Cards selected by</string>
+    <string name="deck_conf_cram_order" maxLength="41">Valitse kortit käyttäen sääntöä</string>
     <string name="deck_conf_cram_reschedule" maxLength="41" comment="Title of the box labelled by deck_conf_cram_reschedule_summ">Aikatauluta uudelleen</string>
     <string name="deck_conf_cram_reschedule_summ">Aikatauluta kortit tämän pakan vastausten perusteella</string>
     <string name="deck_conf_cram_filter_2_check">Ota käyttöön toinen suodatin</string>
     <string name="deck_conf_cram_steps_summ" maxLength="41">Määritä mukautetut oppimisaskeleet</string>
-    <string name="deck_conf_cram_preview_delays" maxLength="41">Preview delays</string>
-    <string name="deck_conf_cram_preview_delays_summ">Delays are in seconds. 0 returns card to original deck.</string>
+    <string name="deck_conf_cram_preview_delays" maxLength="41">Esikatselujen viiveet</string>
+    <string name="deck_conf_cram_preview_delays_summ">Viivästykset ovat sekunneissa. 0 palauttaa kortin alkuperäiseen pakkaan.</string>
     <!-- analytics options -->
     <string name="analytics_dialog_title">Auta parantamaan AnkiDroidia!</string>
     <string name="analytics_title" maxLength="41">Jaa tietoja käyttämistäsi ominaisuuksista</string>
@@ -266,18 +266,18 @@
     <string name="key_picker_default_press_key">Paina näppäintä</string>
     <string name="binding_add_axis">Lisää peliohjain tai liikeohjain</string>
     <string name="axis_picker_move_joystick">Liikuta peli- tai liikeohjainta</string>
-    <string name="user_actions" maxLength="41">User actions</string>
-    <string name="user_actions_summary" maxLength="41">Trigger JavaScript from the review screen</string>
-    <string name="user_action_1" maxLength="28">User action 1</string>
-    <string name="user_action_2" maxLength="28">User action 2</string>
-    <string name="user_action_3" maxLength="28">User action 3</string>
-    <string name="user_action_4" maxLength="28">User action 4</string>
-    <string name="user_action_5" maxLength="28">User action 5</string>
-    <string name="user_action_6" maxLength="28">User action 6</string>
-    <string name="user_action_7" maxLength="28">User action 7</string>
-    <string name="user_action_8" maxLength="28">User action 8</string>
-    <string name="user_action_9" maxLength="28">User action 9</string>
-    <string name="toggle_auto_advance" maxLength="41">Toggle auto advance</string>
+    <string name="user_actions" maxLength="41">Käyttäjän toimet</string>
+    <string name="user_actions_summary" maxLength="41">Käynnistä JavaScript kertausnäkymästä</string>
+    <string name="user_action_1" maxLength="28">Käyttäjän toimi 1</string>
+    <string name="user_action_2" maxLength="28">Käyttäjän toimi 2</string>
+    <string name="user_action_3" maxLength="28">Käyttäjän toimi 3</string>
+    <string name="user_action_4" maxLength="28">Käyttäjän toimi 4</string>
+    <string name="user_action_5" maxLength="28">Käyttäjän toimi 5</string>
+    <string name="user_action_6" maxLength="28">Käyttäjän toimi 6</string>
+    <string name="user_action_7" maxLength="28">Käyttäjän toimi 7</string>
+    <string name="user_action_8" maxLength="28">Käyttäjän toimi 8</string>
+    <string name="user_action_9" maxLength="28">Käyttäjän toimi 9</string>
+    <string name="toggle_auto_advance" maxLength="41">Automaattinen eteneminen päälle/pois</string>
     <!-- Select card side -->
     <string name="card_side_selection_title">Valitse kortin puoli</string>
     <string name="card_side_question">Kysymys</string>
@@ -291,8 +291,8 @@
     <string name="bindings_already_bound">Jo käytössä kohteessa \"%s\"</string>
     <!-- Advanced -->
     <string name="pref_cat_experimental" maxLength="41" tools:ignore="UnusedResources">Kokeellinen</string>
-    <string name="readtext_deprecation_warn">AnkiDroid has introduced a better TTS mechanism which is compatible with other Anki clients and includes more voices and improvements to language playback!\n\nPlease upgrade as soon as possible, as this setting will be removed soon</string>
-    <string name="readtext_reviewer_warn" tools:ignore="UnusedResources">Please upgrade to the new text to speech format</string>
+    <string name="readtext_deprecation_warn">AnkiDroid on ottanut käyttöön paremman TTS-mekanismin, joka on yhteensopiva muiden Anki-ohjelmien kanssa ja sisältää enemmän ääniä ja parannuksia kielentoistoon!\n\nPäivitä mahdollisimman pian, sillä tämä asetus poistetaan pian.</string>
+    <string name="readtext_reviewer_warn" tools:ignore="UnusedResources">Päivitä uuteen tekstistä puheeksi -formaattiin</string>
     <!-- Developer options -->
     <string name="pref_cat_dev_options" maxLength="41">Kehittäjän asetukset</string>
     <string name="dev_options_enabled_pref" maxLength="41">Ota kehittäjän asetukset käyttöön</string>
@@ -359,17 +359,17 @@
     <string name="pref__etc__snackbar__fetching" comment="Generic snackbar message to be shown when user taps on a preference,         the value of which is being fetched">Haetaan&#8230;</string>
     <string name="pref__etc__snackbar__calculating" comment="Generic snackbar message to be shown when user taps on a preference,         the value of which, such as folder size on disk, is being calculated">Lasketaan&#8230;</string>
     <string name="pref__etc__snackbar__no_collection" comment="Generic snackbar message to be shown when user taps on a preference         that is not usable because the collection does not exist">Kokoelmaa ei ole olemassa</string>
-    <string name="hide_system_bars" maxLength="41" comment="Title of a setting that allows to hide the system bars">Hide system bars</string>
-    <string name="hide_system_bars_none" comment="Setting option to not hide any of the system bars">None</string>
-    <string name="hide_system_bars_status_bar" comment="Setting option to hide the system status bar (the top one with clock, battery status, etc)">Status bar</string>
-    <string name="hide_system_bars_navigation_bar" comment="Setting option to hide the system navigation bar (the bottom one that can go back, to home, etc)">Navigation bar</string>
-    <string name="hide_system_bars_all_bars" comment="Setting option to hide all the system bars">All</string>
-    <string name="ignore_display_cutout" maxLength="41">Ignore display cutout</string>
-    <string name="hide_answer_buttons" maxLength="41">Hide answer buttons</string>
-    <string name="hide_hard_and_easy" maxLength="41">Hide ‘Hard’ and ‘Easy’ buttons</string>
-    <string name="reviewer_frame_style" maxLength="41">Frame style</string>
-    <string name="reviewer_frame_style_card" maxLength="41" comment="Style name of the \'Card\' card frame of the Reviewer">Card</string>
-    <string name="reviewer_frame_style_box" maxLength="41" comment="Style name of the \'Box\' card frame of the Reviewer">Box</string>
+    <string name="hide_system_bars" maxLength="41" comment="Title of a setting that allows to hide the system bars">Piilota järjestelmäpalkit</string>
+    <string name="hide_system_bars_none" comment="Setting option to not hide any of the system bars">Ei mitään</string>
+    <string name="hide_system_bars_status_bar" comment="Setting option to hide the system status bar (the top one with clock, battery status, etc)">Tilapalkki</string>
+    <string name="hide_system_bars_navigation_bar" comment="Setting option to hide the system navigation bar (the bottom one that can go back, to home, etc)">Navigointipalkki</string>
+    <string name="hide_system_bars_all_bars" comment="Setting option to hide all the system bars">Kaikki</string>
+    <string name="ignore_display_cutout" maxLength="41">Älä huomioi näytön lovea</string>
+    <string name="hide_answer_buttons" maxLength="41">Piilota vastauspainikkeet</string>
+    <string name="hide_hard_and_easy" maxLength="41">Piilota ”Vaikea” ja ”Helppo” painikkeet</string>
+    <string name="reviewer_frame_style" maxLength="41">Kehyksen tyyli</string>
+    <string name="reviewer_frame_style_card" maxLength="41" comment="Style name of the \'Card\' card frame of the Reviewer">Kortti</string>
+    <string name="reviewer_frame_style_box" maxLength="41" comment="Style name of the \'Box\' card frame of the Reviewer">Laatikko</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="open_settings" comment="Description of the shortcut that opens the app settings">Open settings</string>
+    <string name="open_settings" comment="Description of the shortcut that opens the app settings">Avaa asetukset</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-fi/11-arrays.xml b/AnkiDroid/src/main/res/values-fi/11-arrays.xml
index e6dbc83e5449..9960fc1594fc 100644
--- a/AnkiDroid/src/main/res/values-fi/11-arrays.xml
+++ b/AnkiDroid/src/main/res/values-fi/11-arrays.xml
@@ -84,7 +84,7 @@
     <string name="answer_good" maxLength="41">Vastaa \"hyvä\"</string>
     <string name="answer_easy" maxLength="41">Vastaa \"helppo\"</string>
     <string name="gesture_play" maxLength="41">Toista media</string>
-    <string name="gesture_abort_learning" maxLength="41">Close reviewer</string>
+    <string name="gesture_abort_learning" maxLength="41">Sulje tarkastus</string>
     <string name="gesture_flag_red" maxLength="41">Punainen lippu päälle/pois</string>
     <string name="gesture_flag_orange" maxLength="41">Oranssi lippu päälle/pois</string>
     <string name="gesture_flag_green" maxLength="41">Vihreä lippu päälle/pois</string>
@@ -95,11 +95,11 @@
     <string name="gesture_flag_remove" maxLength="41">Poista lippu</string>
     <string name="gesture_page_up" maxLength="41">Sivu ylös</string>
     <string name="gesture_page_down" maxLength="41">Sivu alas</string>
-    <string name="gesture_abort_sync" maxLength="41">Close reviewer and Sync</string>
+    <string name="gesture_abort_sync" maxLength="41">Sulje tarkastus ja synkronoi</string>
     <string name="gesture_toggle_whiteboard" maxLength="41">Kirjoitustaulu käyttöön/pois käytöstä</string>
     <string name="gesture_show_hint" maxLength="41">Näytä vihje</string>
     <string name="gesture_show_all_hints" maxLength="41">Näytä kaikki vihjeet</string>
     <string name="record_voice" maxLength="41">Nauhoita ääntä</string>
     <string name="replay_voice" maxLength="41">Toista ääni uudelleen</string>
-    <string name="save_voice" maxLength="41">Save Recording</string>
+    <string name="save_voice" maxLength="41">Tallenna äänitys</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-fi/16-multimedia-editor.xml b/AnkiDroid/src/main/res/values-fi/16-multimedia-editor.xml
index ee0a2e2f5ec6..c8e00f962e3a 100644
--- a/AnkiDroid/src/main/res/values-fi/16-multimedia-editor.xml
+++ b/AnkiDroid/src/main/res/values-fi/16-multimedia-editor.xml
@@ -69,8 +69,8 @@
     <!-- Crop function-->
     <string name="crop_image">Haluatko rajata kuvan?</string>
     <string name="crop_button" maxLength="28">Rajaa kuva</string>
-    <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
+    <string name="save_dialog_content">Kuvan nykyinen koko on %s Mt. Kuvan kokorajoitus on oletusarvoisesti 1 Mt. Haluatko käyttää pakkausta kuvan pienentämiseksi?</string>
     <string name="select_image_failed">"Kuvan valitseminen epäonnistui – yritä uudelleen"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Kentän sisältö</string>
-    <string name="reselect" maxLength="28">Reselect</string>
+    <string name="reselect" maxLength="28">Valitse uudelleen</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-fi/20-search-preference.xml b/AnkiDroid/src/main/res/values-fi/20-search-preference.xml
index 209a8cfe4f8a..83b22c4aa386 100644
--- a/AnkiDroid/src/main/res/values-fi/20-search-preference.xml
+++ b/AnkiDroid/src/main/res/values-fi/20-search-preference.xml
@@ -60,6 +60,6 @@
     the key names MUST NOT be changed due to this
 -->
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <string tools:ignore="UnusedResources" name="searchpreference_search" comment="By submitting this string, you license it under the MIT License">Search&#8230;</string>
-    <string tools:ignore="UnusedResources" name="searchpreference_clear_history" comment="By submitting this string, you license it under the MIT License">Clear history</string>
+    <string tools:ignore="UnusedResources" name="searchpreference_search" comment="By submitting this string, you license it under the MIT License">Hae&#8230;</string>
+    <string tools:ignore="UnusedResources" name="searchpreference_clear_history" comment="By submitting this string, you license it under the MIT License">Tyhjennä historia</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-heb/01-core.xml b/AnkiDroid/src/main/res/values-heb/01-core.xml
index 247746c5b886..3548de8f25af 100644
--- a/AnkiDroid/src/main/res/values-heb/01-core.xml
+++ b/AnkiDroid/src/main/res/values-heb/01-core.xml
@@ -136,7 +136,7 @@
     <string name="empty_deck">החפיסה ריקה</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">חיפוש חפיסה</string>
     <string name="invalid_deck_name">שם חפיסה לא חוקי</string>
-    <string name="studyoptions_congrats_finished">Congratulations! You have finished for today.</string>
+    <string name="studyoptions_congrats_finished">אשריך!  סיימת להיום.</string>
     <string name="studyoptions_congrats_next_due_in" comment="The param will be replaced with \'The next card will be ready in X time\'">סיימת את החפיסה לעכשיו! %s</string>
     <string name="studyoptions_no_cards_due">אין כרטיסים נוספים</string>
     <string name="sd_card_not_mounted">התקן אחסון לא מחובר</string>
diff --git a/AnkiDroid/src/main/res/values-heb/02-strings.xml b/AnkiDroid/src/main/res/values-heb/02-strings.xml
index ae4c6dfa235a..632dd523aa99 100644
--- a/AnkiDroid/src/main/res/values-heb/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-heb/02-strings.xml
@@ -45,8 +45,8 @@
 -->
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Navigation drawer strings -->
-    <string name="drawer_open">פתיחת מגירה</string>
-    <string name="drawer_close">סגירת מגירה</string>
+    <string name="drawer_open">פתיחת תפריט</string>
+    <string name="drawer_close">סגירת תפריט</string>
     <string name="CardEditorCardDeck">חפיסת כרטיסים:‏</string>
     <string name="CardEditorNoteDeck">חפיסה:‏</string>
     <string name="CardEditorModel">סוג:</string>
@@ -85,9 +85,9 @@
     <string name="custom_study_limit_tags">הגבל לתיוג ספציפי</string>
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d קבור</item>
-        <item quantity="two">+%d buried</item>
-        <item quantity="many">+%d buried</item>
-        <item quantity="other">+%d buried</item>
+        <item quantity="two">+%d קבורים</item>
+        <item quantity="many">+%d קבורים</item>
+        <item quantity="other">+%d קבורים</item>
     </plurals>
     <string name="studyoptions_total_new_label">סה\"כ קלפים חדשים</string>
     <string name="studyoptions_total_label">סה\"כ קלפים</string>
@@ -312,7 +312,7 @@
     <string name="show_notes" comment="Label for toggle notes button in BrowserOptionsDialog">פתקים</string>
     <string name="toggle_cards_notes">החלף כרטיסים/פתקים</string>
     <string name="truncate_content_help">חתוך את הגובה של כל שורה בדפדפן כדי להציג רק 3 שורות תוכן ראשונות</string>
-    <string name="browser_options_dialog_heading">Browser options</string>
+    <string name="browser_options_dialog_heading">אפשרויות דפדפן</string>
     <string name="audio_saved">ההקלטה נשמרה</string>
     <string name="deleting_selected_notes">מחיקת הערות שנבחרו</string>
     <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">הקש על קול כדי להאזין</string>
diff --git a/AnkiDroid/src/main/res/values-heb/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-heb/07-cardbrowser.xml
index 6b47300f5def..02c01603c318 100644
--- a/AnkiDroid/src/main/res/values-heb/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-heb/07-cardbrowser.xml
@@ -124,10 +124,10 @@
     <string name="edit_tags_dialog" comment="Description of the shortcut that opens the edit tags dialog">תיבת דו-שיח עריכת תגים</string>
     <string name="show_order_dialog" comment="Description of the shortcut that shows the order dialog">הצג תיבת הזמנה</string>
     <!-- Manage columns dialog -->
-    <string name="browse_manage_columns_main_heading">Columns</string>
-    <string name="browse_manage_columns">Manage columns</string>
-    <string name="user_active_columns">Active</string>
-    <string name="user_potential_columns">Available</string>
-    <string name="include_column">Include column</string>
-    <string name="exclude_column">Exclude column</string>
+    <string name="browse_manage_columns_main_heading">עמודות</string>
+    <string name="browse_manage_columns">ניהול עמודות</string>
+    <string name="user_active_columns">פָּעִיל</string>
+    <string name="user_potential_columns">זמין</string>
+    <string name="include_column">כלול עמודה</string>
+    <string name="exclude_column">אל תכלול עמודה</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-heb/10-preferences.xml b/AnkiDroid/src/main/res/values-heb/10-preferences.xml
index 35140e2834ae..d18a271836f2 100644
--- a/AnkiDroid/src/main/res/values-heb/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-heb/10-preferences.xml
@@ -373,9 +373,9 @@
     <string name="ignore_display_cutout" maxLength="41">התעלם מגזרת התצוגה</string>
     <string name="hide_answer_buttons" maxLength="41">הסתר כפתורי תשובה</string>
     <string name="hide_hard_and_easy" maxLength="41">הסתר את הלחצנים \'קשה\' ו\'קל\'</string>
-    <string name="reviewer_frame_style" maxLength="41">Frame style</string>
-    <string name="reviewer_frame_style_card" maxLength="41" comment="Style name of the \'Card\' card frame of the Reviewer">Card</string>
-    <string name="reviewer_frame_style_box" maxLength="41" comment="Style name of the \'Box\' card frame of the Reviewer">Box</string>
+    <string name="reviewer_frame_style" maxLength="41">סגנון מסגרת</string>
+    <string name="reviewer_frame_style_card" maxLength="41" comment="Style name of the \'Card\' card frame of the Reviewer">כרטיס</string>
+    <string name="reviewer_frame_style_box" maxLength="41" comment="Style name of the \'Box\' card frame of the Reviewer">תיבה</string>
     <!--Keyboard shortcuts dialog-->
     <string name="open_settings" comment="Description of the shortcut that opens the app settings">פתח הגדרות</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-iw/01-core.xml b/AnkiDroid/src/main/res/values-iw/01-core.xml
index 247746c5b886..3548de8f25af 100644
--- a/AnkiDroid/src/main/res/values-iw/01-core.xml
+++ b/AnkiDroid/src/main/res/values-iw/01-core.xml
@@ -136,7 +136,7 @@
     <string name="empty_deck">החפיסה ריקה</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">חיפוש חפיסה</string>
     <string name="invalid_deck_name">שם חפיסה לא חוקי</string>
-    <string name="studyoptions_congrats_finished">Congratulations! You have finished for today.</string>
+    <string name="studyoptions_congrats_finished">אשריך!  סיימת להיום.</string>
     <string name="studyoptions_congrats_next_due_in" comment="The param will be replaced with \'The next card will be ready in X time\'">סיימת את החפיסה לעכשיו! %s</string>
     <string name="studyoptions_no_cards_due">אין כרטיסים נוספים</string>
     <string name="sd_card_not_mounted">התקן אחסון לא מחובר</string>
diff --git a/AnkiDroid/src/main/res/values-iw/02-strings.xml b/AnkiDroid/src/main/res/values-iw/02-strings.xml
index ae4c6dfa235a..632dd523aa99 100644
--- a/AnkiDroid/src/main/res/values-iw/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-iw/02-strings.xml
@@ -45,8 +45,8 @@
 -->
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Navigation drawer strings -->
-    <string name="drawer_open">פתיחת מגירה</string>
-    <string name="drawer_close">סגירת מגירה</string>
+    <string name="drawer_open">פתיחת תפריט</string>
+    <string name="drawer_close">סגירת תפריט</string>
     <string name="CardEditorCardDeck">חפיסת כרטיסים:‏</string>
     <string name="CardEditorNoteDeck">חפיסה:‏</string>
     <string name="CardEditorModel">סוג:</string>
@@ -85,9 +85,9 @@
     <string name="custom_study_limit_tags">הגבל לתיוג ספציפי</string>
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d קבור</item>
-        <item quantity="two">+%d buried</item>
-        <item quantity="many">+%d buried</item>
-        <item quantity="other">+%d buried</item>
+        <item quantity="two">+%d קבורים</item>
+        <item quantity="many">+%d קבורים</item>
+        <item quantity="other">+%d קבורים</item>
     </plurals>
     <string name="studyoptions_total_new_label">סה\"כ קלפים חדשים</string>
     <string name="studyoptions_total_label">סה\"כ קלפים</string>
@@ -312,7 +312,7 @@
     <string name="show_notes" comment="Label for toggle notes button in BrowserOptionsDialog">פתקים</string>
     <string name="toggle_cards_notes">החלף כרטיסים/פתקים</string>
     <string name="truncate_content_help">חתוך את הגובה של כל שורה בדפדפן כדי להציג רק 3 שורות תוכן ראשונות</string>
-    <string name="browser_options_dialog_heading">Browser options</string>
+    <string name="browser_options_dialog_heading">אפשרויות דפדפן</string>
     <string name="audio_saved">ההקלטה נשמרה</string>
     <string name="deleting_selected_notes">מחיקת הערות שנבחרו</string>
     <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">הקש על קול כדי להאזין</string>
diff --git a/AnkiDroid/src/main/res/values-iw/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-iw/07-cardbrowser.xml
index 6b47300f5def..02c01603c318 100644
--- a/AnkiDroid/src/main/res/values-iw/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-iw/07-cardbrowser.xml
@@ -124,10 +124,10 @@
     <string name="edit_tags_dialog" comment="Description of the shortcut that opens the edit tags dialog">תיבת דו-שיח עריכת תגים</string>
     <string name="show_order_dialog" comment="Description of the shortcut that shows the order dialog">הצג תיבת הזמנה</string>
     <!-- Manage columns dialog -->
-    <string name="browse_manage_columns_main_heading">Columns</string>
-    <string name="browse_manage_columns">Manage columns</string>
-    <string name="user_active_columns">Active</string>
-    <string name="user_potential_columns">Available</string>
-    <string name="include_column">Include column</string>
-    <string name="exclude_column">Exclude column</string>
+    <string name="browse_manage_columns_main_heading">עמודות</string>
+    <string name="browse_manage_columns">ניהול עמודות</string>
+    <string name="user_active_columns">פָּעִיל</string>
+    <string name="user_potential_columns">זמין</string>
+    <string name="include_column">כלול עמודה</string>
+    <string name="exclude_column">אל תכלול עמודה</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-iw/10-preferences.xml b/AnkiDroid/src/main/res/values-iw/10-preferences.xml
index 35140e2834ae..d18a271836f2 100644
--- a/AnkiDroid/src/main/res/values-iw/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-iw/10-preferences.xml
@@ -373,9 +373,9 @@
     <string name="ignore_display_cutout" maxLength="41">התעלם מגזרת התצוגה</string>
     <string name="hide_answer_buttons" maxLength="41">הסתר כפתורי תשובה</string>
     <string name="hide_hard_and_easy" maxLength="41">הסתר את הלחצנים \'קשה\' ו\'קל\'</string>
-    <string name="reviewer_frame_style" maxLength="41">Frame style</string>
-    <string name="reviewer_frame_style_card" maxLength="41" comment="Style name of the \'Card\' card frame of the Reviewer">Card</string>
-    <string name="reviewer_frame_style_box" maxLength="41" comment="Style name of the \'Box\' card frame of the Reviewer">Box</string>
+    <string name="reviewer_frame_style" maxLength="41">סגנון מסגרת</string>
+    <string name="reviewer_frame_style_card" maxLength="41" comment="Style name of the \'Card\' card frame of the Reviewer">כרטיס</string>
+    <string name="reviewer_frame_style_box" maxLength="41" comment="Style name of the \'Box\' card frame of the Reviewer">תיבה</string>
     <!--Keyboard shortcuts dialog-->
     <string name="open_settings" comment="Description of the shortcut that opens the app settings">פתח הגדרות</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ja/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-ja/07-cardbrowser.xml
index ca08ecc4b7ab..73d42eec1eb2 100644
--- a/AnkiDroid/src/main/res/values-ja/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-ja/07-cardbrowser.xml
@@ -106,10 +106,10 @@
     <string name="edit_tags_dialog" comment="Description of the shortcut that opens the edit tags dialog">タグダイアログを編集</string>
     <string name="show_order_dialog" comment="Description of the shortcut that shows the order dialog">表示順ダイアログを表示</string>
     <!-- Manage columns dialog -->
-    <string name="browse_manage_columns_main_heading">Columns</string>
-    <string name="browse_manage_columns">Manage columns</string>
-    <string name="user_active_columns">Active</string>
-    <string name="user_potential_columns">Available</string>
-    <string name="include_column">Include column</string>
-    <string name="exclude_column">Exclude column</string>
+    <string name="browse_manage_columns_main_heading">列</string>
+    <string name="browse_manage_columns">リストの列を管理</string>
+    <string name="user_active_columns">使用中</string>
+    <string name="user_potential_columns">使用可能</string>
+    <string name="include_column">この列をブラウザのリストで使用</string>
+    <string name="exclude_column">この列をブラウザのリストから除外</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ka/01-core.xml b/AnkiDroid/src/main/res/values-ka/01-core.xml
index ad3a6ee3d38f..27b9314a44b8 100644
--- a/AnkiDroid/src/main/res/values-ka/01-core.xml
+++ b/AnkiDroid/src/main/res/values-ka/01-core.xml
@@ -65,8 +65,8 @@
         <item quantity="other">დარჩენილია %1$d საათი და %2$d წუთი</item>
     </plurals>
     <plurals name="reviewer_window_title_days_new">
-        <item quantity="one">%1$d day %2$dh left</item>
-        <item quantity="other">%1$d days %2$dh left</item>
+        <item quantity="one">დარჩენილია %1$d დღე და %2$d საათი</item>
+        <item quantity="other">დარჩენილია %1$d დღე და %2$d საათი</item>
     </plurals>
     <string name="no_cards_placeholder_title">კოლექცია ცარიელია</string>
     <string name="no_cards_placeholder_description">ატვირთეთ ბარათები\n+ნიშნით</string>
@@ -108,8 +108,8 @@
     <string name="menu_search" maxLength="28">მონახულება %1$s-ში</string>
     <string name="menu_mark_note" maxLength="28">მონიშნე შენიშვნა</string>
     <string name="menu_unmark_note">შენიშვნის გაუქმება</string>
-    <string name="menu_enable_voice_playback" maxLength="28">Enable voice playback</string>
-    <string name="menu_disable_voice_playback">Disable voice playback</string>
+    <string name="menu_enable_voice_playback" maxLength="28">ხმის გამოშვების ჩართვა</string>
+    <string name="menu_disable_voice_playback">ხმის გამოშვების გამორთვა</string>
     <string name="new_deck">დასტის შექმნა</string>
     <string name="new_dynamic_deck">ფილტრირებული დასტის შექმნა</string>
     <string name="directory_inaccessible">AnkiDroid-ის ბიბლიოთეკა მიუწვდომელია</string>
@@ -129,7 +129,7 @@
     <string name="empty_deck">ეს დასტა ცარიელია</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">დასტის ძიება</string>
     <string name="invalid_deck_name">დასტის სახელი არასწორია</string>
-    <string name="studyoptions_congrats_finished">Congratulations! You have finished for today.</string>
+    <string name="studyoptions_congrats_finished">გილოცავთ! დღეისათვის სულ ეს იყო.</string>
     <string name="studyoptions_congrats_next_due_in" comment="The param will be replaced with \'The next card will be ready in X time\'">Deck finished for now! %s</string>
     <string name="studyoptions_no_cards_due">ჯერ ბარათები არ არის</string>
     <string name="sd_card_not_mounted">მოწყობილობის მეხსიერება არაა ჩაყენებული</string>
@@ -138,7 +138,7 @@
     <string name="continue_sync" tools:ignore="UnusedResources">სინქრონიზაციის გაგრძელება</string>
     <string name="sync_cancelled" tools:ignore="UnusedResources">სინქრონიზაცია გაუქმებულია</string>
     <string name="sync_cancel_message" tools:ignore="UnusedResources">გაუქმება\&#8230;\nამან შეიძლება ცოტა დრო წაიღოს.</string>
-    <string name="syncing_media">Syncing media</string>
+    <string name="syncing_media">მედიაფაილების სინქრონიზაცია</string>
     <string name="export_deck" maxLength="28">დასტის ექსპორტი</string>
     <string name="export_collection">კოლექციის ექსპორტი</string>
     <string name="nothing">არაფერი</string>
@@ -184,7 +184,7 @@
     <string name="error__etc__cannot_write_to_or_create_file">ფაილზე %s ჩაწერა ვერ მოხერხდა ან ფაილი ვერ შეიქმნა</string>
     <string name="directory_inaccessible_after_uninstall" comment="Dialog title if AnkiDroid can\'t access the collection once the app is installed">მიუწვდომელი კოლექცია</string>
     <string name="directory_inaccessible_after_uninstall_summary" comment="the parameter is the path to the AnkiDroid folder. Typically /storage/emulated/0/AnkiDroid">Play Store-ის პოლიტიკაში შეტანილი ცვლილებების შედეგად თქვენს კოლექციაზე წვდომა აღარ გვექნება, თუკი მოახდენთ AnkiDroid-ის დეინსტალაციას\n\nთქვენი მონაცემები დაცულია და მათი აღდგენაც შესაძლებელია. ისინი შეგიძლიათ იხილოთ აქ:\n%s\n\nაღსადგენად შეგიძლიათ ჩამოთვლილთაგან რომელიმე აირჩიოთ:</string>
-    <string name="directory_revoked_after_inactivity" comment="the first parameter is WRITE_EXTERNAL_STORAGE the second parameter is the path to the AnkiDroid folder. Typically /storage/emulated/0/AnkiDroid">Android has removed AnkiDroid\'s %1$s permission due to app inactivity.\n\nYour data is safe and can be restored. It is located at\n%2$s\n\nSelect an option below to restore:</string>
+    <string name="directory_revoked_after_inactivity" comment="the first parameter is WRITE_EXTERNAL_STORAGE the second parameter is the path to the AnkiDroid folder. Typically /storage/emulated/0/AnkiDroid">Android-მა AnkiDroid-ს %1$s ნებართვა ჩამოართვა აპლიკაციაში უმოქმედობის გამო.\n\nთქვენი მონაცემები დაცულია და მათი აღდგენა შესაძლოა. მათი მოთავსების ადგილია: \n%2$s\n\nაღსადგენად აირჩიეთ შესაბამისი ოფციონი:</string>
     <string name="restore_data_from_ankiweb">AnkiWeb-იდან აღდგენა (რეკომენდებული)</string>
     <string name="install_non_play_store_ankidroid_recommended">საქაღალდეზე წვდომის აღდგენა (რეკომენდებული)</string>
     <string name="install_non_play_store_ankidroid">საქაღალდეზე წვდომის აღდგენა (გაღრმავებული პარამეტრი)</string>
@@ -199,5 +199,5 @@
     <string name="image_occlusion">სასურათე საფარველები</string>
     <string name="remove_account" comment="open a website to start the deletion of an AnkiWeb account">ანგარიშის წაშლა</string>
     <!-- Instant Note Editor -->
-    <string name="instant_card" comment="This does not need to be translated literally, translate the concept of quickly adding a Cloze note with a popup. Used in the Android system context menu/share dialog.">Instant card</string>
+    <string name="instant_card" comment="This does not need to be translated literally, translate the concept of quickly adding a Cloze note with a popup. Used in the Android system context menu/share dialog.">სწრაფი ბარათი</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ka/02-strings.xml b/AnkiDroid/src/main/res/values-ka/02-strings.xml
index 8c64f99bf925..74336d6772ed 100644
--- a/AnkiDroid/src/main/res/values-ka/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ka/02-strings.xml
@@ -84,11 +84,11 @@
     <!-- Custom study options -->
     <string name="custom_study_limit_tags">კონკრეტულ იარლიყებზე შეზღუდვა</string>
     <plurals name="studyoptions_buried_count">
-        <item quantity="one">+%d buried</item>
-        <item quantity="other">+%d buried</item>
+        <item quantity="one">+%d დღეისათვის დამალულია</item>
+        <item quantity="other">+%d დღეისათვის დამალულია</item>
     </plurals>
-    <string name="studyoptions_total_new_label">Total new cards</string>
-    <string name="studyoptions_total_label">Total cards</string>
+    <string name="studyoptions_total_new_label">ახალი ბარათები ჯამში</string>
+    <string name="studyoptions_total_label">ბარათები ჯამში</string>
     <!-- Card editor -->
     <string name="cardeditor_title_edit_card" maxLength="28">შენიშვნის რედაქტირება</string>
     <string name="discard">წაშლა</string>
@@ -131,7 +131,7 @@
     <string name="delete_deck">იშლება დასტა&#8230;</string>
     <string name="info_rate">შეაფასეთ AnkiDroid</string>
     <string name="import_title">იმპორტირება</string>
-    <string name="import_preparing_file">Preparing file for import&#8230;</string>
+    <string name="import_preparing_file">ფაილის მომზადება იმპორტისთვის&#8230;</string>
     <string name="import_message_add" comment="Adding a new deck to the collection (import)">დამატება</string>
     <string name="import_message_replace_confirm">არსებული კოლექცია წაიშლება და ჩანაცვლდება არჩეული ფაილის მონაცემებით %s</string>
     <string name="import_dialog_message_add">Add “%s” to collection? This may take a long time</string>
@@ -302,7 +302,7 @@
     <string name="show_notes" comment="Label for toggle notes button in BrowserOptionsDialog">შენიშვნები</string>
     <string name="toggle_cards_notes">ბარათების/შენიშვნების ნახვა/დამალვა</string>
     <string name="truncate_content_help">ბარათების საძიებოს თითო მწკრივის სიმაღლის ისე დამოკლება, რომ მხოლოდ შიგთავსის პირველი 3 სტრიქონი აჩვენოს</string>
-    <string name="browser_options_dialog_heading">Browser options</string>
+    <string name="browser_options_dialog_heading">ბარათების საძიებოს პარამეტრები</string>
     <string name="audio_saved">ჩანაწერი შენახულია</string>
     <string name="deleting_selected_notes">მონიშნული შენიშვნების წაშლა</string>
     <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        მოსასმენად შეეხეთ ხმას
@@ -337,17 +337,17 @@
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
     <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
-    <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
+    <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">დასტის ამრჩეველი</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
-    <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
-    <string name="select_deck" comment="Description of the shortcut that opens the deck selection dialog">Select deck</string>
-    <string name="select_note_type" comment="Description of the shortcut that shows the note selection spinner">Select note type</string>
-    <string name="tag_editor" comment="Description of the shortcut that opens the tags dialog">Tag editor</string>
-    <string name="card_template_editor_group" comment="Label for the group of shortcuts related to the card template editor">Card Template Editor</string>
-    <string name="edit_front_template" comment="Description of the shortcut that shows the question side of the card template">Edit front template</string>
-    <string name="edit_back_template" comment="Description of the shortcut that shows the answer side of the card template">Edit back template</string>
-    <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
-    <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
+    <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">შენიშვნების რედაქტორი</string>
+    <string name="select_deck" comment="Description of the shortcut that opens the deck selection dialog">დასტის არჩევა</string>
+    <string name="select_note_type" comment="Description of the shortcut that shows the note selection spinner">შენიშვნის ტიპის არჩევა</string>
+    <string name="tag_editor" comment="Description of the shortcut that opens the tags dialog">იარლიყების რედაქტორი</string>
+    <string name="card_template_editor_group" comment="Label for the group of shortcuts related to the card template editor">ბარათის შაბლონის რედაქტორი</string>
+    <string name="edit_front_template" comment="Description of the shortcut that shows the question side of the card template">წინა მხარის შაბლონის რედაქტირება</string>
+    <string name="edit_back_template" comment="Description of the shortcut that shows the answer side of the card template">უკანა მხარის შაბლონის რედაქტირება</string>
+    <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">სტილის რედაქტირება</string>
+    <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">შაბლონის კოპირება markdown-ად</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
     <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
diff --git a/AnkiDroid/src/main/res/values-ka/03-dialogs.xml b/AnkiDroid/src/main/res/values-ka/03-dialogs.xml
index 03c08f3dbf56..c3c8221935a7 100644
--- a/AnkiDroid/src/main/res/values-ka/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ka/03-dialogs.xml
@@ -158,7 +158,7 @@
     <string name="error_deleting_image">შეცდომა სურათის წაშლისას</string>
     <string name="failed_to_apply_background_image">სურათის ფონზე დაყენება ვერ მოხერხდა %s</string>
     <string name="background_image_too_large">დასტის მომნიშვნელის ფონი ზედმეტად დიდია</string>
-    <string name="image_max_size_allowed">Maximum image size %d MB allowed</string>
+    <string name="image_max_size_allowed">სურათის ზომა შეიძლება იყოს არაუმეტეს %d MB-სა</string>
     <string name="image_dimensions_too_large">Image dimensions are too large (%1$d × %2$d)</string>
     <!-- Global Intent handler -->
     <!-- Also used by Card Browser, not renaming to save translators effort -->
@@ -227,13 +227,13 @@
     <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
     </string>
     <string name="deck_already_exists">დასტა უკვე არსებობს</string>
-    <string name="empty_deck_name">Deck name cannot be empty</string>
+    <string name="empty_deck_name">დასტის სახელი არ შეიძლება იყოს ცარიელი</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
     <!-- Set Due Date -->
     <string name="set_due_date_match_interval" comment="when setting a card\'s due date, this checkbox also changes the interval of the card">Set interval to same value</string>
     <plurals name="set_due_date_single_day_label" comment="a date control is provided afterwards">
-        <item quantity="one">Show card in</item>
-        <item quantity="other">Show cards in</item>
+        <item quantity="one">ბარათის ჩვენება ამდენ დღეში</item>
+        <item quantity="other">ბარათების ჩვენება ამდენ დღეში</item>
     </plurals>
     <plurals name="set_due_date_range_label" comment="a date control is provided afterwards">
         <item quantity="one">Show card in range</item>
@@ -244,23 +244,23 @@
         <item quantity="other">დღეში</item>
     </plurals>
     <string name="range_delimiter" comment="Placed between two input boxes to denote a range">–</string>
-    <string name="set_due_date_range_start" comment="\'Set Due Date\' may change the due date of a card to a random number of days in the future. This labels the \'minimum\' value of this range (inclusive)">From</string>
-    <string name="set_due_date_range_end" comment="\'Set Due Date\' may change the due date of a card to a random number of days in the future. This labels the \'maximum\' value of this range (inclusive)">To</string>
+    <string name="set_due_date_range_start" comment="\'Set Due Date\' may change the due date of a card to a random number of days in the future. This labels the \'minimum\' value of this range (inclusive)">დან</string>
+    <string name="set_due_date_range_end" comment="\'Set Due Date\' may change the due date of a card to a random number of days in the future. This labels the \'maximum\' value of this range (inclusive)">მდე</string>
     <!-- Instant Note Editor -->
     <string name="cloze_note_required">Cloze Type Note Required</string>
     <string name="cloze_not_found_message">No Cloze type note found, open the Note Editor or try again after adding a Cloze type note.</string>
     <string name="open">Open</string>
     <string name="change_cloze_number">Change cloze number</string>
     <string name="cloze_number">Cloze number:</string>
-    <string name="change_editor_mode">Change editor mode</string>
-    <string name="open_note_editor">Open note editor</string>
-    <string name="change_cloze_mode">Change cloze mode</string>
+    <string name="change_editor_mode">რედაქტორის რეჟიმის შეცვლა</string>
+    <string name="open_note_editor">შენიშვნის რედაქტორის გახსნა</string>
+    <string name="change_cloze_mode">გამოტოვებული ადგილების რეჟიმის შეცვლა</string>
     <!-- Outdated WebView dialog -->
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
-    <string name="compress">Compress</string>
+    <string name="compress">კომპრესირება</string>
     <!-- Tts playback error dialog -->
-    <string name="tts_error_dialog_title">Language not supported</string>
-    <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
-    <string name="tts_error_dialog_change_button_text">Change engine</string>
-    <string name="tts_error_dialog_supported_voices_button_text">Voice options</string>
+    <string name="tts_error_dialog_title">ენა მხარდაჭერილი არაა</string>
+    <string name="tts_error_dialog_reason_text">ხმოვან წამკითხველ <b>%1$s-ში</b> არაა მხარდაჭერილი ეს ენა: <b>%2$s</b></string>
+    <string name="tts_error_dialog_change_button_text">ძრავას შეცვლა</string>
+    <string name="tts_error_dialog_supported_voices_button_text">ხმის პარამეტრები</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ka/04-network.xml b/AnkiDroid/src/main/res/values-ka/04-network.xml
index b8e1ec9b0775..f9dd49cc55ec 100644
--- a/AnkiDroid/src/main/res/values-ka/04-network.xml
+++ b/AnkiDroid/src/main/res/values-ka/04-network.xml
@@ -75,11 +75,11 @@
     <!-- Please run ‘Check database’ before syncing -->
     <string name="sync_sanity_local">ლოკალური</string>
     <string name="sync_sanity_remote">დისტანციური</string>
-    <string name="one_way_sync_title" maxLength="41">One-way sync</string>
+    <string name="one_way_sync_title" maxLength="41">ცალმხრივი სინქრონიზაცია</string>
     <string name="one_way_sync_confirmation">One way sync requested</string>
     <string name="full_sync_confirmation">The requested change will require a full upload of the database when you next synchronize your collection. If you have reviews or other changes waiting on another device that haven’t been synchronized here yet, they will be lost. Continue?</string>
     <string name="full_sync_confirmation_upgrade">Due to a bug in the previously installed version of AnkiDroid, it’s recommended to force a full sync.</string>
     <!-- Deck Picker Sync Icon -->
-    <string name="sync_menu_title_one_way_sync">Sync (one-way)</string>
+    <string name="sync_menu_title_one_way_sync">სინქრონიზაცია (ცალმხრივი)</string>
     <string name="sync_menu_title_no_account">სინქრონიზაცია (ავტორიზაცია)</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ka/06-statistics.xml b/AnkiDroid/src/main/res/values-ka/06-statistics.xml
index a50118f626c8..0a2910531db3 100644
--- a/AnkiDroid/src/main/res/values-ka/06-statistics.xml
+++ b/AnkiDroid/src/main/res/values-ka/06-statistics.xml
@@ -44,5 +44,5 @@
 ~ this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <resources>
-    <string name="open_statistics" comment="Description of the shortcut that opens the statistics page">Open statistics</string>
+    <string name="open_statistics" comment="Description of the shortcut that opens the statistics page">სტატისტიკის გახსნა</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ka/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-ka/07-cardbrowser.xml
index e4514f8103cb..0c2986ff1b36 100644
--- a/AnkiDroid/src/main/res/values-ka/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-ka/07-cardbrowser.xml
@@ -73,8 +73,8 @@
     <string name="no_note_to_edit">No note to edit</string>
     <string name="card_browser_list_my_searches_remove_content">„%1$s“ წაიშალოს?</string>
     <string name="card_browser_change_display_order" maxLength="28">ჩვენების თანმიმდევრობის შეცვლა</string>
-    <string name="card_browser_search_hint" comment="Message displayed in the search text field in the card browser.">Search</string>
-    <string name="card_browser_cram_search" maxLength="28" comment="Menu entry to start a search.">Search</string>
+    <string name="card_browser_search_hint" comment="Message displayed in the search text field in the card browser.">ძებნა</string>
+    <string name="card_browser_cram_search" maxLength="28" comment="Menu entry to start a search.">ძებნა</string>
     <string name="card_browser_change_display_order_title">ჩვენების თანმიმდევრობის არჩევა</string>
     <string name="card_details_tags">იარლიყები</string>
     <string-array name="card_browser_order_labels">
@@ -112,10 +112,10 @@
     <string name="edit_tags_dialog" comment="Description of the shortcut that opens the edit tags dialog">Edit tags dialog</string>
     <string name="show_order_dialog" comment="Description of the shortcut that shows the order dialog">Show order dialog</string>
     <!-- Manage columns dialog -->
-    <string name="browse_manage_columns_main_heading">Columns</string>
-    <string name="browse_manage_columns">Manage columns</string>
-    <string name="user_active_columns">Active</string>
-    <string name="user_potential_columns">Available</string>
-    <string name="include_column">Include column</string>
-    <string name="exclude_column">Exclude column</string>
+    <string name="browse_manage_columns_main_heading">სვეტები</string>
+    <string name="browse_manage_columns">სვეტების მართვა</string>
+    <string name="user_active_columns">აქტიური</string>
+    <string name="user_potential_columns">ხელმისაწვდომი</string>
+    <string name="include_column">სვეტის გამოყენება</string>
+    <string name="exclude_column">სვეტის არგამოყენება</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ka/08-widget.xml b/AnkiDroid/src/main/res/values-ka/08-widget.xml
index c388597d110d..c12994f1ed44 100644
--- a/AnkiDroid/src/main/res/values-ka/08-widget.xml
+++ b/AnkiDroid/src/main/res/values-ka/08-widget.xml
@@ -60,13 +60,13 @@
         <item quantity="other">დარჩენილია %d წუთი</item>
     </plurals>
     <string name="widget_add_note_button">ახალი AnkiDroid-შენიშვნის დამატება</string>
-    <string name="deck_picker_widget_description" comment="Title of the Deck Picker Widget. Displayed to the user in Android\'s Widget Selection menu">Deck Picker</string>
-    <string name="card_analysis_extra_widget_description">Card Analysis</string>
+    <string name="deck_picker_widget_description" comment="Title of the Deck Picker Widget. Displayed to the user in Android\'s Widget Selection menu">დასტის ამრჩეველი</string>
+    <string name="card_analysis_extra_widget_description">ბარათების ანალიზი</string>
     <!-- Strings to explain usage in Deck Picker and Card Analysis Widget Configuration screen -->
-    <string name="select_decks_title" comment="Title for Deck Selection Dialog">Select decks</string>
-    <string name="select_deck_title" comment="Title for Deck Selection Dialog">Select a deck</string>
+    <string name="select_decks_title" comment="Title for Deck Selection Dialog">დასტების არჩევა</string>
+    <string name="select_deck_title" comment="Title for Deck Selection Dialog">დასტის არჩევა</string>
     <string name="no_selected_deck_placeholder_title" comment="Placeholder title when no decks are selected">Select decks to display in the widget. Select decks with the + icon.</string>
-    <string name="deck_removed_from_widget" comment="Snackbar when deck is removed from widget">Deck removed</string>
+    <string name="deck_removed_from_widget" comment="Snackbar when deck is removed from widget">დასტა ამოიშალა ვიჯეტიდან</string>
     <string name="deck_already_selected_message" comment="Snackbar when user try to select the same deck again">This deck is already selected</string>
     <plurals name="deck_limit_reached">
         <item quantity="one">You can select up to %d deck.</item>
diff --git a/AnkiDroid/src/main/res/values-ka/10-preferences.xml b/AnkiDroid/src/main/res/values-ka/10-preferences.xml
index 6b9c238db321..2b5f53cea2ef 100644
--- a/AnkiDroid/src/main/res/values-ka/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ka/10-preferences.xml
@@ -217,7 +217,7 @@
         <a href="%s">Learn more</a>
         ]]></string>
     <string name="custom_sync_server_base_url_title" maxLength="41">სინქრონიზაციის URL</string>
-    <string name="custom_sync_certificate_title" maxLength="41">Custom root certificate (PEM)</string>
+    <string name="custom_sync_certificate_title" maxLength="41">ინდივიდუალური ძირეული სერტიფიკატი (PEM)</string>
     <!-- Key Bindings -->
     <string name="keyboard">კლავიატურა</string>
     <string name="bluetooth">Bluetooth</string>
@@ -267,7 +267,7 @@
     <string name="binding_add_axis">ჯოისტიკის/მოძრაობით მართული კონტროლერის დამატება</string>
     <string name="axis_picker_move_joystick">ჯოისტიკის/მოძრაობით მართული კონტროლერის გამოძრავება</string>
     <string name="user_actions" maxLength="41">მომხმარებლის ქმედებები</string>
-    <string name="user_actions_summary" maxLength="41">Trigger JavaScript from the review screen</string>
+    <string name="user_actions_summary" maxLength="41">JavaScript-ის გაშვება გადახედვის ეკრანიდან</string>
     <string name="user_action_1" maxLength="28">მომხმარებლის ქმედება 1</string>
     <string name="user_action_2" maxLength="28">მომხმარებლის ქმედება 2</string>
     <string name="user_action_3" maxLength="28">მომხმარებლის ქმედება 3</string>
@@ -364,12 +364,12 @@
     <string name="hide_system_bars_status_bar" comment="Setting option to hide the system status bar (the top one with clock, battery status, etc)">სტატუსის ზოლი</string>
     <string name="hide_system_bars_navigation_bar" comment="Setting option to hide the system navigation bar (the bottom one that can go back, to home, etc)">ნავიგაციის ზოლი</string>
     <string name="hide_system_bars_all_bars" comment="Setting option to hide all the system bars">ყველა</string>
-    <string name="ignore_display_cutout" maxLength="41">Ignore display cutout</string>
+    <string name="ignore_display_cutout" maxLength="41">ეკრანის ზედა ჭრილის უგულებელყოფა</string>
     <string name="hide_answer_buttons" maxLength="41">Hide answer buttons</string>
     <string name="hide_hard_and_easy" maxLength="41">Hide ‘Hard’ and ‘Easy’ buttons</string>
-    <string name="reviewer_frame_style" maxLength="41">Frame style</string>
-    <string name="reviewer_frame_style_card" maxLength="41" comment="Style name of the \'Card\' card frame of the Reviewer">Card</string>
-    <string name="reviewer_frame_style_box" maxLength="41" comment="Style name of the \'Box\' card frame of the Reviewer">Box</string>
+    <string name="reviewer_frame_style" maxLength="41">ბარათის ჩარჩოს სტილი</string>
+    <string name="reviewer_frame_style_card" maxLength="41" comment="Style name of the \'Card\' card frame of the Reviewer">ბარათი (მრგვალი კუთხეები)</string>
+    <string name="reviewer_frame_style_box" maxLength="41" comment="Style name of the \'Box\' card frame of the Reviewer">ყუთი (სწორი კუთხეები)</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="open_settings" comment="Description of the shortcut that opens the app settings">Open settings</string>
+    <string name="open_settings" comment="Description of the shortcut that opens the app settings">პარამეტრების გახსნა</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ka/11-arrays.xml b/AnkiDroid/src/main/res/values-ka/11-arrays.xml
index b06e48543be2..b6511e4d9816 100644
--- a/AnkiDroid/src/main/res/values-ka/11-arrays.xml
+++ b/AnkiDroid/src/main/res/values-ka/11-arrays.xml
@@ -84,7 +84,7 @@
     <string name="answer_good" maxLength="41">პასუხი: კარგი</string>
     <string name="answer_easy" maxLength="41">პასუხი: მარტივი</string>
     <string name="gesture_play" maxLength="41">მედიაფაილების დაკვრა</string>
-    <string name="gesture_abort_learning" maxLength="41">Close reviewer</string>
+    <string name="gesture_abort_learning" maxLength="41">გადამხედველის დახურვა</string>
     <string name="gesture_flag_red" maxLength="41">წითელი დროშის მიმაგრება/მოძრობა</string>
     <string name="gesture_flag_orange" maxLength="41">სტაფილოსფერი დროშის მიმაგრება/მოძრობა</string>
     <string name="gesture_flag_green" maxLength="41">მწვანე დროშის მიმაგრება/მოძრობა</string>
diff --git a/AnkiDroid/src/main/res/values-ru/01-core.xml b/AnkiDroid/src/main/res/values-ru/01-core.xml
index 2ae70b88e664..3fc81d2661d0 100644
--- a/AnkiDroid/src/main/res/values-ru/01-core.xml
+++ b/AnkiDroid/src/main/res/values-ru/01-core.xml
@@ -94,7 +94,7 @@
     <string name="rename_deck" maxLength="28">Переименовать колоду</string>
     <string name="create_shortcut">Создать ярлык</string>
     <string name="browse_cards">Показать список</string>
-    <string name="edit_deck_description" comment="edit the deck description">Редактировать описание</string>
+    <string name="edit_deck_description" comment="edit the deck description">Изменить описание</string>
     <string name="menu_add" comment="A generic add button. Please inform us if you need more specific strings" maxLength="28">Добавить</string>
     <string name="menu_add_note" maxLength="28">Добавить запись</string>
     <string name="menu_my_account" comment="Label of the window in which the user should enter their account. This text can\'t be found in AnkiDroid directly.">Учётная запись синхронизации</string>
@@ -135,7 +135,7 @@
     <string name="empty_deck">Эта колода пуста</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Поиск колоды</string>
     <string name="invalid_deck_name">Недопустимое название колоды</string>
-    <string name="studyoptions_congrats_finished">Congratulations! You have finished for today.</string>
+    <string name="studyoptions_congrats_finished">Ура! На сегодня всё.</string>
     <string name="studyoptions_congrats_next_due_in" comment="The param will be replaced with \'The next card will be ready in X time\'">Колода закончилась! %s</string>
     <string name="studyoptions_no_cards_due">Нет карточек на сегодня</string>
     <string name="sd_card_not_mounted">Карта памяти не установлена</string>
diff --git a/AnkiDroid/src/main/res/values-ru/02-strings.xml b/AnkiDroid/src/main/res/values-ru/02-strings.xml
index dbcfeafc6b3f..1c3be8e44e47 100644
--- a/AnkiDroid/src/main/res/values-ru/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ru/02-strings.xml
@@ -312,7 +312,7 @@
     <string name="show_notes" comment="Label for toggle notes button in BrowserOptionsDialog">Записи</string>
     <string name="toggle_cards_notes">Карточки — записи</string>
     <string name="truncate_content_help">Показывать в списке только первые 3 строки</string>
-    <string name="browser_options_dialog_heading">Browser options</string>
+    <string name="browser_options_dialog_heading">Параметры списка карточек</string>
     <string name="audio_saved">Запись сохранена </string>
     <string name="deleting_selected_notes">Выбранные записи удаляются</string>
     <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Нажмите на голосе, чтобы послушать
@@ -345,16 +345,16 @@
     <string name="voice_not_supported">Этот голос не поддерживается. Попробуйте другой или установите голосовой движок.</string>
     <!--Keyboard shortcuts dialog-->
     <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Показать диалог сочетаний клавиш</string>
-    <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Выборщик колоды</string>
+    <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Выбор колоды</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Удалить колоду без подтверждения</string>
-    <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Редактор заметок</string>
+    <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Редактор записей</string>
     <string name="select_deck" comment="Description of the shortcut that opens the deck selection dialog">Выбрать колоду</string>
     <string name="select_note_type" comment="Description of the shortcut that shows the note selection spinner">Выбрать тип записи</string>
     <string name="tag_editor" comment="Description of the shortcut that opens the tags dialog">Редактор меток</string>
     <string name="card_template_editor_group" comment="Label for the group of shortcuts related to the card template editor">Редактор шаблонов карточек</string>
     <string name="edit_front_template" comment="Description of the shortcut that shows the question side of the card template">Изменить шаблон лицевой стороны</string>
     <string name="edit_back_template" comment="Description of the shortcut that shows the answer side of the card template">Изменить шаблон оборота</string>
-    <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Редактировать стилизирование</string>
+    <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Править стиль</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Копировать шаблон как markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Изменить вид браузера</string>
     <string name="show_shortcuts_message">Нажмите Alt+K, чтобы показать сочетания клавиш</string>
diff --git a/AnkiDroid/src/main/res/values-ru/03-dialogs.xml b/AnkiDroid/src/main/res/values-ru/03-dialogs.xml
index 8c4ff14174bc..f6c1b177dea7 100644
--- a/AnkiDroid/src/main/res/values-ru/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ru/03-dialogs.xml
@@ -192,7 +192,7 @@
     <string name="help_item_support_develop_ankidroid">Программировать</string>
     <string name="help_item_support_rate_ankidroid">Оценить</string>
     <string name="help_item_support_other_ankidroid">Другое</string>
-    <string name="multimedia_editor_trans_translate">Перевод</string>
+    <string name="multimedia_editor_trans_translate">Перевести</string>
     <string name="help_title_community">Сообщество</string>
     <string name="help_item_anki_forums">Форум Anki</string>
     <string name="help_item_discord">Discord</string>
diff --git a/AnkiDroid/src/main/res/values-ru/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-ru/07-cardbrowser.xml
index ebbc442ae960..0d7cb7df5d7b 100644
--- a/AnkiDroid/src/main/res/values-ru/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-ru/07-cardbrowser.xml
@@ -59,10 +59,10 @@
     </plurals>
     <string name="card_browser_all_decks">Все колоды</string>
     <plurals name="card_browser_delete_notes">
-        <item quantity="one">Удалить заметку</item>
-        <item quantity="few">Удалить заметки</item>
-        <item quantity="many">Удалить заметки</item>
-        <item quantity="other">Удалить заметки</item>
+        <item quantity="one">Удалить запись</item>
+        <item quantity="few">Удалить записи</item>
+        <item quantity="many">Удалить записи</item>
+        <item quantity="other">Удалить записи</item>
     </plurals>
     <string name="card_browser_change_deck" maxLength="28">Сменить колоду</string>
     <string name="delete_card_title">Удалить запись?</string>
@@ -76,7 +76,7 @@
     <string name="card_browser_list_my_searches_new_name">Название запроса</string>
     <string name="card_browser_list_my_searches_new_search_error_empty_name">Нельзя сохранить запрос без названия</string>
     <string name="card_browser_list_my_searches_new_search_error_dup">Такое название уже существует</string>
-    <string name="no_note_to_edit">Нет записей для редактирования</string>
+    <string name="no_note_to_edit">Нет записей для правки</string>
     <string name="card_browser_list_my_searches_remove_content">Удалить «%1$s»?</string>
     <string name="card_browser_change_display_order" maxLength="28">Изменить сортировку</string>
     <string name="card_browser_search_hint" comment="Message displayed in the search text field in the card browser.">Искать</string>
@@ -124,10 +124,10 @@
     <string name="edit_tags_dialog" comment="Description of the shortcut that opens the edit tags dialog">Редактировать диалог меток</string>
     <string name="show_order_dialog" comment="Description of the shortcut that shows the order dialog">Показать диалоговое окно порядка</string>
     <!-- Manage columns dialog -->
-    <string name="browse_manage_columns_main_heading">Columns</string>
-    <string name="browse_manage_columns">Manage columns</string>
-    <string name="user_active_columns">Active</string>
-    <string name="user_potential_columns">Available</string>
-    <string name="include_column">Include column</string>
-    <string name="exclude_column">Exclude column</string>
+    <string name="browse_manage_columns_main_heading">Столбцы</string>
+    <string name="browse_manage_columns">Настроить столбцы</string>
+    <string name="user_active_columns">Включённые</string>
+    <string name="user_potential_columns">Доступные</string>
+    <string name="include_column">Включить столбец</string>
+    <string name="exclude_column">Исключить столбец</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ru/10-preferences.xml b/AnkiDroid/src/main/res/values-ru/10-preferences.xml
index 5c51d5a3f109..f0420dc1d759 100644
--- a/AnkiDroid/src/main/res/values-ru/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ru/10-preferences.xml
@@ -47,14 +47,14 @@
     <!-- generic strings -->
     <string name="disabled">Выкл.</string>
     <plurals name="pref_summ_minutes">
-        <item quantity="one">%d минута</item>
+        <item quantity="one">%d мин</item>
         <item quantity="few">%d мин</item>
         <item quantity="many">%d мин</item>
         <item quantity="other">%d мин</item>
     </plurals>
     <string name="pref_milliseconds">%s мс</string>
     <!-- TODO: move to 20-search-preference so we can contribute upstream (searchpreference_no_results)-->
-    <string name="pref_search_no_results">Ничего не найденo</string>
+    <string name="pref_search_no_results">Ничего не найдено</string>
     <!-- preferences.xml categories-->
     <string name="pref_cat_general" comment="name of the general preference category" maxLength="41">Общие</string>
     <string name="pref_cat_studying" maxLength="41">Поведение</string>
@@ -202,7 +202,7 @@
     <string name="thirdparty_apps_summary">Покажет список приложений, которые используют API AnkiDroid, например, словари</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Повторение</string>
-    <string name="show_deck_title" maxLength="41">Показать название колоды</string>
+    <string name="show_deck_title" maxLength="41">Показывать название колоды</string>
     <string name="accessibility" maxLength="41">Специальные возможности</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Вставлять изображения буфера как PNG</string>
@@ -371,9 +371,9 @@
     <string name="ignore_display_cutout" maxLength="41">Игнорировать вырез экрана</string>
     <string name="hide_answer_buttons" maxLength="41">Скрывать кнопки ответа</string>
     <string name="hide_hard_and_easy" maxLength="41">Скрывать кнопки «Трудно» и «Легко»</string>
-    <string name="reviewer_frame_style" maxLength="41">Frame style</string>
-    <string name="reviewer_frame_style_card" maxLength="41" comment="Style name of the \'Card\' card frame of the Reviewer">Card</string>
-    <string name="reviewer_frame_style_box" maxLength="41" comment="Style name of the \'Box\' card frame of the Reviewer">Box</string>
+    <string name="reviewer_frame_style" maxLength="41">Стиль рамки</string>
+    <string name="reviewer_frame_style_card" maxLength="41" comment="Style name of the \'Card\' card frame of the Reviewer">Карточка</string>
+    <string name="reviewer_frame_style_box" maxLength="41" comment="Style name of the \'Box\' card frame of the Reviewer">Квадратная</string>
     <!--Keyboard shortcuts dialog-->
     <string name="open_settings" comment="Description of the shortcut that opens the app settings">Открыть настройки</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ru/11-arrays.xml b/AnkiDroid/src/main/res/values-ru/11-arrays.xml
index 415d57653273..51b73943e21a 100644
--- a/AnkiDroid/src/main/res/values-ru/11-arrays.xml
+++ b/AnkiDroid/src/main/res/values-ru/11-arrays.xml
@@ -80,9 +80,9 @@
     <string name="html_size_code_xx_large">самый большой</string>
     <!-- gestures_labels -->
     <string name="answer_again" maxLength="41">Ответить снова</string>
-    <string name="answer_hard" maxLength="41">Сложный ответ</string>
-    <string name="answer_good" maxLength="41">Хороший ответ</string>
-    <string name="answer_easy" maxLength="41">Простой ответ</string>
+    <string name="answer_hard" maxLength="41">Ответить «Трудно»</string>
+    <string name="answer_good" maxLength="41">Ответить «Хорошо»</string>
+    <string name="answer_easy" maxLength="41">Ответить «Легко»</string>
     <string name="gesture_play" maxLength="41">Воспроизвести медиафайл</string>
     <string name="gesture_abort_learning" maxLength="41">Закрыть повторение</string>
     <string name="gesture_flag_red" maxLength="41">Красный флажок</string>
diff --git a/AnkiDroid/src/main/res/values-ug/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-ug/07-cardbrowser.xml
index eeb6db4d9e73..8110813fcfcf 100644
--- a/AnkiDroid/src/main/res/values-ug/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-ug/07-cardbrowser.xml
@@ -112,10 +112,10 @@
     <string name="edit_tags_dialog" comment="Description of the shortcut that opens the edit tags dialog">بەلگە سۆزلەشكۈ تەھرىر</string>
     <string name="show_order_dialog" comment="Description of the shortcut that shows the order dialog">تەرتىپ كۆزنىكىنى كۆرسىتىدۇ</string>
     <!-- Manage columns dialog -->
-    <string name="browse_manage_columns_main_heading">Columns</string>
-    <string name="browse_manage_columns">Manage columns</string>
-    <string name="user_active_columns">Active</string>
-    <string name="user_potential_columns">Available</string>
-    <string name="include_column">Include column</string>
-    <string name="exclude_column">Exclude column</string>
+    <string name="browse_manage_columns_main_heading">رەت</string>
+    <string name="browse_manage_columns">رەت باشقۇرۇش</string>
+    <string name="user_active_columns">ئاكتىپ</string>
+    <string name="user_potential_columns">ئىشلىتىلىشچان</string>
+    <string name="include_column">رەت ئىچىدە</string>
+    <string name="exclude_column">رەت سىرتىدا</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-uk/01-core.xml b/AnkiDroid/src/main/res/values-uk/01-core.xml
index 54445c2e7b5a..575f7bd2d3df 100644
--- a/AnkiDroid/src/main/res/values-uk/01-core.xml
+++ b/AnkiDroid/src/main/res/values-uk/01-core.xml
@@ -109,13 +109,13 @@
     <string name="menu_flag" maxLength="41">Прапорець</string>
     <string name="rename_flag">Перейменувати прапорці</string>
     <string name="menu_flag_card" maxLength="28">Додати прапорець</string>
-    <string name="menu_edit_tags" maxLength="28">Редагувати примітки</string>
+    <string name="menu_edit_tags" maxLength="28">Редагувати теги</string>
     <string name="delete_note_message">Дійсно видалити цей запис разом з усіма його картками?\n%s</string>
     <string name="menu_search" maxLength="28">Пошук у %1$s</string>
     <string name="menu_mark_note" maxLength="28">Позначити запис</string>
     <string name="menu_unmark_note">Зняти позначку запису</string>
-    <string name="menu_enable_voice_playback" maxLength="28">Увімкнути відтворення голосу</string>
-    <string name="menu_disable_voice_playback">Вимкнути відтворення голосу</string>
+    <string name="menu_enable_voice_playback" maxLength="28">Увімкнути запис голосу</string>
+    <string name="menu_disable_voice_playback">Вимкнути запис голосу</string>
     <string name="new_deck">Створити колоду</string>
     <string name="new_dynamic_deck">Створити фільтровану колоду</string>
     <string name="directory_inaccessible">Папка AnkiDroid недоступна</string>
@@ -135,7 +135,7 @@
     <string name="empty_deck">Ця колода порожня</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Пошук колоди</string>
     <string name="invalid_deck_name">Некоректна назва колоди</string>
-    <string name="studyoptions_congrats_finished">Congratulations! You have finished for today.</string>
+    <string name="studyoptions_congrats_finished">Вітаємо! На сьогодні це все.</string>
     <string name="studyoptions_congrats_next_due_in" comment="The param will be replaced with \'The next card will be ready in X time\'">Колоду завершено! %s</string>
     <string name="studyoptions_no_cards_due">Не залишилось карток на перегляд</string>
     <string name="sd_card_not_mounted">Пристрій зберігання не підключено</string>
diff --git a/AnkiDroid/src/main/res/values-uk/02-strings.xml b/AnkiDroid/src/main/res/values-uk/02-strings.xml
index bfed43161e5c..152d10713032 100644
--- a/AnkiDroid/src/main/res/values-uk/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-uk/02-strings.xml
@@ -54,11 +54,11 @@
     <string name="CardEditorCards">Картки: %1$s</string>
     <string name="edit_occlusions">Редагувати оклюзії</string>
     <string name="tag_name">Назва позначки</string>
-    <string name="add_new_filter_tags">Додати/фільтрувати позначки</string>
+    <string name="add_new_filter_tags">Додати/фільтрувати теги</string>
     <string name="add_tag" maxLength="28">Додати позначку</string>
     <string name="check_all_tags" maxLength="28">Обрати/прибрати усі позначки</string>
-    <string name="filter_tags" maxLength="28">Фільтр позначок</string>
-    <string name="no_tags">Ви ще не додали жодної позначки</string>
+    <string name="filter_tags" maxLength="28">Пошук тегів</string>
+    <string name="no_tags">Ви ще не додали жодного тегу</string>
     <string name="updated_version">Оновлено до версії %s</string>
     <!-- Reviewer.kt -->
     <string name="save_whiteboard" maxLength="28">Зберегти написане</string>
@@ -311,8 +311,8 @@
     <string name="show_cards" comment="Label for toggle cards button in BrowserOptionsDialog">Картки</string>
     <string name="show_notes" comment="Label for toggle notes button in BrowserOptionsDialog">Записи</string>
     <string name="toggle_cards_notes">Перемкнути картки/записи</string>
-    <string name="truncate_content_help">Скоротіть висоту кожного рядка браузера, щоб показати лише перші 3 рядки вмісту</string>
-    <string name="browser_options_dialog_heading">Browser options</string>
+    <string name="truncate_content_help">Скоротити висоту кожного рядка переглядача, щоб було видно лише перші 3 рядки вмісту</string>
+    <string name="browser_options_dialog_heading">Параметри переглядача карток</string>
     <string name="audio_saved">Запис аудіо збережено</string>
     <string name="deleting_selected_notes">Видалення вибраних записів</string>
     <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Натисніть на голос, щоб прослухати
@@ -360,7 +360,7 @@
     <string name="edit_back_template" comment="Description of the shortcut that shows the answer side of the card template">Редагувати шаблон задньої сторони</string>
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Редагувати стиль</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Копіювати шаблон як розмітку</string>
-    <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Редагувати вигляд браузера</string>
+    <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Редагувати вигляд переглядача карток</string>
     <string name="show_shortcuts_message">Натисніть Alt+K, щоб показати комбінації клавіш</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">Дію користувача %s не встановлено в цьому типі запису. Будь ласка, налаштуйте її</string>
     <string name="directory_inaccessible_info">Дізнайтесь більше про те, як відновити доступ тут – %s, або перейдіть в налаштування, щоб оновити теку колекцій.</string>
diff --git a/AnkiDroid/src/main/res/values-uk/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-uk/07-cardbrowser.xml
index 9887d1358433..39a129bdfb23 100644
--- a/AnkiDroid/src/main/res/values-uk/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-uk/07-cardbrowser.xml
@@ -82,7 +82,7 @@
     <string name="card_browser_search_hint" comment="Message displayed in the search text field in the card browser.">Пошук</string>
     <string name="card_browser_cram_search" maxLength="28" comment="Menu entry to start a search.">Пошук</string>
     <string name="card_browser_change_display_order_title">Вибрати порядок відображення</string>
-    <string name="card_details_tags">Позначки</string>
+    <string name="card_details_tags">Теги</string>
     <string-array name="card_browser_order_labels">
         <item>Без сортування (швидше)</item>
         <item>За полем сортування </item>
@@ -124,10 +124,10 @@
     <string name="edit_tags_dialog" comment="Description of the shortcut that opens the edit tags dialog">Редагувати діалогове вікно тегів</string>
     <string name="show_order_dialog" comment="Description of the shortcut that shows the order dialog">Показати діалогове вікно порядку</string>
     <!-- Manage columns dialog -->
-    <string name="browse_manage_columns_main_heading">Columns</string>
-    <string name="browse_manage_columns">Manage columns</string>
-    <string name="user_active_columns">Active</string>
-    <string name="user_potential_columns">Available</string>
-    <string name="include_column">Include column</string>
-    <string name="exclude_column">Exclude column</string>
+    <string name="browse_manage_columns_main_heading">Стовпці</string>
+    <string name="browse_manage_columns">Налаштувати стовпці</string>
+    <string name="user_active_columns">Активні</string>
+    <string name="user_potential_columns">Доступні</string>
+    <string name="include_column">Включити стовпець</string>
+    <string name="exclude_column">Виключити стовпець</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-uk/08-widget.xml b/AnkiDroid/src/main/res/values-uk/08-widget.xml
index 7f121c25f700..c60a9d5453d4 100644
--- a/AnkiDroid/src/main/res/values-uk/08-widget.xml
+++ b/AnkiDroid/src/main/res/values-uk/08-widget.xml
@@ -72,7 +72,7 @@
     <string name="select_decks_title" comment="Title for Deck Selection Dialog">Виберіть колоди</string>
     <string name="select_deck_title" comment="Title for Deck Selection Dialog">Вибрати колоду</string>
     <string name="no_selected_deck_placeholder_title" comment="Placeholder title when no decks are selected">Виберіть колоди для відображення у віджеті. Виберіть колоди за допомогою піктограми +.</string>
-    <string name="deck_removed_from_widget" comment="Snackbar when deck is removed from widget">Колоду видалено</string>
+    <string name="deck_removed_from_widget" comment="Snackbar when deck is removed from widget">Колоду видалено з віджета</string>
     <string name="deck_already_selected_message" comment="Snackbar when user try to select the same deck again">Ця колода вже вибрана</string>
     <plurals name="deck_limit_reached">
         <item quantity="one">Ви можете вибрати до %d колоди.</item>
diff --git a/AnkiDroid/src/main/res/values-uk/10-preferences.xml b/AnkiDroid/src/main/res/values-uk/10-preferences.xml
index b5dbaf946b33..c44d89f3f6b6 100644
--- a/AnkiDroid/src/main/res/values-uk/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-uk/10-preferences.xml
@@ -233,7 +233,7 @@
     <string name="media" maxLength="41">Медіафайли</string>
     <string name="misc" maxLength="41">Різне</string>
     <!-- studyoptions -->
-    <string name="studyoptions_limit_select_tags">Оберіть позначки</string>
+    <string name="studyoptions_limit_select_tags">Оберіть теги</string>
     <!-- Deck configurations -->
     <string name="deck_conf_general" maxLength="41" comment="Label of the submenu for the general options of new deck">Загальні</string>
     <string name="deck_conf_reminders" maxLength="41">Нагадування</string>
@@ -374,9 +374,9 @@
     <string name="ignore_display_cutout" maxLength="41">Ігнорувати виріз дисплею</string>
     <string name="hide_answer_buttons" maxLength="41">Приховати кнопки відповіді</string>
     <string name="hide_hard_and_easy" maxLength="41">Приховати кнопки \'Важко\' і \'Легко\'</string>
-    <string name="reviewer_frame_style" maxLength="41">Frame style</string>
-    <string name="reviewer_frame_style_card" maxLength="41" comment="Style name of the \'Card\' card frame of the Reviewer">Card</string>
-    <string name="reviewer_frame_style_box" maxLength="41" comment="Style name of the \'Box\' card frame of the Reviewer">Box</string>
+    <string name="reviewer_frame_style" maxLength="41">Стиль рамки</string>
+    <string name="reviewer_frame_style_card" maxLength="41" comment="Style name of the \'Card\' card frame of the Reviewer">Картка</string>
+    <string name="reviewer_frame_style_box" maxLength="41" comment="Style name of the \'Box\' card frame of the Reviewer">Квадратна</string>
     <!--Keyboard shortcuts dialog-->
     <string name="open_settings" comment="Description of the shortcut that opens the app settings">Відкрити налаштування</string>
 </resources>
diff --git a/docs/marketing/localized_description/marketdescription-uk.txt b/docs/marketing/localized_description/marketdescription-uk.txt
index 4c524746a9d4..b3c35f90acff 100644
--- a/docs/marketing/localized_description/marketdescription-uk.txt
+++ b/docs/marketing/localized_description/marketdescription-uk.txt
@@ -22,7 +22,7 @@ AnkiDroid дозволяє ефективно вивчати картки з п
 • введення відповіді (за бажанням)
 • дошка для малювання
 • редактор карт
-• переглядач карт
+• переглядач карток
 • підтримка планшетів
 • імпорт існуючих колекцій файлів (через настільну програму Anki)
 • додавання карток з інших програм

From 46092ee211d4eaea4546ad5da58b3a081aa52fcc Mon Sep 17 00:00:00 2001
From: AnkiDroid Translations <ankidroid@ankidroid.org>
Date: Fri, 7 Feb 2025 09:16:43 +0000
Subject: [PATCH 006/200] Updated strings from Crowdin

---
 AnkiDroid/src/main/res/values-eo/01-core.xml  | 48 +++++++++----------
 .../src/main/res/values-eo/02-strings.xml     |  4 +-
 .../res/values-eo/16-multimedia-editor.xml    |  2 +-
 AnkiDroid/src/main/res/values-fil/01-core.xml |  6 +--
 .../src/main/res/values-fil/02-strings.xml    | 12 ++---
 5 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/AnkiDroid/src/main/res/values-eo/01-core.xml b/AnkiDroid/src/main/res/values-eo/01-core.xml
index 0c34d1fbe1c1..e90cfac34bd9 100644
--- a/AnkiDroid/src/main/res/values-eo/01-core.xml
+++ b/AnkiDroid/src/main/res/values-eo/01-core.xml
@@ -75,10 +75,10 @@
     <string name="type_answer_hint">enigu respondon</string>
     <string name="show_answer" maxLength="41">Montri respondon</string>
     <string name="hide_answer">Kaŝi respondon</string>
-    <string name="ease_button_again" maxLength="41">denove</string>
-    <string name="ease_button_hard" maxLength="41">malfacile</string>
-    <string name="ease_button_good" maxLength="41">facile</string>
-    <string name="ease_button_easy">facilege</string>
+    <string name="ease_button_again" maxLength="41">Denove</string>
+    <string name="ease_button_hard" maxLength="41">Malfacila</string>
+    <string name="ease_button_good" maxLength="41">Bona</string>
+    <string name="ease_button_easy">Facila</string>
     <string name="menu_import" maxLength="28">Enporti</string>
     <string name="undo" maxLength="28" comment="When tapping on this text, the last action is undone.">Malfari</string>
     <string name="redo" maxLength="28">Refari</string>
@@ -91,7 +91,7 @@
     <string name="edit_deck_description" comment="edit the deck description">Redakti priskribon</string>
     <string name="menu_add" comment="A generic add button. Please inform us if you need more specific strings" maxLength="28">Aldoni</string>
     <string name="menu_add_note" maxLength="28">Aldoni noton</string>
-    <string name="menu_my_account" comment="Label of the window in which the user should enter their account. This text can\'t be found in AnkiDroid directly.">Samtempigi konton</string>
+    <string name="menu_my_account" comment="Label of the window in which the user should enter their account. This text can\'t be found in AnkiDroid directly.">Samtempigi la konton</string>
     <string name="menu_dismiss_note" maxLength="41">Kaŝi / forigi</string>
     <string name="menu_bury_card" maxLength="28">Kaŝi karton por tago</string>
     <string name="menu_bury_note" maxLength="28">Kaŝi noton por tago</string>
@@ -109,10 +109,10 @@
     <string name="menu_mark_note" maxLength="28">Marki noton</string>
     <string name="menu_unmark_note">Malmarki noton</string>
     <string name="menu_enable_voice_playback" maxLength="28">Aktivigi ludadon de voĉo</string>
-    <string name="menu_disable_voice_playback">Malaktivigi ludadon de voĉo</string>
+    <string name="menu_disable_voice_playback">Malebligi la ludadon de la voĉoj</string>
     <string name="new_deck">Krei kartaron</string>
     <string name="new_dynamic_deck">Krei filtritan kartaron</string>
-    <string name="directory_inaccessible">Dosierujo de AnkiDroid estas nealirebla</string>
+    <string name="directory_inaccessible">La dosierujo de AnkiDroid estas nealirebla</string>
     <!--This is shown when AnkiDroid starts up with no storage permissions.
     The user is taken to the "App Info" screen, and needs to click "Permissions" and
     grant AnkiDroid the \'Storage\' permission. This needs to be a fairly generic message as implementations
@@ -129,21 +129,21 @@
     <string name="empty_deck">Tiu ĉi kartaro estas malplena</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Serĉi kartaron</string>
     <string name="invalid_deck_name">Malĝusta nomo por kartaro</string>
-    <string name="studyoptions_congrats_finished">Congratulations! You have finished for today.</string>
+    <string name="studyoptions_congrats_finished">Gratulon! Vi finis la hodiaŭan.</string>
     <string name="studyoptions_congrats_next_due_in" comment="The param will be replaced with \'The next card will be ready in X time\'">La kartaro estas ripetita! %s</string>
     <string name="studyoptions_no_cards_due">Neniu karto por ripeti</string>
     <string name="sd_card_not_mounted">Aparata konservejo ne muntita</string>
-    <string name="button_sync" comment="Text of the sync button" maxLength="28">Samtempigi</string>
-    <string name="cancel_sync_confirm" tools:ignore="UnusedResources">Ĉu vi volas ĉesigi samtempigadon?</string>
-    <string name="continue_sync" tools:ignore="UnusedResources">Pluigi samtempigadon</string>
-    <string name="sync_cancelled" tools:ignore="UnusedResources">Samtempigado nuligita</string>
+    <string name="button_sync" comment="Text of the sync button" maxLength="28">Samhavigi</string>
+    <string name="cancel_sync_confirm" tools:ignore="UnusedResources">Ĉu vi volas nuligi samtempigon?</string>
+    <string name="continue_sync" tools:ignore="UnusedResources">Pluigi samhavigadon</string>
+    <string name="sync_cancelled" tools:ignore="UnusedResources">Samtempigo nuligita</string>
     <string name="sync_cancel_message" tools:ignore="UnusedResources">Nuligado&#8230;\nTio ĉi povas okupi iom da tempo.</string>
-    <string name="syncing_media">Samtempigado de aŭdvidaĵoj</string>
+    <string name="syncing_media">Samhavigado de la vidaŭdaĵoj</string>
     <string name="export_deck" maxLength="28">Elporti kartaron</string>
     <string name="export_collection">Elporti kolekton</string>
     <string name="nothing">Nenio</string>
     <!-- Card template editor -->
-    <string name="title_activity_template_editor">Tipo de karto</string>
+    <string name="title_activity_template_editor">Tipo de kartoj</string>
     <string name="card_template_editor_front">Ŝablono fronta</string>
     <string name="card_template_editor_back">Ŝablono dorsa</string>
     <string name="card_template_editor_styling" maxLength="28">Stilo</string>
@@ -160,14 +160,14 @@
         <item quantity="one">Ĉu forigi la kart-tipon “%2$s” kaj ĝian %1$d karton?</item>
         <item quantity="other">Ĉu forigi la kart-tipon “%2$s” kaj ĝiajn %1$d kartojn?</item>
     </plurals>
-    <string name="card_template_editor_save_error">Malsukcesis konservi ŝanĝojn al ŝablono de karto: %s</string>
-    <string name="template_for_current_card_deleted">La speco de karto por la nuna karto estis forigita.</string>
+    <string name="card_template_editor_save_error">Malsukcesis konservi la ŝanĝojn al la ŝablono de karto: %s</string>
+    <string name="template_for_current_card_deleted">La tipo de karto por la nuna karto estas forigita.</string>
     <!-- Card Browser Appearance -->
-    <string name="card_template_browser_appearance_title">Aspekto de foliumilo</string>
+    <string name="card_template_browser_appearance_title">Aspekto de la foliumilo</string>
     <!-- card Info -->
-    <string name="card_info_title" maxLength="28">Informoj pri karto</string>
+    <string name="card_info_title" maxLength="28">Informoj pri la karto</string>
     <!-- Permissions -->
-    <string name="read_write_permission_label">Legi kaj skribi al datumbazo de AnkiDroid</string>
+    <string name="read_write_permission_label">Legi kaj skribi al la datumbazo de AnkiDroid</string>
     <string name="read_write_permission_description">aliri ekzistajn notojn, kartojn, tipojn de notoj kaj kartarojn kaj krei novajn</string>
     <!-- Context Menu -->
     <string name="card_browser_context_menu" comment="The value which appears in the system context menu. Note the casing difference">Kart-foliumilo</string>
@@ -181,20 +181,20 @@
     <string name="sync_conflict_title_new">Elektu kolekton por konservi</string>
     <string name="sync_conflict_replace_title">Anstataŭigi kolekton</string>
     <!-- Generic errors -->
-    <string name="error__etc__cannot_write_to_or_create_file">Ne povas skribi aĭ krei la dosieron %s</string>
+    <string name="error__etc__cannot_write_to_or_create_file">Ne povas skribi aŭ krei la dosieron %s</string>
     <string name="directory_inaccessible_after_uninstall" comment="Dialog title if AnkiDroid can\'t access the collection once the app is installed">Kolekto nealirebla</string>
-    <string name="directory_inaccessible_after_uninstall_summary" comment="the parameter is the path to the AnkiDroid folder. Typically /storage/emulated/0/AnkiDroid">Pro ŝanĝi politikon en la vendejo Play Store, AnkiDroid ne povis aliri vian kolekton post malinstali.\n\nViaj datumoj estas sekuraj kaj povas esti restarigitaj. Ili troviĝas en la dosierujo:\n%s\n\nElektu ion el la suba listo por restarigi viajn datumojn:</string>
+    <string name="directory_inaccessible_after_uninstall_summary" comment="the parameter is the path to the AnkiDroid folder. Typically /storage/emulated/0/AnkiDroid">Pro la ŝanĝiĝo de la politiko de la vendejo Play Store, AnkiDroid ne povas aliri vian kolekton post malinstali.\n\nViaj datumoj estas sekuraj kaj povas esti restarigitaj. Ili troviĝas en la dosierujo:\n%s\n\nElektu ion el la suba listo por restarigi viajn datumojn:</string>
     <string name="directory_revoked_after_inactivity" comment="the first parameter is WRITE_EXTERNAL_STORAGE the second parameter is the path to the AnkiDroid folder. Typically /storage/emulated/0/AnkiDroid">Android senigis la aplikaĵon AnkiDroid je la permeso %1$s pro longa malaktiveco.\n\nViaj datumoj estas sekuraj kaj povas esti restarigitaj. Ili troviĝas en la dosierujo:\n%2$s\n\nElektu ion el la suba listo por restarigi viajn datumojn.</string>
-    <string name="restore_data_from_ankiweb">restarigi el AnkiWeb (konsilinda)</string>
+    <string name="restore_data_from_ankiweb">Restarigi el AnkiWeb (konsilinda)</string>
     <string name="install_non_play_store_ankidroid_recommended">Restarigi aliron al dosierujo (konsilinda)</string>
     <string name="install_non_play_store_ankidroid">restarigi aliron al dosierujo (altnivela)</string>
-    <string name="restore_data_from_backup">restarigi el sekurkopio .colpkg (altnivela)</string>
+    <string name="restore_data_from_backup">Restarigi el sekurkopio .colpkg (altnivela)</string>
     <string name="create_new_collection">Krei novan kolekton</string>
     <string name="new_unsafe_collection">La nova kolekto estos forigita el via telefono, se vi malinstalos AnkiDroid</string>
     <!-- Permissions screen -->
     <string name="permissions_screen_headline">AnkiDroid postulas kelkajn permesojn por funkcii</string>
     <string name="storage_access_title">Aliro al konservejo</string>
-    <string name="storage_access_summary">por konservi vian kolekton en sekura loko, kiu ne estos forviŝita post malinstali la aplikaĵon AnkiDroid</string>
+    <string name="storage_access_summary">Konservu vian kolekton en sekura loko, kiu ne estos forviŝita kiam malinstali la aplikaĵon</string>
     <string name="all_files_access_title" comment="Name of the “All files access” permission from Android 10 and after">Aliro al ĉiuj dosieroj</string>
     <string name="image_occlusion">Bildtruo</string>
     <string name="remove_account" comment="open a website to start the deletion of an AnkiWeb account">Forigi konton</string>
diff --git a/AnkiDroid/src/main/res/values-eo/02-strings.xml b/AnkiDroid/src/main/res/values-eo/02-strings.xml
index 831fbecfc1ca..e7ce0298cf81 100644
--- a/AnkiDroid/src/main/res/values-eo/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-eo/02-strings.xml
@@ -122,7 +122,7 @@
     <string name="card_editor_preview_card" comment="Button offering to preview some card(s)" maxLength="28">Antaŭrigardi</string>
     <string name="copy_as_markdown" comment="Copies text to the clipboard as Markdown" maxLength="28">Kopii kiel Markdown</string>
     <string name="preview_progress_bar_text" comment="What card we are on out of how many in card previewer progress bar">%1$d el %2$d</string>
-    <string name="rename" comment="Confirm that the renaming action should be processed." maxLength="28">Alinomi</string>
+    <string name="rename" comment="Confirm that the renaming action should be processed." maxLength="28">Renomi</string>
     <string name="checks_action" maxLength="28">Kontroli</string>
     <string name="check_db" maxLength="28">Kontroli datumbazon</string>
     <string name="check_media" maxLength="28">Kontroli aŭdvidaĵojn</string>
@@ -134,7 +134,7 @@
     <string name="import_preparing_file">Preparado de dosiero por enporti&#8230;</string>
     <string name="import_message_add" comment="Adding a new deck to the collection (import)">Aldoni</string>
     <string name="import_message_replace_confirm">Tio ĉi forigos vian ekzistan kolekton kaj anstataŭigos ĝin per datumoj de dosiero %s</string>
-    <string name="import_dialog_message_add">Ĉu aldoni “%s” al kolekto? Tio ĉi povas okupi multan tempon.</string>
+    <string name="import_dialog_message_add">Ĉu aldoni “%s” al la kolekto? Tio ĉi povas okupi multan tempon</string>
     <string name="import_log_no_apkg">Tio ĉi ne estas valida dosiero Anki-pakaĵo</string>
     <string name="import_title_error" comment="Title of error dialog">Eraro</string>
     <string name="import_error_handle_exception">Malsukcesis enporti la dosieron\n\n%s</string>
diff --git a/AnkiDroid/src/main/res/values-eo/16-multimedia-editor.xml b/AnkiDroid/src/main/res/values-eo/16-multimedia-editor.xml
index 8242e3775da6..7b49f4fbd2f1 100644
--- a/AnkiDroid/src/main/res/values-eo/16-multimedia-editor.xml
+++ b/AnkiDroid/src/main/res/values-eo/16-multimedia-editor.xml
@@ -47,7 +47,7 @@
     <string name="multimedia_editor_popup_cloze">Truteksta malpleno</string>
     <!-- Field editing general -->
     <!-- these are button names to convert field type -->
-    <string name="multimedia_editor_field_editing_audio">Aŭdaĵo</string>
+    <string name="multimedia_editor_field_editing_audio">Sonregistro</string>
     <string name="multimedia_editor_field_editing_done" comment="Label of a button to tell the app that the current action is \'Done\'.">Farita</string>
     <!-- Multimedia card editor activity -->
     <!-- for buttons -->
diff --git a/AnkiDroid/src/main/res/values-fil/01-core.xml b/AnkiDroid/src/main/res/values-fil/01-core.xml
index 006c2da65f77..37bd66890774 100644
--- a/AnkiDroid/src/main/res/values-fil/01-core.xml
+++ b/AnkiDroid/src/main/res/values-fil/01-core.xml
@@ -65,7 +65,7 @@
         <item quantity="other">%1$d oras %2$d ang natititra</item>
     </plurals>
     <plurals name="reviewer_window_title_days_new">
-        <item quantity="one">%1$d day %2$dh left</item>
+        <item quantity="one">%1$d araw at %2$d oras na lang ang natitira</item>
         <item quantity="other">%1$d days %2$dh left</item>
     </plurals>
     <string name="no_cards_placeholder_title">Walang laman ang koleksyon</string>
@@ -101,7 +101,7 @@
     <string name="menu_suspend" maxLength="28">Suspindihin</string>
     <string name="menu_delete_note" maxLength="28">Burahin ang tala</string>
     <string name="menu_flag" maxLength="41">Watawat</string>
-    <string name="rename_flag">Rename flags</string>
+    <string name="rename_flag">Pangalanan ulit ang mga flag</string>
     <string name="menu_flag_card" maxLength="28">Lagyan ng watawat ang card</string>
     <string name="menu_edit_tags" maxLength="28">Baguhin ang mga tag</string>
     <string name="delete_note_message">Talaga bang gusto mong burahin ang talang ito at pati na rin ang lahat ngmga kard?\n%s</string>
@@ -130,7 +130,7 @@
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Maghanap ng Deck</string>
     <string name="invalid_deck_name">Hindi wasto ang pangalan ng deck</string>
     <string name="studyoptions_congrats_finished">Congratulations! You have finished for today.</string>
-    <string name="studyoptions_congrats_next_due_in" comment="The param will be replaced with \'The next card will be ready in X time\'">Deck finished for now! %s</string>
+    <string name="studyoptions_congrats_next_due_in" comment="The param will be replaced with \'The next card will be ready in X time\'">Tapos na ang deck sa ngayon! %s</string>
     <string name="studyoptions_no_cards_due">Wala pang card na nakatakda</string>
     <string name="sd_card_not_mounted">Ang device storage ay hindi naka-mount</string>
     <string name="button_sync" comment="Text of the sync button" maxLength="28">I-sync</string>
diff --git a/AnkiDroid/src/main/res/values-fil/02-strings.xml b/AnkiDroid/src/main/res/values-fil/02-strings.xml
index d60f0e419d3c..e2895f073d09 100644
--- a/AnkiDroid/src/main/res/values-fil/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fil/02-strings.xml
@@ -87,8 +87,8 @@
         <item quantity="one">+%d buried</item>
         <item quantity="other">+%d buried</item>
     </plurals>
-    <string name="studyoptions_total_new_label">Total new cards</string>
-    <string name="studyoptions_total_label">Total cards</string>
+    <string name="studyoptions_total_new_label">Kabuuang bagong kard</string>
+    <string name="studyoptions_total_label">Kabuuang kard</string>
     <!-- Card editor -->
     <string name="cardeditor_title_edit_card" maxLength="28">I-edit ang tala</string>
     <string name="discard">Baliwalain</string>
@@ -337,18 +337,18 @@
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
     <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
-    <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
+    <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Pagpipilian ng Deck</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
-    <string name="select_deck" comment="Description of the shortcut that opens the deck selection dialog">Select deck</string>
-    <string name="select_note_type" comment="Description of the shortcut that shows the note selection spinner">Select note type</string>
+    <string name="select_deck" comment="Description of the shortcut that opens the deck selection dialog">Pumili ng Deck</string>
+    <string name="select_note_type" comment="Description of the shortcut that shows the note selection spinner">Pumili ng uri ng tala</string>
     <string name="tag_editor" comment="Description of the shortcut that opens the tags dialog">Tag editor</string>
     <string name="card_template_editor_group" comment="Label for the group of shortcuts related to the card template editor">Card Template Editor</string>
     <string name="edit_front_template" comment="Description of the shortcut that shows the question side of the card template">Edit front template</string>
     <string name="edit_back_template" comment="Description of the shortcut that shows the answer side of the card template">Edit back template</string>
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
-    <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
+    <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Baguhin ang anyo ng browser</string>
     <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>

From 3befa112836108c81a2b18e0b034422bf0194112 Mon Sep 17 00:00:00 2001
From: snowtimeglass <snowtimeglass@gmail.com>
Date: Fri, 7 Feb 2025 13:45:51 +0900
Subject: [PATCH 007/200] fix: use consistent label for Whiteboard editor

"Settings" > "Appearance" > "App bar buttons" > "Whiteboard" > "Whiteboard pen color" actually targets "Whiteboard editor" option in Reviewer.
This commit renames the "Whiteboard pen color" label to "Whiteboard editor" for consistency.
---
 AnkiDroid/src/main/res/values/02-strings.xml              | 1 -
 AnkiDroid/src/main/res/xml/preferences_custom_buttons.xml | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/AnkiDroid/src/main/res/values/02-strings.xml b/AnkiDroid/src/main/res/values/02-strings.xml
index 6c1f86c41493..b1633eb806c5 100644
--- a/AnkiDroid/src/main/res/values/02-strings.xml
+++ b/AnkiDroid/src/main/res/values/02-strings.xml
@@ -186,7 +186,6 @@
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
 
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
 
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
diff --git a/AnkiDroid/src/main/res/xml/preferences_custom_buttons.xml b/AnkiDroid/src/main/res/xml/preferences_custom_buttons.xml
index 93ae6afcfe41..dbb52fcb7508 100644
--- a/AnkiDroid/src/main/res/xml/preferences_custom_buttons.xml
+++ b/AnkiDroid/src/main/res/xml/preferences_custom_buttons.xml
@@ -175,7 +175,7 @@ TODO: Add a unit test
             android:entries="@array/custom_button_labels"
             android:entryValues="@array/custom_button_values"
             android:key="@string/custom_button_whiteboard_pen_color_key"
-            android:title="@string/title_whiteboard_pen_color"
+            android:title="@string/title_whiteboard_editor"
             app:useSimpleSummaryProvider="true"/>
         <ListPreference
             android:defaultValue="2"

From 74b6d46a87c4db5085794360be2dd6b4a325ff92 Mon Sep 17 00:00:00 2001
From: AnkiDroid Translations <ankidroid@ankidroid.org>
Date: Fri, 7 Feb 2025 09:55:29 +0000
Subject: [PATCH 008/200] Updated strings from Crowdin

---
 AnkiDroid/src/main/res/values-af/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-am/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-ar/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-az/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-be/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-bg/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-bn/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-ca/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-ckb/02-strings.xml    | 1 -
 AnkiDroid/src/main/res/values-cs/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-da/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-de/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-el/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-eo/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-es-rAR/02-strings.xml | 1 -
 AnkiDroid/src/main/res/values-es-rES/02-strings.xml | 1 -
 AnkiDroid/src/main/res/values-et/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-eu/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-fa/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-fi/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-fil/02-strings.xml    | 1 -
 AnkiDroid/src/main/res/values-fr/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-fy/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-ga/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-gl/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-got/02-strings.xml    | 1 -
 AnkiDroid/src/main/res/values-gu/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-heb/02-strings.xml    | 1 -
 AnkiDroid/src/main/res/values-hi/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-hr/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-hu/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-hy/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-ind/02-strings.xml    | 1 -
 AnkiDroid/src/main/res/values-is/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-it/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-iw/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-ja/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-jv/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-ka/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-kk/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-km/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-kn/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-ko/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-ku/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-ky/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-lt/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-lv/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-mk/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-ml/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-mn/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-mr/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-ms/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-my/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-nl/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-nn/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-no/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-or/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-pa/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-pl/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml | 1 -
 AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml | 1 -
 AnkiDroid/src/main/res/values-ro/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-ru/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-sat/02-strings.xml    | 1 -
 AnkiDroid/src/main/res/values-sc/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-sk/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-sl/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-sq/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-sr/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-ss/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-sv/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-sw/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-ta/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-te/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-tg/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-tgl/02-strings.xml    | 1 -
 AnkiDroid/src/main/res/values-th/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-ti/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-tn/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-tr/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-ts/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-tt/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-ug/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-uk/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-ur/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-uz/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-ve/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-vi/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-wo/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-xh/02-strings.xml     | 1 -
 AnkiDroid/src/main/res/values-yue/02-strings.xml    | 1 -
 AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml | 1 -
 AnkiDroid/src/main/res/values-zh-rTW/02-strings.xml | 1 -
 AnkiDroid/src/main/res/values-zu/02-strings.xml     | 1 -
 94 files changed, 94 deletions(-)

diff --git a/AnkiDroid/src/main/res/values-af/02-strings.xml b/AnkiDroid/src/main/res/values-af/02-strings.xml
index b885026d8114..173e3fa907bf 100644
--- a/AnkiDroid/src/main/res/values-af/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-af/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Kon nie witbordbeeld stoor nie. %s</string>
     <string name="white_board_image_saved">Witbordbeeld gestoor na %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Witbordpenkleur</string>
     <string name="title_whiteboard_editor" maxLength="28">Witbordredakteur</string>
     <string name="user_is_a_robot">Geoutomatiseerde toets opgespoor. As jy \'n mens is, kontak AnkiDroid-ondersteuning.</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-am/02-strings.xml b/AnkiDroid/src/main/res/values-am/02-strings.xml
index ba80ca682342..e0c971192ee7 100644
--- a/AnkiDroid/src/main/res/values-am/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-am/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-ar/02-strings.xml b/AnkiDroid/src/main/res/values-ar/02-strings.xml
index 2914906ba48e..55fb3408ba61 100644
--- a/AnkiDroid/src/main/res/values-ar/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ar/02-strings.xml
@@ -210,7 +210,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">فشل حفظ صورة السبورة. %s</string>
     <string name="white_board_image_saved">تم حفظ صورة السبورة إلى %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">لون قلم السبورة</string>
     <string name="title_whiteboard_editor" maxLength="28">لون قلم السبورة</string>
     <string name="user_is_a_robot">تم الكشف عن اختبار تلقائي. إذا كنت بشراً، اتصل بدعم أنكيدرويد</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-az/02-strings.xml b/AnkiDroid/src/main/res/values-az/02-strings.xml
index 5bed4ea5cfe0..e00a1e228734 100644
--- a/AnkiDroid/src/main/res/values-az/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-az/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-be/02-strings.xml b/AnkiDroid/src/main/res/values-be/02-strings.xml
index 77f680dd85bf..b1a5533ccd2b 100644
--- a/AnkiDroid/src/main/res/values-be/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-be/02-strings.xml
@@ -202,7 +202,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Не атрымалася захаваць відарыс дошкі. %s</string>
     <string name="white_board_image_saved">Відарыс дошкі захаваны ў %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Колер крэйды дошкі</string>
     <string name="title_whiteboard_editor" maxLength="28">Рэдактар дошкі</string>
     <string name="user_is_a_robot">Выяўлены аўтаматычны тэст. У выпадку, калі вы чалавек, калі ласка, напішыце ў падтрымку AnkiDroid</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-bg/02-strings.xml b/AnkiDroid/src/main/res/values-bg/02-strings.xml
index 9f290082d82c..446e29489d19 100644
--- a/AnkiDroid/src/main/res/values-bg/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-bg/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Запазването на изображението на бялата дъска не бе успешно. %s</string>
     <string name="white_board_image_saved">Изображението на бялата дъска е запазено в %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Цвят на писалката за бяла дъска</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Открит автоматичен тест. Ако сте човек, свържете се с екипа за поддръжка на AnkiDroid</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-bn/02-strings.xml b/AnkiDroid/src/main/res/values-bn/02-strings.xml
index 30a348b2c849..6650e6b1d34f 100644
--- a/AnkiDroid/src/main/res/values-bn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-bn/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">হোয়াইটবোর্ড ছবি সংরক্ষণ করতে ব্যর্থ হয়েছে. %s</string>
     <string name="white_board_image_saved">হোয়াইটবোর্ড ছবি %s-এ সংরক্ষিত হয়েছে</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">হোয়াইটবোর্ড কলমের রঙ</string>
     <string name="title_whiteboard_editor" maxLength="28">হোয়াইটবোর্ড সম্পাদক</string>
     <string name="user_is_a_robot">স্বয়ংক্রিয় পরীক্ষা সনাক্ত করা হয়েছে. আপনি যদি একজন মানুষ হন তবে AnkiDroid সহায়তার সাথে যোগাযোগ করুন</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-ca/02-strings.xml b/AnkiDroid/src/main/res/values-ca/02-strings.xml
index 403538f6387e..b0d860cb75cd 100644
--- a/AnkiDroid/src/main/res/values-ca/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ca/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Error al desar l\'imatge de la pissarra. %s</string>
     <string name="white_board_image_saved">Imatge de la pissara desada a %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Color del llapis de la pissara</string>
     <string name="title_whiteboard_editor" maxLength="28">Editor de la pissarra </string>
     <string name="user_is_a_robot">Test automàtic detectat. Si ets un humà contacta amb el suport AnkiDroid</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-ckb/02-strings.xml b/AnkiDroid/src/main/res/values-ckb/02-strings.xml
index 15ddc5caaea9..f5317f409b3c 100644
--- a/AnkiDroid/src/main/res/values-ckb/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ckb/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-cs/02-strings.xml b/AnkiDroid/src/main/res/values-cs/02-strings.xml
index 8e7b302c3c68..ee38b2198bb6 100644
--- a/AnkiDroid/src/main/res/values-cs/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-cs/02-strings.xml
@@ -202,7 +202,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Nepodařilo se uložit obrázek tabule. %s</string>
     <string name="white_board_image_saved">Obrázek tabule uložen do %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Barva pera tabule</string>
     <string name="title_whiteboard_editor" maxLength="28">Editor tabule</string>
     <string name="user_is_a_robot">Zjištěn automatizovaný test. Pokud jste člověk, kontaktujte podporu AnkiDroid</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-da/02-strings.xml b/AnkiDroid/src/main/res/values-da/02-strings.xml
index aee2dc6b319b..3b1587a83e89 100644
--- a/AnkiDroid/src/main/res/values-da/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-da/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-de/02-strings.xml b/AnkiDroid/src/main/res/values-de/02-strings.xml
index 7ea0d149d2ba..6964cf49153d 100644
--- a/AnkiDroid/src/main/res/values-de/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-de/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Whiteboardbild konnte nicht gespeichert werden. %s</string>
     <string name="white_board_image_saved">Whiteboardbild in %s gespeichert</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Stiftfarbe des Whiteboards</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard-Editor</string>
     <string name="user_is_a_robot">Automatischer Test erkannt. Wenn Sie ein Mensch sind, wenden Sie sich an AnkiDroid-Support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-el/02-strings.xml b/AnkiDroid/src/main/res/values-el/02-strings.xml
index d77b6ab0f078..d2dfce556e2b 100644
--- a/AnkiDroid/src/main/res/values-el/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-el/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Αποτυχία αποθήκευσης της εικόνας του πίνακα. %s</string>
     <string name="white_board_image_saved">Η εικόνα του πίνακα αποθηκεύτηκε στο %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Χρώμα στυλό πίνακα</string>
     <string name="title_whiteboard_editor" maxLength="28">Επεξεργαστής πίνακα</string>
     <string name="user_is_a_robot">Εντοπίστηκε αυτοματοποιημένο τεστ. Εάν είστε άνθρωπος, επικοινωνήστε με την υποστήριξη του AnkiDroid</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-eo/02-strings.xml b/AnkiDroid/src/main/res/values-eo/02-strings.xml
index e7ce0298cf81..38c05747e1c3 100644
--- a/AnkiDroid/src/main/res/values-eo/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-eo/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Malsukcesis konservi bildon de skribtabulo. %s</string>
     <string name="white_board_image_saved">Konservis bildon de skribtabulo al %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Koloro por skribi sur skribtabulo</string>
     <string name="title_whiteboard_editor" maxLength="28">Redaktilo de skribtabulo</string>
     <string name="user_is_a_robot">Eltrovita aŭtomata testo. Se vi estas homo, kontaktu la helpteamon AnkiDroid</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-es-rAR/02-strings.xml b/AnkiDroid/src/main/res/values-es-rAR/02-strings.xml
index a57ac2b8ae78..173ff3d56a8d 100644
--- a/AnkiDroid/src/main/res/values-es-rAR/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-es-rAR/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">No se pudo guardar la imagen de pizarra. %s</string>
     <string name="white_board_image_saved">Imagen de pizarra guardada en %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Color del lápiz</string>
     <string name="title_whiteboard_editor" maxLength="28">Editor de pizarra</string>
     <string name="user_is_a_robot">Prueba automatizada detectada. Si eres un humano, ponte en contacto con el soporte de AnkiDroid</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-es-rES/02-strings.xml b/AnkiDroid/src/main/res/values-es-rES/02-strings.xml
index 94ee8ba2f096..b96eb3f63a37 100644
--- a/AnkiDroid/src/main/res/values-es-rES/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-es-rES/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">No se pudo guardar la imagen de pizarra. %s</string>
     <string name="white_board_image_saved">Imagen de pizarra guardada en %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Color del lápiz</string>
     <string name="title_whiteboard_editor" maxLength="28">Editor de pizarra</string>
     <string name="user_is_a_robot">Prueba automatizada detectada. Si eres un humano, ponte en contacto con el soporte de AnkiDroid</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-et/02-strings.xml b/AnkiDroid/src/main/res/values-et/02-strings.xml
index 39fa640cac72..520b474aa1f5 100644
--- a/AnkiDroid/src/main/res/values-et/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-et/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-eu/02-strings.xml b/AnkiDroid/src/main/res/values-eu/02-strings.xml
index c87eca88e2a9..ab4db461c9aa 100644
--- a/AnkiDroid/src/main/res/values-eu/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-eu/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-fa/02-strings.xml b/AnkiDroid/src/main/res/values-fa/02-strings.xml
index a399167c9014..d4822003c447 100644
--- a/AnkiDroid/src/main/res/values-fa/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fa/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">ذخیرۀ تصویر تخته سفید با مشکل مواجه شد. %s</string>
     <string name="white_board_image_saved">تصویر تخته سفید در %s ذخیره شد</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">رنگ ماژیک تخته سفید</string>
     <string name="title_whiteboard_editor" maxLength="28">ویرایشگر تخته صفید</string>
     <string name="user_is_a_robot">تست خودکار شناسایی شد. اگر شما انسان هستید، با پشتیبانی AnkiDroid ارتباط برقرار کنید</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-fi/02-strings.xml b/AnkiDroid/src/main/res/values-fi/02-strings.xml
index 4551407291a0..a57db3934721 100644
--- a/AnkiDroid/src/main/res/values-fi/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fi/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Kirjoitustaulun kuvan tallentaminen epäonnistui. %s</string>
     <string name="white_board_image_saved">Kirjoitustaulun kuva tallennettu sijaintiin %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Kirjoitustaulun kynän väri</string>
     <string name="title_whiteboard_editor" maxLength="28">Valkotaulu editori</string>
     <string name="user_is_a_robot">Automaattinen testi havaittu. Jos olet ihminen, ota yhteyttä AnkiDroidin tukeen.</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-fil/02-strings.xml b/AnkiDroid/src/main/res/values-fil/02-strings.xml
index e2895f073d09..c73e55c644b5 100644
--- a/AnkiDroid/src/main/res/values-fil/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fil/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Bigo sa pag-save ng litrato ng puting pisara. %s</string>
     <string name="white_board_image_saved">Isinave ang litrato ng puting pisara sa %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Kulay ng pen sa puting pisara</string>
     <string name="title_whiteboard_editor" maxLength="28">Editor ng puting pisara</string>
     <string name="user_is_a_robot">Natumbukan ang isang awtomatikong pagte-test. Kung ikaw ay isang tao, mangyaring kontakin ang AnkiDroid support.</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-fr/02-strings.xml b/AnkiDroid/src/main/res/values-fr/02-strings.xml
index 772698e10a47..31d12afed02f 100644
--- a/AnkiDroid/src/main/res/values-fr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fr/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Impossible d\'enregistrer l\'image du tableau blanc. %s</string>
     <string name="white_board_image_saved">Image du tableau blanc enregistrée dans %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Couleur du stylo du tableau blanc</string>
     <string name="title_whiteboard_editor" maxLength="28">Éditeur de tableau blanc</string>
     <string name="user_is_a_robot">Test automatisé détecté. Si vous êtes humain, contactez l\'assistance AnkiDroid</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-fy/02-strings.xml b/AnkiDroid/src/main/res/values-fy/02-strings.xml
index 47184c8f88bd..ef980f4c265c 100644
--- a/AnkiDroid/src/main/res/values-fy/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fy/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-ga/02-strings.xml b/AnkiDroid/src/main/res/values-ga/02-strings.xml
index bbb04654ff23..63b8aa576545 100644
--- a/AnkiDroid/src/main/res/values-ga/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ga/02-strings.xml
@@ -206,7 +206,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-gl/02-strings.xml b/AnkiDroid/src/main/res/values-gl/02-strings.xml
index 98dd55360c8e..59d2fd5fbff7 100644
--- a/AnkiDroid/src/main/res/values-gl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-gl/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-got/02-strings.xml b/AnkiDroid/src/main/res/values-got/02-strings.xml
index cb0b4e30e65c..5edb2d48f426 100644
--- a/AnkiDroid/src/main/res/values-got/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-got/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-gu/02-strings.xml b/AnkiDroid/src/main/res/values-gu/02-strings.xml
index a5653f7b2b49..db8aa08daabd 100644
--- a/AnkiDroid/src/main/res/values-gu/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-gu/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">વ્હાઇટબોર્ડ છબી સાચવવામાં નિષ્ફળ. %s</string>
     <string name="white_board_image_saved">વ્હાઇટબોર્ડ ઇમેજ %s પર સાચવી</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">વ્હાઇટબોર્ડ પેન રંગ</string>
     <string name="title_whiteboard_editor" maxLength="28">વ્હાઇટબોર્ડ એડિટર</string>
     <string name="user_is_a_robot">શોધાયેલ સ્વચાલિત પરીક્ષણ. જો તમે માનવ છો, તો AnkiDroid સપોર્ટનો સંપર્ક કરો</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-heb/02-strings.xml b/AnkiDroid/src/main/res/values-heb/02-strings.xml
index 632dd523aa99..414a5a8e8bd4 100644
--- a/AnkiDroid/src/main/res/values-heb/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-heb/02-strings.xml
@@ -202,7 +202,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">נכשל לשמור תמונת לוח. %s</string>
     <string name="white_board_image_saved">תמונת לוח נשמרה ל %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">צבע עט ללוח</string>
     <string name="title_whiteboard_editor" maxLength="28">עורך לוח</string>
     <string name="user_is_a_robot">זוהה אוטומציה ממוחשבת, אם אתה אנושי, צור קשר עם תמיכת AnkiDroid</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-hi/02-strings.xml b/AnkiDroid/src/main/res/values-hi/02-strings.xml
index 33f4604c8214..63bf440803ac 100644
--- a/AnkiDroid/src/main/res/values-hi/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-hi/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">श्वेतपट्ट छवि को सहेजने में विफल। %s</string>
     <string name="white_board_image_saved">श्वेतपट्ट छवि %s में सहेजी गई</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">श्वेतपट्ट के कलम का रंग</string>
     <string name="title_whiteboard_editor" maxLength="28">श्वेतपट्ट संपादक</string>
     <string name="user_is_a_robot">स्वचालित परीक्षण का पता लगाया। यदि आप एक मानव हैं, तो AnkiDroid समर्थन से संपर्क करें</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-hr/02-strings.xml b/AnkiDroid/src/main/res/values-hr/02-strings.xml
index ac4440c71930..c91b6a4b48f2 100644
--- a/AnkiDroid/src/main/res/values-hr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-hr/02-strings.xml
@@ -198,7 +198,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-hu/02-strings.xml b/AnkiDroid/src/main/res/values-hu/02-strings.xml
index 4c7d03fe08d1..4c954970f68d 100644
--- a/AnkiDroid/src/main/res/values-hu/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-hu/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">A rajztábla kép mentése sikertelen. %s</string>
     <string name="white_board_image_saved">A rajztábla kép elmentve %s-ba</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Rajtábla tollszín </string>
     <string name="title_whiteboard_editor" maxLength="28">Rajztábla szerkesztő</string>
     <string name="user_is_a_robot">Felismert automatizált teszt. Ha te csináltad, vedd fel a kapcsolatot az AnkiDroid támogatással</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-hy/02-strings.xml b/AnkiDroid/src/main/res/values-hy/02-strings.xml
index 0697b577dcc7..43dd99ed9bb3 100644
--- a/AnkiDroid/src/main/res/values-hy/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-hy/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-ind/02-strings.xml b/AnkiDroid/src/main/res/values-ind/02-strings.xml
index 08ee850dd155..9ea178739231 100644
--- a/AnkiDroid/src/main/res/values-ind/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ind/02-strings.xml
@@ -190,7 +190,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Gagal menyimpan gambar di whiteboard. %s</string>
     <string name="white_board_image_saved">Gambar whiteboard disimpan ke %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Warna pena whiteboard</string>
     <string name="title_whiteboard_editor" maxLength="28">Editor papan tulis</string>
     <string name="user_is_a_robot">Tes otomatis terdeteksi. Jika kamu manusia, kontak dukungan AnkiDroid</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-is/02-strings.xml b/AnkiDroid/src/main/res/values-is/02-strings.xml
index ba80ca682342..e0c971192ee7 100644
--- a/AnkiDroid/src/main/res/values-is/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-is/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-it/02-strings.xml b/AnkiDroid/src/main/res/values-it/02-strings.xml
index 98964a7f9e5a..31fdff0bd6ca 100644
--- a/AnkiDroid/src/main/res/values-it/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-it/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Salvataggio dell\'immagine della lavagna fallito. %s</string>
     <string name="white_board_image_saved">Immagine lavagna salvata in %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Colore della penna della lavagna</string>
     <string name="title_whiteboard_editor" maxLength="28">Editor di lavagna bianca</string>
     <string name="user_is_a_robot">Rilevato test automatico. Se sei umano, contatta il supporto AnkiDroid</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-iw/02-strings.xml b/AnkiDroid/src/main/res/values-iw/02-strings.xml
index 632dd523aa99..414a5a8e8bd4 100644
--- a/AnkiDroid/src/main/res/values-iw/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-iw/02-strings.xml
@@ -202,7 +202,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">נכשל לשמור תמונת לוח. %s</string>
     <string name="white_board_image_saved">תמונת לוח נשמרה ל %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">צבע עט ללוח</string>
     <string name="title_whiteboard_editor" maxLength="28">עורך לוח</string>
     <string name="user_is_a_robot">זוהה אוטומציה ממוחשבת, אם אתה אנושי, צור קשר עם תמיכת AnkiDroid</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-ja/02-strings.xml b/AnkiDroid/src/main/res/values-ja/02-strings.xml
index e3254ddbd66f..5311bcbfd988 100644
--- a/AnkiDroid/src/main/res/values-ja/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ja/02-strings.xml
@@ -190,7 +190,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">ホワイトボード画像の保存に失敗しました。 %s</string>
     <string name="white_board_image_saved">ホワイトボードの画像を \"%s\" に保存しました</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">ホワイトボードペンの色を選択</string>
     <string name="title_whiteboard_editor" maxLength="28">ホワイトボードエディタ</string>
     <string name="user_is_a_robot">自動テストが検出されました。人間による操作の場合は、AnkiDroidサポートにお問い合わせください。</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-jv/02-strings.xml b/AnkiDroid/src/main/res/values-jv/02-strings.xml
index be18a0e0dbe2..d012a0403ccd 100644
--- a/AnkiDroid/src/main/res/values-jv/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-jv/02-strings.xml
@@ -190,7 +190,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-ka/02-strings.xml b/AnkiDroid/src/main/res/values-ka/02-strings.xml
index 74336d6772ed..4cd0033d2607 100644
--- a/AnkiDroid/src/main/res/values-ka/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ka/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">დაფის სურათი ვერ შეინახა. %s</string>
     <string name="white_board_image_saved">დაფის სურათი შეინახა %s-ში</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">დაფის მარკერის ფერი</string>
     <string name="title_whiteboard_editor" maxLength="28">დაფის რედაქტორი</string>
     <string name="user_is_a_robot">აღიქვა ავტომატიზებული ტესტი. თუკი ადამიანი ხართ, გთხოვთ, მიმართოთ AnkiDroid-ის მხარდაჭერის გუნდს</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-kk/02-strings.xml b/AnkiDroid/src/main/res/values-kk/02-strings.xml
index ba80ca682342..e0c971192ee7 100644
--- a/AnkiDroid/src/main/res/values-kk/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-kk/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-km/02-strings.xml b/AnkiDroid/src/main/res/values-km/02-strings.xml
index 35c2c768b189..0e1df27053cf 100644
--- a/AnkiDroid/src/main/res/values-km/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-km/02-strings.xml
@@ -190,7 +190,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-kn/02-strings.xml b/AnkiDroid/src/main/res/values-kn/02-strings.xml
index 5583f7d42e65..9a2bd5a79bbc 100644
--- a/AnkiDroid/src/main/res/values-kn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-kn/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">ವೈಟ್‌ಬೋರ್ಡ್ ಚಿತ್ರವನ್ನು ಉಳಿಸುವಲ್ಲಿ ವಿಫಲವಾಗಿದೆ. %s</string>
     <string name="white_board_image_saved">ವೈಟ್‌ಬೋರ್ಡ್ ಚಿತ್ರವನ್ನು%s ಗೆ ಉಳಿಸಲಾಗಿದೆ</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">ವೈಟ್‌ಬೋರ್ಡ್ ಪೆನ್ ಬಣ್ಣ</string>
     <string name="title_whiteboard_editor" maxLength="28">ವೈಟ್‌ಬೋರ್ಡ್ ಸಂಪಾದಕ</string>
     <string name="user_is_a_robot">ಸ್ವಯಂಚಾಲಿತ ಪರೀಕ್ಷೆ ಪತ್ತೆಯಾಗಿದೆ. ನೀವು ಮನುಷ್ಯರಾಗಿದ್ದರೆ, ಆಂಕಿಡ್ರಾಯ್ಡ್ ಬೆಂಬಲವನ್ನು ಸಂಪರ್ಕಿಸಿ</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-ko/02-strings.xml b/AnkiDroid/src/main/res/values-ko/02-strings.xml
index 64b24aa7c784..da0afb023a6f 100644
--- a/AnkiDroid/src/main/res/values-ko/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ko/02-strings.xml
@@ -193,7 +193,6 @@ Context | Request Context    [1]</string>
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">화이트보드 이미지 저장에 실패했습니다. %s</string>
     <string name="white_board_image_saved">%s에 화이트보드 이미지가 저장되었습니다.</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">화이트보드 펜 색상</string>
     <string name="title_whiteboard_editor" maxLength="28">화이트보드 편집기</string>
     <string name="user_is_a_robot">자동 테스트를 감지했습니다. 만약 당신이 로봇이 아니라면 AnkiDroid 지원부에 연락하세요.</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-ku/02-strings.xml b/AnkiDroid/src/main/res/values-ku/02-strings.xml
index ae0054a8d187..16009ac88239 100644
--- a/AnkiDroid/src/main/res/values-ku/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ku/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-ky/02-strings.xml b/AnkiDroid/src/main/res/values-ky/02-strings.xml
index ba80ca682342..e0c971192ee7 100644
--- a/AnkiDroid/src/main/res/values-ky/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ky/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-lt/02-strings.xml b/AnkiDroid/src/main/res/values-lt/02-strings.xml
index 4010c31d613c..85acf41bbd57 100644
--- a/AnkiDroid/src/main/res/values-lt/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-lt/02-strings.xml
@@ -202,7 +202,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-lv/02-strings.xml b/AnkiDroid/src/main/res/values-lv/02-strings.xml
index 69fd893d1c79..9cb3e99b304c 100644
--- a/AnkiDroid/src/main/res/values-lv/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-lv/02-strings.xml
@@ -198,7 +198,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-mk/02-strings.xml b/AnkiDroid/src/main/res/values-mk/02-strings.xml
index ec419a40d505..aa9eba4740dc 100644
--- a/AnkiDroid/src/main/res/values-mk/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-mk/02-strings.xml
@@ -195,7 +195,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-ml/02-strings.xml b/AnkiDroid/src/main/res/values-ml/02-strings.xml
index c2e76b5ee7cc..f56c6db72138 100644
--- a/AnkiDroid/src/main/res/values-ml/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ml/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">വൈറ്റ്ബോർഡ് ചിത്രം സംരക്ഷിക്കുന്നതിൽ പരാജയപ്പെട്ടു. %s</string>
     <string name="white_board_image_saved">വൈറ്റ്ബോർഡ് ചിത്രം %s ലേക്ക് സംരക്ഷിച്ചു</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">വൈറ്റ്ബോർഡ് പേന നിറം</string>
     <string name="title_whiteboard_editor" maxLength="28">വൈറ്റ്ബോർഡ് എഡിറ്റർ</string>
     <string name="user_is_a_robot">യാന്ത്രിക പരിശോധന കണ്ടെത്തി. നിങ്ങൾ ഒരു മനുഷ്യനാണെങ്കിൽ, അങ്കിഡ്രോയിഡ് പിന്തുണയുമായി ബന്ധപ്പെടുക</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-mn/02-strings.xml b/AnkiDroid/src/main/res/values-mn/02-strings.xml
index 80ef27965330..89db021ce30d 100644
--- a/AnkiDroid/src/main/res/values-mn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-mn/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">%s -д Зурсан зургийг тань хадгаллаа</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Зурах балны өнгө</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-mr/02-strings.xml b/AnkiDroid/src/main/res/values-mr/02-strings.xml
index a6c89b644f3c..99b8d629efa8 100644
--- a/AnkiDroid/src/main/res/values-mr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-mr/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">व्हाईटबोर्ड इमेज सेव्ह करण्यात अयशस्वी. %s</string>
     <string name="white_board_image_saved">व्हाईटबोर्ड इमेज %s मध्ये सेव्ह केली</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">व्हाईटबोर्ड पेन रंग</string>
     <string name="title_whiteboard_editor" maxLength="28">व्हाईटबोर्ड संपादक</string>
     <string name="user_is_a_robot">स्वयंचलित चाचणी आढळली. आपण मनुष्य असल्यास, अँकीड्रोइड समर्थनाशी संपर्क साधा</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-ms/02-strings.xml b/AnkiDroid/src/main/res/values-ms/02-strings.xml
index 6748d3acb6ef..8872047a975f 100644
--- a/AnkiDroid/src/main/res/values-ms/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ms/02-strings.xml
@@ -190,7 +190,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Gagal menyimpan gambar papan putih. %s</string>
     <string name="white_board_image_saved">Gambar papan putih simpan di %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Warna pen papan putih</string>
     <string name="title_whiteboard_editor" maxLength="28">Penyunting papan putih</string>
     <string name="user_is_a_robot">Ujian automatik dikesan. Jika anda manusia, hubungi sokongan AnkiDroid</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-my/02-strings.xml b/AnkiDroid/src/main/res/values-my/02-strings.xml
index 28ad01a85d74..9b976904fdf6 100644
--- a/AnkiDroid/src/main/res/values-my/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-my/02-strings.xml
@@ -190,7 +190,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-nl/02-strings.xml b/AnkiDroid/src/main/res/values-nl/02-strings.xml
index 0f91ca56ac47..45eac2a26b32 100644
--- a/AnkiDroid/src/main/res/values-nl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-nl/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Opslaan van schrijfbordafbeelding is mislukt. %s</string>
     <string name="white_board_image_saved">schrijfbordafbeelding opgeslagen in %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Penkleur schrijfbord</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard bewerker</string>
     <string name="user_is_a_robot">Geautomatiseerde test gedetecteerd. Als u een mens bent, neem dan contact op met de AnkiDroid-ondersteuning</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-nn/02-strings.xml b/AnkiDroid/src/main/res/values-nn/02-strings.xml
index 475c181c590a..6b95b1a339d2 100644
--- a/AnkiDroid/src/main/res/values-nn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-nn/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Kunne ikke lagre tavle. %s</string>
     <string name="white_board_image_saved">Tavle lagret som %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Farge på penn</string>
     <string name="title_whiteboard_editor" maxLength="28">Tavleeditor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-no/02-strings.xml b/AnkiDroid/src/main/res/values-no/02-strings.xml
index acc241fc5201..4db8e35c8de7 100644
--- a/AnkiDroid/src/main/res/values-no/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-no/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Kunne ikke lagre tavle. %s</string>
     <string name="white_board_image_saved">Tavle lagret som %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Farge på penn</string>
     <string name="title_whiteboard_editor" maxLength="28">Tavleeditor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-or/02-strings.xml b/AnkiDroid/src/main/res/values-or/02-strings.xml
index ac5ba293fb58..f7fb7715ceff 100644
--- a/AnkiDroid/src/main/res/values-or/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-or/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">ଧଳାପଟା ଛବି ସଂରକ୍ଷଣ କରିବାରେ ବିଫଳ। %s</string>
     <string name="white_board_image_saved">ଧଳାପଟା ଛବି %sରେ ସଂରକ୍ଷିତ</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">ଧଳାପଟା କଲମ ରଙ୍ଗ</string>
     <string name="title_whiteboard_editor" maxLength="28">ଧଳାପଟା ସମ୍ପାଦକ</string>
     <string name="user_is_a_robot">ସ୍ୱଚାଳିତ ପରୀକ୍ଷା ଚିହ୍ନଟ ହୋଇଛି। ଯଦି ଆପଣ ଜଣେ ମଣିଷ, AnkiDroid ସମର୍ଥନ ସହିତ ଯୋଗାଯୋଗ କରନ୍ତୁ</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-pa/02-strings.xml b/AnkiDroid/src/main/res/values-pa/02-strings.xml
index 730c440a8dd1..1ce155b0b646 100644
--- a/AnkiDroid/src/main/res/values-pa/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-pa/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">ਵ੍ਹਾਈਟਬੋਰਡ ਚਿੱਤਰ ਨੂੰ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਅਸਫਲ। %s</string>
     <string name="white_board_image_saved">ਵ੍ਹਾਈਟਬੋਰਡ ਚਿੱਤਰ %s ਵਿੱਚ ਸੁਰੱਖਿਅਤ ਕੀਤਾ ਗਿਆ</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">ਵ੍ਹਾਈਟਬੋਰਡ ਪੈੱਨ ਦਾ ਰੰਗ</string>
     <string name="title_whiteboard_editor" maxLength="28">ਵ੍ਹਾਈਟਬੋਰਡ ਸੰਪਾਦਕ</string>
     <string name="user_is_a_robot">ਖੋਜਿਆ ਆਟੋਮੈਟਿਕ ਟੈਸਟ. ਜੇਕਰ ਤੁਸੀਂ ਮਨੁੱਖ ਹੋ, ਤਾਂ AnkiDroid ਸਹਾਇਤਾ ਨਾਲ ਸੰਪਰਕ ਕਰੋ</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-pl/02-strings.xml b/AnkiDroid/src/main/res/values-pl/02-strings.xml
index fe0e1879f856..d4463ca48461 100644
--- a/AnkiDroid/src/main/res/values-pl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-pl/02-strings.xml
@@ -202,7 +202,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Nie udało się zapisać obrazu tablicy. %s</string>
     <string name="white_board_image_saved">Obraz tablicy zapisany w %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Kolor tablicy</string>
     <string name="title_whiteboard_editor" maxLength="28">Edytor tablicy</string>
     <string name="user_is_a_robot">Wykryto automatyczny test. Jeśli jesteś człowiekiem, skontaktuj się z pomocą techniczną AnkiDroid</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml b/AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml
index 3abd60c4dbf7..26bb6cc3d3e0 100644
--- a/AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Falha ao salvar imagem do quadro. %s</string>
     <string name="white_board_image_saved">Imagem do quadro branco salva em %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Cor da caneta.</string>
     <string name="title_whiteboard_editor" maxLength="28">Editor de quadro branco</string>
     <string name="user_is_a_robot">Teste automático detectado. Se você é humano, entre em contato com o suporte do AnkiDroid</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml b/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml
index 4e60a9cc9ade..4b1710434de7 100644
--- a/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Falha ao guardar a imagem do quadro de escrita. %s</string>
     <string name="white_board_image_saved">Imagem do quadro de escrita guardado em %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Cor da caneta do quadro de escrita</string>
     <string name="title_whiteboard_editor" maxLength="28">Editor do quadro de escrita</string>
     <string name="user_is_a_robot">Detectado teste automático. Se é um humano, por favor contacto o apoio do AnkiDroid.</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-ro/02-strings.xml b/AnkiDroid/src/main/res/values-ro/02-strings.xml
index 465cdc28ac27..c9ba40ca3066 100644
--- a/AnkiDroid/src/main/res/values-ro/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ro/02-strings.xml
@@ -198,7 +198,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-ru/02-strings.xml b/AnkiDroid/src/main/res/values-ru/02-strings.xml
index 1c3be8e44e47..b6f552a9740c 100644
--- a/AnkiDroid/src/main/res/values-ru/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ru/02-strings.xml
@@ -202,7 +202,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Не удалось сохранить изображение доски. %s</string>
     <string name="white_board_image_saved">Изображение доски сохранено в %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Цвет маркера</string>
     <string name="title_whiteboard_editor" maxLength="28">Редактор доски</string>
     <string name="user_is_a_robot">Обнаружен автоматический тест. Если вы человек, обратитесь в службу поддержки AnkiDroid</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-sat/02-strings.xml b/AnkiDroid/src/main/res/values-sat/02-strings.xml
index 1ac9d124f3af..401c6bcdfd06 100644
--- a/AnkiDroid/src/main/res/values-sat/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sat/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">ᱯᱩᱸᱰ ᱵᱚᱰ ᱪᱤᱛᱟᱹᱨ ᱥᱟᱱᱪᱟᱣ ᱵᱷᱩᱞ ᱾. %s </string>
     <string name="white_board_image_saved">ᱯᱩᱸᱰ ᱵᱚᱰ ᱪᱤᱛᱟᱹᱨ %s ᱛᱮ ᱥᱟᱱᱪᱟᱣ</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">ᱯᱩᱸᱰ ᱵᱚᱰ ᱪᱤᱛᱟᱹᱨ ᱠᱚᱞᱚᱢ ᱨᱚᱰ</string>
     <string name="title_whiteboard_editor" maxLength="28">ᱯᱩᱸᱰᱵᱚᱰ ᱮᱰᱤᱴᱚᱨ</string>
     <string name="user_is_a_robot">ᱟᱹᱴᱚᱢᱮᱴᱮᱰ ᱴᱮᱥᱴ ᱯᱟᱱᱛᱮ ᱚᱲᱚᱠ ᱾ ᱡᱩᱫᱤ ᱟᱢ ᱦᱚᱲ ᱠᱟᱱᱟᱢ AnkiDroid ᱥᱚᱢᱯᱚᱨᱠ ᱠᱚᱢ</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-sc/02-strings.xml b/AnkiDroid/src/main/res/values-sc/02-strings.xml
index 46678c6b9342..a5dfb4464f0f 100644
--- a/AnkiDroid/src/main/res/values-sc/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sc/02-strings.xml
@@ -197,7 +197,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Sarvamentu de s\'immàgine de sa lavagna fallidu. %s</string>
     <string name="white_board_image_saved">Immàgine de sa lavagna sarvada in %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Colore de pinna de sa lavagna</string>
     <string name="title_whiteboard_editor" maxLength="28">Editore de sa lavagna</string>
     <string name="user_is_a_robot">Test automàticu agatadu. Si ses un\'umanu cuntata su suportu de AnkiDroid</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-sk/02-strings.xml b/AnkiDroid/src/main/res/values-sk/02-strings.xml
index 21b368747250..bc0b29a31150 100644
--- a/AnkiDroid/src/main/res/values-sk/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sk/02-strings.xml
@@ -202,7 +202,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Nepodarilo sa uložiť obrázok tabule. %s</string>
     <string name="white_board_image_saved">Obrázok tabule sa uložil do %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Farba pera pre tabuľu</string>
     <string name="title_whiteboard_editor" maxLength="28">Editor tabule</string>
     <string name="user_is_a_robot">Bol zachytený automatizovaný test. Ak ste človek, kontaktuje AnkiDroid podporu</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-sl/02-strings.xml b/AnkiDroid/src/main/res/values-sl/02-strings.xml
index 05f6b22994b3..36a058121e77 100644
--- a/AnkiDroid/src/main/res/values-sl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sl/02-strings.xml
@@ -202,7 +202,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-sq/02-strings.xml b/AnkiDroid/src/main/res/values-sq/02-strings.xml
index 5d378086c31d..5cc4d585ecd9 100644
--- a/AnkiDroid/src/main/res/values-sq/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sq/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-sr/02-strings.xml b/AnkiDroid/src/main/res/values-sr/02-strings.xml
index e8cbe5e3526d..1784f2698fa4 100644
--- a/AnkiDroid/src/main/res/values-sr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sr/02-strings.xml
@@ -198,7 +198,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-ss/02-strings.xml b/AnkiDroid/src/main/res/values-ss/02-strings.xml
index ba80ca682342..e0c971192ee7 100644
--- a/AnkiDroid/src/main/res/values-ss/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ss/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-sv/02-strings.xml b/AnkiDroid/src/main/res/values-sv/02-strings.xml
index 18649dc5c04f..f658854f2fbf 100644
--- a/AnkiDroid/src/main/res/values-sv/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sv/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Det gick inte att spara whiteboardbilden. %s</string>
     <string name="white_board_image_saved">Whiteboard-bild sparad till %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Färg på whiteboardpenna</string>
     <string name="title_whiteboard_editor" maxLength="28">Redigerare för whiteboard</string>
     <string name="user_is_a_robot">Upptäckte automatiskt test. Om du är en människa, kontakta AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-sw/02-strings.xml b/AnkiDroid/src/main/res/values-sw/02-strings.xml
index ba80ca682342..e0c971192ee7 100644
--- a/AnkiDroid/src/main/res/values-sw/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sw/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-ta/02-strings.xml b/AnkiDroid/src/main/res/values-ta/02-strings.xml
index 20e2fdfcfa7d..abeb39cf4f81 100644
--- a/AnkiDroid/src/main/res/values-ta/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ta/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">ஒயிட்போர்டு படத்தைச் சேமிப்பதில் தோல்வி. %s</string>
     <string name="white_board_image_saved">ஒயிட்போர்டு படம் %s இல் சேமிக்கப்பட்டது</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">ஒயிட்போர்டு பேனா நிறம்</string>
     <string name="title_whiteboard_editor" maxLength="28">ஒயிட்போர்டு எடிட்டர்</string>
     <string name="user_is_a_robot">தானியங்கு சோதனை கண்டறியப்பட்டது. நீங்கள் ஒரு மனிதராக இருந்தால், AnkiDroid ஆதரவைத் தொடர்பு கொள்ளவும்</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-te/02-strings.xml b/AnkiDroid/src/main/res/values-te/02-strings.xml
index b257dd7a530a..e2b71e5803db 100644
--- a/AnkiDroid/src/main/res/values-te/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-te/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">వైట్‌బోర్డ్ చిత్రాన్ని సేవ్ చేయడంలో విఫలమైంది. %s</string>
     <string name="white_board_image_saved">వైట్‌బోర్డ్ చిత్రం %sకి సేవ్ చేయబడింది</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">వైట్‌బోర్డ్ పెన్ రంగు</string>
     <string name="title_whiteboard_editor" maxLength="28">వైట్‌బోర్డ్ ఎడిటర్</string>
     <string name="user_is_a_robot">స్వయంచాలక పరీక్ష కనుగొనబడింది. మీరు మానవులైతే, AnkiDroid మద్దతును సంప్రదించండి</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-tg/02-strings.xml b/AnkiDroid/src/main/res/values-tg/02-strings.xml
index ba80ca682342..e0c971192ee7 100644
--- a/AnkiDroid/src/main/res/values-tg/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tg/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-tgl/02-strings.xml b/AnkiDroid/src/main/res/values-tgl/02-strings.xml
index 5155d73c36f8..e1b9f5bd8205 100644
--- a/AnkiDroid/src/main/res/values-tgl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tgl/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-th/02-strings.xml b/AnkiDroid/src/main/res/values-th/02-strings.xml
index 0ae179866d48..3a1a6cfe0925 100644
--- a/AnkiDroid/src/main/res/values-th/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-th/02-strings.xml
@@ -190,7 +190,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-ti/02-strings.xml b/AnkiDroid/src/main/res/values-ti/02-strings.xml
index ba80ca682342..e0c971192ee7 100644
--- a/AnkiDroid/src/main/res/values-ti/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ti/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-tn/02-strings.xml b/AnkiDroid/src/main/res/values-tn/02-strings.xml
index ba80ca682342..e0c971192ee7 100644
--- a/AnkiDroid/src/main/res/values-tn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tn/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-tr/02-strings.xml b/AnkiDroid/src/main/res/values-tr/02-strings.xml
index 9d5fc2ecc3be..f9b966abc28f 100644
--- a/AnkiDroid/src/main/res/values-tr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tr/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Yazı tahtası resmi kaydedilemedi. %s</string>
     <string name="white_board_image_saved">Yazı tahtası resmi bu adrese kaydedildi: %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Yazı tahtası kalem rengi</string>
     <string name="title_whiteboard_editor" maxLength="28">Yazı tahtası düzenleyici</string>
     <string name="user_is_a_robot">Otomatik test saptandı. Eğer insansanız, AnkiDroid desteğiyle iletişime geçin</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-ts/02-strings.xml b/AnkiDroid/src/main/res/values-ts/02-strings.xml
index ba80ca682342..e0c971192ee7 100644
--- a/AnkiDroid/src/main/res/values-ts/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ts/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-tt/02-strings.xml b/AnkiDroid/src/main/res/values-tt/02-strings.xml
index 93f5db464a01..75aee2e4e660 100644
--- a/AnkiDroid/src/main/res/values-tt/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tt/02-strings.xml
@@ -191,7 +191,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-ug/02-strings.xml b/AnkiDroid/src/main/res/values-ug/02-strings.xml
index 036505a34fdc..368f98932847 100644
--- a/AnkiDroid/src/main/res/values-ug/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ug/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">ئاق دوسكا سۈرىتىنى ساقلىيالمىدى %s</string>
     <string name="white_board_image_saved">ئاق دوسكا سۈرىتى %s غا ساقلاندى</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">ئاق دوسكا قەلەم رەڭگى</string>
     <string name="title_whiteboard_editor" maxLength="28">ئاق دوسكا تەھرىرلىگۈچ</string>
     <string name="user_is_a_robot">ئاپتوماتلاشقان سىناق بايقالدى. ئەگەر ئىنسان بولسىڭىز، AnkiDroid قوللىغۇچىلىرى بىلەن ئالاقىلىشىڭ</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-uk/02-strings.xml b/AnkiDroid/src/main/res/values-uk/02-strings.xml
index 152d10713032..459059a585a2 100644
--- a/AnkiDroid/src/main/res/values-uk/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-uk/02-strings.xml
@@ -202,7 +202,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Не вдалося зберегти зображення дошки. %s</string>
     <string name="white_board_image_saved">Зображення дошки збережено до %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Колір пензля</string>
     <string name="title_whiteboard_editor" maxLength="28">Редактор дошки</string>
     <string name="user_is_a_robot">Виявлено автоматичний тест. Якщо Ви — людина, зверніться до підтримки AnkiDroid</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-ur/02-strings.xml b/AnkiDroid/src/main/res/values-ur/02-strings.xml
index 7e7eca68dcd5..8f7146514ff7 100644
--- a/AnkiDroid/src/main/res/values-ur/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ur/02-strings.xml
@@ -195,7 +195,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">وائٹ بورڈ امیج کو محفوظ کرنے میں ناکام۔ %s</string>
     <string name="white_board_image_saved">وائٹ بورڈ کی تصویر %s میں محفوظ ہو گئی۔</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">وائٹ بورڈ قلم کا رنگ</string>
     <string name="title_whiteboard_editor" maxLength="28">وائٹ بورڈ ایڈیٹر</string>
     <string name="user_is_a_robot">خودکار ٹیسٹ کا پتہ چلا۔ اگر آپ انسان ہیں تو AnkiDroid سپورٹ سے رابطہ کریں۔</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-uz/02-strings.xml b/AnkiDroid/src/main/res/values-uz/02-strings.xml
index 47b48ccefdd7..3e335565b0bd 100644
--- a/AnkiDroid/src/main/res/values-uz/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-uz/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-ve/02-strings.xml b/AnkiDroid/src/main/res/values-ve/02-strings.xml
index ba80ca682342..e0c971192ee7 100644
--- a/AnkiDroid/src/main/res/values-ve/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ve/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-vi/02-strings.xml b/AnkiDroid/src/main/res/values-vi/02-strings.xml
index 46ffd997b93d..ee1511f5c158 100644
--- a/AnkiDroid/src/main/res/values-vi/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-vi/02-strings.xml
@@ -190,7 +190,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Không thể lưu hình ảnh bảng trắng. %s</string>
     <string name="white_board_image_saved">Hình ảnh bảng trắng được lưu vào %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Bảng màu bút</string>
     <string name="title_whiteboard_editor" maxLength="28">Trình chỉnh sửa bảng trắng</string>
     <string name="user_is_a_robot">Đã phát hiện kiểm tra tự động. Nếu bạn là con người, hãy liên hệ với bộ phận hỗ trợ AnkiDroid</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-wo/02-strings.xml b/AnkiDroid/src/main/res/values-wo/02-strings.xml
index 28ad01a85d74..9b976904fdf6 100644
--- a/AnkiDroid/src/main/res/values-wo/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-wo/02-strings.xml
@@ -190,7 +190,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-xh/02-strings.xml b/AnkiDroid/src/main/res/values-xh/02-strings.xml
index ba80ca682342..e0c971192ee7 100644
--- a/AnkiDroid/src/main/res/values-xh/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-xh/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-yue/02-strings.xml b/AnkiDroid/src/main/res/values-yue/02-strings.xml
index 9ced200f9ad9..c8b9e8c5f5da 100644
--- a/AnkiDroid/src/main/res/values-yue/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-yue/02-strings.xml
@@ -190,7 +190,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml b/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml
index 89578bdd9f2c..29ded3f222d5 100644
--- a/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml
@@ -190,7 +190,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">保存白板图像失败。 %s</string>
     <string name="white_board_image_saved">白板图像已保存到 %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">白板笔颜色</string>
     <string name="title_whiteboard_editor" maxLength="28">白板编辑器</string>
     <string name="user_is_a_robot">检测到自动测试。如果您是真人，请联系 AnkiDroid 支持</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-zh-rTW/02-strings.xml b/AnkiDroid/src/main/res/values-zh-rTW/02-strings.xml
index 0e4a9655138e..5d5c72414cee 100644
--- a/AnkiDroid/src/main/res/values-zh-rTW/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-zh-rTW/02-strings.xml
@@ -190,7 +190,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">儲存白板圖像失敗。%s</string>
     <string name="white_board_image_saved">白板圖像儲存至%s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">白板筆色彩</string>
     <string name="title_whiteboard_editor" maxLength="28">白板編輯器</string>
     <string name="user_is_a_robot">已偵測到自動測驗。如果您不是機器人，請聯絡AnkiDroid支援.</string>
     <!-- JS api -->
diff --git a/AnkiDroid/src/main/res/values-zu/02-strings.xml b/AnkiDroid/src/main/res/values-zu/02-strings.xml
index ba80ca682342..e0c971192ee7 100644
--- a/AnkiDroid/src/main/res/values-zu/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-zu/02-strings.xml
@@ -194,7 +194,6 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_pen_color" maxLength="41">Whiteboard pen color</string>
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->

From 1b3ff27e4045dd343def17457d808910c5e3396c Mon Sep 17 00:00:00 2001
From: "sargamgayatri0803@gmail.com" <sargamgayatri0803@gmail.com>
Date: Wed, 22 Jan 2025 17:24:53 +0530
Subject: [PATCH 009/200] don't allow empty name in flag

---
 .../main/java/com/ichi2/anki/dialogs/FlagAdapter.kt   | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/FlagAdapter.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/FlagAdapter.kt
index 2861a27a395d..9f8e305964a3 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/FlagAdapter.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/FlagAdapter.kt
@@ -91,13 +91,18 @@ class FlagAdapter(
         }
 
         holder.saveButton.setOnClickListener {
-            val updatedTextName = holder.flagNameEdit.text.toString()
+            val updatedTextName =
+                holder.flagNameEdit.text
+                    .toString()
+                    .ifEmpty { flagItem.title }
             holder.flagNameViewLayout.visibility = View.VISIBLE
             holder.flagNameEditLayout.visibility = View.GONE
             val updatedFlagItem = flagItem.copy(title = updatedTextName)
             val updatedDataset = currentList.toMutableList()
-            lifecycleScope.launch {
-                flagItem.renameTo(updatedTextName)
+            if (updatedFlagItem.title != flagItem.title) {
+                lifecycleScope.launch {
+                    flagItem.renameTo(updatedTextName)
+                }
             }
             updatedFlagItem.isInEditMode = false
             updatedDataset[position] = updatedFlagItem

From 2c2f2bdc33bd6bb2cc00d35c3b65550d4f52a798 Mon Sep 17 00:00:00 2001
From: jainv4156 <jainv4156@gmail.com>
Date: Wed, 22 Jan 2025 15:44:45 +0530
Subject: [PATCH 010/200] Fix getsize() and getMatrix Depreciation

---
 .../java/com/ichi2/anki/noteeditor/Toolbar.kt | 24 +++++++++++++++----
 .../main/java/com/ichi2/utils/DisplayUtils.kt | 20 ++++++++++++++--
 2 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/Toolbar.kt b/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/Toolbar.kt
index 29ac505d0861..04d7be0be48a 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/Toolbar.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/Toolbar.kt
@@ -21,9 +21,11 @@ import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.graphics.Color
+import android.graphics.Insets
 import android.graphics.Paint
 import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
+import android.os.Build
 import android.util.AttributeSet
 import android.util.DisplayMetrics
 import android.util.TypedValue
@@ -33,6 +35,7 @@ import android.view.KeyEvent
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.WindowInsets
 import android.widget.FrameLayout
 import android.widget.LinearLayout
 import androidx.annotation.ColorInt
@@ -234,10 +237,23 @@ class Toolbar : FrameLayout {
     private val screenWidth: Int
         get() {
             val displayMetrics = DisplayMetrics()
-            (context as Activity)
-                .windowManager
-                .defaultDisplay
-                .getMetrics(displayMetrics)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                val windowMetrics =
+                    (context as Activity)
+                        .windowManager
+                        .currentWindowMetrics
+                val insets: Insets =
+                    windowMetrics.getWindowInsets().getInsetsIgnoringVisibility(
+                        WindowInsets.Type.navigationBars()
+                            or WindowInsets.Type.displayCutout(),
+                    )
+                displayMetrics.widthPixels = windowMetrics.bounds.width() - (insets.right + insets.left)
+            } else {
+                (context as Activity)
+                    .windowManager
+                    .defaultDisplay
+                    .getMetrics(displayMetrics)
+            }
             return displayMetrics.widthPixels
         }
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/utils/DisplayUtils.kt b/AnkiDroid/src/main/java/com/ichi2/utils/DisplayUtils.kt
index 6dbf155462c5..692f744e663f 100644
--- a/AnkiDroid/src/main/java/com/ichi2/utils/DisplayUtils.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/utils/DisplayUtils.kt
@@ -17,8 +17,11 @@
 package com.ichi2.utils
 
 import android.content.Context
+import android.graphics.Insets
 import android.graphics.Point
+import android.os.Build
 import android.view.Window
+import android.view.WindowInsets
 import android.view.WindowManager
 import com.ichi2.anki.AnkiDroidApp
 import kotlin.math.roundToInt
@@ -26,9 +29,22 @@ import kotlin.math.roundToInt
 object DisplayUtils {
     @Suppress("DEPRECATION") // #9333: defaultDisplay & getSize
     fun getDisplayDimensions(wm: WindowManager): Point {
-        val display = wm.defaultDisplay
         val point = Point()
-        display.getSize(point)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            val bounds = wm.currentWindowMetrics.bounds
+            val insets: Insets =
+                wm.currentWindowMetrics
+                    .getWindowInsets()
+                    .getInsetsIgnoringVisibility(
+                        WindowInsets.Type.navigationBars()
+                            or WindowInsets.Type.displayCutout(),
+                    )
+            point.x = bounds.width() - (insets.right + insets.left)
+            point.y = bounds.height() - (insets.top + insets.bottom)
+        } else {
+            val display = wm.defaultDisplay
+            display.getSize(point)
+        }
         return point
     }
 

From 8b1bed534c2aaed2b7c1b85e307cd85a91aab784 Mon Sep 17 00:00:00 2001
From: Divyanshu Yadav <154064821+Scapesfear@users.noreply.github.com>
Date: Fri, 10 Jan 2025 23:44:50 +0530
Subject: [PATCH 011/200] Fix missing auto-scroll feature in RecyclerView when
 switching to multiselectview and vice versa

---
 .../main/java/com/ichi2/anki/CardBrowser.kt   | 20 +++++++++++++++++++
 .../anki/browser/CardBrowserViewModel.kt      |  9 +++++++++
 .../java/com/ichi2/anki/CardBrowserTest.kt    | 17 ++++++++++++++++
 3 files changed, 46 insertions(+)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt b/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt
index c4047e01be4c..b64235d6edc1 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt
@@ -345,6 +345,8 @@ open class CardBrowser :
         launchCatchingTask {
             if (viewModel.isInMultiSelectMode) {
                 viewModel.toggleRowSelection(id)
+                viewModel.saveScrollingState(id)
+                viewModel.oldCardTopOffset = calculateTopOffset(viewModel.lastSelectedPosition)
             } else {
                 val cardId = viewModel.queryDataForCardEdit(id)
                 openNoteEditorForCard(cardId)
@@ -357,6 +359,8 @@ open class CardBrowser :
         if (viewModel.isInMultiSelectMode && viewModel.lastSelectedId != null) {
             viewModel.selectRowsBetween(viewModel.lastSelectedId!!, id)
         } else {
+            viewModel.saveScrollingState(id)
+            viewModel.oldCardTopOffset = calculateTopOffset(viewModel.lastSelectedPosition)
             viewModel.toggleRowSelection(id)
         }
     }
@@ -509,6 +513,7 @@ open class CardBrowser :
                 // Due to the ripple on long press, we set padding
                 browserColumnHeadings.updatePaddingRelative(start = 48.dp)
                 multiSelectOnBackPressedCallback.isEnabled = true
+                autoScrollTo(viewModel.lastSelectedPosition, viewModel.oldCardTopOffset)
             } else {
                 Timber.d("end multiselect mode")
                 // update adapter to remove check boxes
@@ -517,6 +522,7 @@ open class CardBrowser :
                 actionBarTitle.visibility = View.GONE
                 browserColumnHeadings.updatePaddingRelative(start = 0.dp)
                 multiSelectOnBackPressedCallback.isEnabled = false
+                autoScrollTo(viewModel.lastSelectedPosition, viewModel.oldCardTopOffset)
             }
             // reload the actionbar using the multi-select mode actionbar
             invalidateOptionsMenu()
@@ -1865,6 +1871,20 @@ open class CardBrowser :
             viewModel: CardBrowserViewModel,
         ): Intent = NoteEditorLauncher.AddNoteFromCardBrowser(viewModel).getIntent(context)
     }
+
+    private fun calculateTopOffset(cardPosition: Int): Int {
+        val layoutManager = cardsListView.layoutManager as LinearLayoutManager
+        val firstVisiblePosition = layoutManager.findFirstVisibleItemPosition()
+        val view = cardsListView.getChildAt(cardPosition - firstVisiblePosition)
+        return view?.top ?: 0
+    }
+
+    private fun autoScrollTo(
+        newPosition: Int,
+        offset: Int,
+    ) {
+        (cardsListView.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(newPosition, offset)
+    }
 }
 
 suspend fun searchForRows(
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserViewModel.kt b/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserViewModel.kt
index edde1bc778ae..5a6ca4dd7356 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserViewModel.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserViewModel.kt
@@ -101,6 +101,9 @@ class CardBrowserViewModel(
     private val manualInit: Boolean = false,
 ) : ViewModel(),
     SharedPreferencesProvider by preferences {
+    var lastSelectedPosition: Int = 0
+    var oldCardTopOffset: Int = 0
+
     // TODO: abstract so we can use a `Context` and `pref_display_filenames_in_browser_key`
     val showMediaFilenames = sharedPrefs().getBoolean("card_browser_show_media_filenames", false)
 
@@ -1030,6 +1033,12 @@ class CardBrowserViewModel(
             val error: String,
         ) : SearchState
     }
+
+    fun saveScrollingState(id: CardOrNoteId) {
+        cards.indexOf(id).takeIf { it >= 0 }?.let { position ->
+            lastSelectedPosition = position
+        }
+    }
 }
 
 enum class SaveSearchResult {
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt
index 9da90500fec3..cf6721e2a995 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt
@@ -936,6 +936,23 @@ class CardBrowserTest : RobolectricTest() {
             assertThat(cardBrowser.viewModel.rowCount, equalTo(3))
         }
 
+    @Test
+    fun checkIfScrollPositionSavedOnLongPress() =
+        runTest {
+            val cardBrowser = getBrowserWithNotes(10)
+            cardBrowser.longClickRowAtPosition(5)
+            assertThat(cardBrowser.viewModel.lastSelectedPosition, equalTo(5))
+        }
+
+    @Test
+    fun checkIfScrollPositionSavedOnTap() =
+        runTest {
+            val cardBrowser = getBrowserWithNotes(10)
+            cardBrowser.longClickRowAtPosition(1)
+            cardBrowser.clickRowAtPosition(5)
+            assertThat(cardBrowser.viewModel.lastSelectedPosition, equalTo(5))
+        }
+
     @Test
     fun `column spinner positions are set if no preferences exist`() =
         runBlocking {

From ad5d9bbd61ea83b134798264ba9cd8f2224d556f Mon Sep 17 00:00:00 2001
From: AnkiDroid Translations <ankidroid@ankidroid.org>
Date: Sat, 8 Feb 2025 09:07:38 +0000
Subject: [PATCH 012/200] Updated strings from Crowdin

---
 AnkiDroid/src/main/res/values-eo/01-core.xml    | 16 ++++++++--------
 AnkiDroid/src/main/res/values-eo/02-strings.xml |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/AnkiDroid/src/main/res/values-eo/01-core.xml b/AnkiDroid/src/main/res/values-eo/01-core.xml
index e90cfac34bd9..0c53a08499cd 100644
--- a/AnkiDroid/src/main/res/values-eo/01-core.xml
+++ b/AnkiDroid/src/main/res/values-eo/01-core.xml
@@ -54,8 +54,8 @@
     <string name="send_feedback">Sendi opinion</string>
     <string name="studyoptions_start">Lerni</string>
     <!-- DeckPicker.kt -->
-    <string name="expand">Etendi</string>
-    <string name="collapse">Maletendi</string>
+    <string name="expand">Elvolvi</string>
+    <string name="collapse">Volvi</string>
     <plurals name="reviewer_window_title">
         <item quantity="one">ankoraŭ %d minuto</item>
         <item quantity="other">ankoraŭ %d minutoj</item>
@@ -72,9 +72,9 @@
     <string name="no_cards_placeholder_description">Komencu aldoni kartojn\nper la butono “+”</string>
     <!-- The deck picker via AnkiStatsTaskHandler.java -->
     <!-- flashcard_portrait.xml -->
-    <string name="type_answer_hint">enigu respondon</string>
-    <string name="show_answer" maxLength="41">Montri respondon</string>
-    <string name="hide_answer">Kaŝi respondon</string>
+    <string name="type_answer_hint">Entajpu respondon</string>
+    <string name="show_answer" maxLength="41">Montri la respondon</string>
+    <string name="hide_answer">Kaŝi la respondon</string>
     <string name="ease_button_again" maxLength="41">Denove</string>
     <string name="ease_button_hard" maxLength="41">Malfacila</string>
     <string name="ease_button_good" maxLength="41">Bona</string>
@@ -82,7 +82,7 @@
     <string name="menu_import" maxLength="28">Enporti</string>
     <string name="undo" maxLength="28" comment="When tapping on this text, the last action is undone.">Malfari</string>
     <string name="redo" maxLength="28">Refari</string>
-    <string name="undo_action_whiteboard_last_stroke" comment="One of the display patterns of \'Undo\' item on the action menu in Reviewer. It is shown as the title of the item when the whiteboard (handwriting) feature is enabled and visible and has any strokes (handwritten lines)" maxLength="28">Malfari strekon</string>
+    <string name="undo_action_whiteboard_last_stroke" comment="One of the display patterns of \'Undo\' item on the action menu in Reviewer. It is shown as the title of the item when the whiteboard (handwriting) feature is enabled and visible and has any strokes (handwritten lines)" maxLength="28">Malfari la strekon</string>
     <string name="move_all_to_deck">Movi ĉiujn al kartaro</string>
     <string name="unbury" maxLength="28">Malkaŝi</string>
     <string name="rename_deck" maxLength="28">Renomi kartaron</string>
@@ -91,7 +91,7 @@
     <string name="edit_deck_description" comment="edit the deck description">Redakti priskribon</string>
     <string name="menu_add" comment="A generic add button. Please inform us if you need more specific strings" maxLength="28">Aldoni</string>
     <string name="menu_add_note" maxLength="28">Aldoni noton</string>
-    <string name="menu_my_account" comment="Label of the window in which the user should enter their account. This text can\'t be found in AnkiDroid directly.">Samtempigi la konton</string>
+    <string name="menu_my_account" comment="Label of the window in which the user should enter their account. This text can\'t be found in AnkiDroid directly.">Samtempigi konton</string>
     <string name="menu_dismiss_note" maxLength="41">Kaŝi / forigi</string>
     <string name="menu_bury_card" maxLength="28">Kaŝi karton por tago</string>
     <string name="menu_bury_note" maxLength="28">Kaŝi noton por tago</string>
@@ -187,7 +187,7 @@
     <string name="directory_revoked_after_inactivity" comment="the first parameter is WRITE_EXTERNAL_STORAGE the second parameter is the path to the AnkiDroid folder. Typically /storage/emulated/0/AnkiDroid">Android senigis la aplikaĵon AnkiDroid je la permeso %1$s pro longa malaktiveco.\n\nViaj datumoj estas sekuraj kaj povas esti restarigitaj. Ili troviĝas en la dosierujo:\n%2$s\n\nElektu ion el la suba listo por restarigi viajn datumojn.</string>
     <string name="restore_data_from_ankiweb">Restarigi el AnkiWeb (konsilinda)</string>
     <string name="install_non_play_store_ankidroid_recommended">Restarigi aliron al dosierujo (konsilinda)</string>
-    <string name="install_non_play_store_ankidroid">restarigi aliron al dosierujo (altnivela)</string>
+    <string name="install_non_play_store_ankidroid">Restarigi la aliron al dosierujoj (altnivela)</string>
     <string name="restore_data_from_backup">Restarigi el sekurkopio .colpkg (altnivela)</string>
     <string name="create_new_collection">Krei novan kolekton</string>
     <string name="new_unsafe_collection">La nova kolekto estos forigita el via telefono, se vi malinstalos AnkiDroid</string>
diff --git a/AnkiDroid/src/main/res/values-eo/02-strings.xml b/AnkiDroid/src/main/res/values-eo/02-strings.xml
index 38c05747e1c3..1d88f9b09982 100644
--- a/AnkiDroid/src/main/res/values-eo/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-eo/02-strings.xml
@@ -45,8 +45,8 @@
 -->
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Navigation drawer strings -->
-    <string name="drawer_open">Montri tirmenuon</string>
-    <string name="drawer_close">Kaŝi tirmenuon</string>
+    <string name="drawer_open">Malfermi la tirmenuon</string>
+    <string name="drawer_close">Fermi la tirmenuon</string>
     <string name="CardEditorCardDeck">Kartaro:</string>
     <string name="CardEditorNoteDeck">Kartaro:</string>
     <string name="CardEditorModel">Tipo:</string>

From 07a6717e93de5b1e4bbf7e43929fc346fd62fc9a Mon Sep 17 00:00:00 2001
From: lukstbit <52494258+lukstbit@users.noreply.github.com>
Date: Wed, 5 Feb 2025 15:56:03 +0200
Subject: [PATCH 013/200] Enable full report about empty cards

The new report shows the exact same info that desktop currently shows
about empty cards.

While desktop show the equivalent of a Snackbar when there are no empty
cards, we show this in the dialog to avoid a sudden(weird) dismissal of the
dialog.
---
 .../anki/dialogs/EmptyCardsDialogFragment.kt  | 107 +++++++++++++++++-
 .../main/res/layout/dialog_empty_cards.xml    |  36 ++++--
 AnkiDroid/src/main/res/values/03-dialogs.xml  |   2 -
 3 files changed, 125 insertions(+), 20 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/EmptyCardsDialogFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/EmptyCardsDialogFragment.kt
index e32579a27ea2..3339139bf9fe 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/EmptyCardsDialogFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/EmptyCardsDialogFragment.kt
@@ -17,12 +17,25 @@
 
 package com.ichi2.anki.dialogs
 
+import android.app.Activity
 import android.app.Dialog
+import android.content.Intent
+import android.content.res.Configuration
+import android.content.res.Configuration.ORIENTATION_LANDSCAPE
+import android.graphics.Insets
+import android.os.Build
 import android.os.Bundle
+import android.util.DisplayMetrics
 import android.view.View
+import android.view.WindowInsets.Type.displayCutout
+import android.view.WindowInsets.Type.navigationBars
+import android.webkit.WebResourceRequest
+import android.webkit.WebView
+import android.webkit.WebViewClient
 import android.widget.CheckBox
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
+import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.view.isVisible
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.viewModels
@@ -30,6 +43,7 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import anki.card_rendering.EmptyCardsReport
+import com.ichi2.anki.CardBrowser
 import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.DeckPicker
 import com.ichi2.anki.R
@@ -59,10 +73,32 @@ class EmptyCardsDialogFragment : DialogFragment() {
         get() = dialog?.findViewById(R.id.text)
     private val emptyCardsResultsContainer: View?
         get() = dialog?.findViewById(R.id.empty_cards_results_container)
-    private val emptyCardsResultsMessage: TextView?
-        get() = dialog?.findViewById(R.id.empty_cards_results_message)
+    private val emptyReportMessage: TextView?
+        get() = dialog?.findViewById(R.id.empty_report_label)
     private val keepNotesWithNoValidCards: CheckBox?
         get() = dialog?.findViewById(R.id.preserve_notes)
+    private val reportWebView: WebView?
+        get() = dialog?.findViewById(R.id.report)
+
+    // TODO handle WebViewClient.onRenderProcessGone()
+    private val customWebViewClient =
+        object : WebViewClient() {
+            override fun shouldOverrideUrlLoading(
+                view: WebView?,
+                request: WebResourceRequest?,
+            ): Boolean {
+                val searchQuery = request?.url?.toString()
+                return if (searchQuery != null && searchQuery.startsWith("nid:")) {
+                    val browserSearchIntent = Intent(requireContext(), CardBrowser::class.java)
+                    browserSearchIntent.putExtra("search_query", searchQuery)
+                    browserSearchIntent.putExtra("all_decks", true)
+                    startActivity(browserSearchIntent)
+                    true
+                } else {
+                    super.shouldOverrideUrlLoading(view, request)
+                }
+            }
+        }
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         bindToState()
@@ -70,6 +106,7 @@ class EmptyCardsDialogFragment : DialogFragment() {
         val dialogView = layoutInflater.inflate(R.layout.dialog_empty_cards, null)
         dialogView.findViewById<CheckBox>(R.id.preserve_notes)?.text =
             TR.emptyCardsPreserveNotesCheckbox()
+        dialogView.findViewById<WebView>(R.id.report).webViewClient = customWebViewClient
 
         return AlertDialog
             .Builder(requireContext())
@@ -122,20 +159,26 @@ class EmptyCardsDialogFragment : DialogFragment() {
                             loadingContainer?.isVisible = false
                             val emptyCards = state.emptyCardsReport.emptyCids()
                             if (emptyCards.isEmpty()) {
-                                emptyCardsResultsMessage?.text = TR.emptyCardsNotFound()
+                                emptyReportMessage?.text = TR.emptyCardsNotFound()
+                                emptyReportMessage?.isVisible = true
                                 // nothing to delete so also hide the preserve notes check box
                                 keepNotesWithNoValidCards?.isVisible = false
                                 (dialog as? AlertDialog)?.positiveButton?.text =
                                     getString(R.string.dialog_ok)
                             } else {
+                                reportWebView?.updateWebViewHeight()
+                                reportWebView?.loadData(
+                                    state.emptyCardsReport.asActionableReport(),
+                                    "text/html",
+                                    null,
+                                )
                                 keepNotesWithNoValidCards?.isVisible = true
-                                emptyCardsResultsMessage?.text =
-                                    getString(R.string.empty_cards_count, emptyCards.size)
+                                emptyReportMessage?.isVisible = false
                                 (dialog as? AlertDialog)?.positiveButton?.text =
                                     getString(R.string.dialog_positive_delete)
+                                emptyCardsResultsContainer?.isVisible = true
                             }
                             (dialog as? AlertDialog)?.positiveButton?.isEnabled = true
-                            emptyCardsResultsContainer?.isVisible = true
                         }
 
                         is EmptyCardsSearchFailure -> {
@@ -154,6 +197,58 @@ class EmptyCardsDialogFragment : DialogFragment() {
         }
     }
 
+    /**
+     * Replaces the anki format [anki:nid:#nid](ex: [anki:nid:234783924354]) with "nid:#id"(
+     * ex. nid:234783924354) to be used as a query text in [CardBrowser].
+     */
+    // https://github.com/ankitects/anki/blob/de7a693465ca302e457a4767c7f213c76478f0ee/qt/aqt/emptycards.py#L56-L60
+    private fun EmptyCardsReport.asActionableReport(): String {
+        @Suppress("RegExpRedundantEscape")
+        return Regex("\\[anki:nid:(\\d+)\\]")
+            .replace(
+                report,
+                "<a href=\"nid:$1\">$1</a>",
+            )
+    }
+
+    /**
+     * The [WebView] doesn't properly fit the allocated space in the dialog so this method manually
+     * updates the [WebView]'s height to a value that fits, depending on orientation and screen size.
+     */
+    private fun WebView.updateWebViewHeight() {
+        val currentOrientation = requireContext().resources.configuration.orientation
+        val targetPercent = if (currentOrientation == ORIENTATION_LANDSCAPE) 0.25 else 0.5
+        val screenHeight =
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                val windowMetrics =
+                    (context as Activity)
+                        .windowManager
+                        .currentWindowMetrics
+                val insets: Insets =
+                    windowMetrics.getWindowInsets().getInsetsIgnoringVisibility(
+                        navigationBars() or displayCutout(),
+                    )
+                windowMetrics.bounds.height() - (insets.top + insets.bottom)
+            } else {
+                val displayMetrics = DisplayMetrics()
+                @Suppress("DEPRECATION")
+                (context as Activity)
+                    .windowManager
+                    .defaultDisplay
+                    .getMetrics(displayMetrics)
+                displayMetrics.heightPixels
+            }
+        val calculatedHeight = (screenHeight * targetPercent).toInt()
+        (layoutParams as ConstraintLayout.LayoutParams).height = calculatedHeight
+        layoutParams = layoutParams
+        requestLayout()
+    }
+
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        reportWebView?.updateWebViewHeight()
+    }
+
     companion object {
         const val TAG = "EmptyCardsDialog"
     }
diff --git a/AnkiDroid/src/main/res/layout/dialog_empty_cards.xml b/AnkiDroid/src/main/res/layout/dialog_empty_cards.xml
index f41aafb2ce68..8ff232b50028 100644
--- a/AnkiDroid/src/main/res/layout/dialog_empty_cards.xml
+++ b/AnkiDroid/src/main/res/layout/dialog_empty_cards.xml
@@ -52,30 +52,42 @@
             tools:text="Processing..." />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <LinearLayout
+    <com.ichi2.ui.FixedTextView
+        android:id="@+id/empty_report_label"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="16dp"
+        android:layout_marginHorizontal="24dp"
+        android:visibility="gone"
+        android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
+        tools:text="Cards to delete: 123" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/empty_cards_results_container"
         android:visibility="gone"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
         android:paddingStart="@dimen/side_margin"
         android:paddingEnd="@dimen/side_margin">
 
-        <com.ichi2.ui.FixedTextView
-            android:id="@+id/empty_cards_results_message"
+        <WebView
+            android:id="@+id/report"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingTop="16dp"
-            android:paddingStart="8dp"
-            android:paddingBottom="8dp"
-            android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
-            tools:text="Cards to delete: 123" />
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toTopOf="@+id/preserve_notes"/>
 
         <CheckBox
             android:id="@+id/preserve_notes"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:checked="true"
-            tools:text="Keep notes with no valid cards" />
-    </LinearLayout>
-</FrameLayout>
\ No newline at end of file
+            tools:text="Keep notes with no valid cards"
+            android:layout_marginTop="8dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"/>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
diff --git a/AnkiDroid/src/main/res/values/03-dialogs.xml b/AnkiDroid/src/main/res/values/03-dialogs.xml
index c5682bb60110..91d59156c62e 100644
--- a/AnkiDroid/src/main/res/values/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values/03-dialogs.xml
@@ -114,8 +114,6 @@
 
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards…</string>
-    <string name="empty_cards_count">Cards to delete: %d</string>
-
 
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>

From 36e9c9b5cbacabf39a296efbedcc4f93b88526cc Mon Sep 17 00:00:00 2001
From: Ashish Yadav <48384865+criticalAY@users.noreply.github.com>
Date: Thu, 30 Jan 2025 02:54:30 +0530
Subject: [PATCH 014/200] enhancement: improve reposition field dialog

---
 .../java/com/ichi2/anki/ModelFieldEditor.kt   | 103 ++++++++++--------
 .../src/main/res/values/17-model-manager.xml  |   2 -
 2 files changed, 58 insertions(+), 47 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ModelFieldEditor.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ModelFieldEditor.kt
index 85829becb86a..32c52cfab191 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ModelFieldEditor.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ModelFieldEditor.kt
@@ -29,6 +29,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.FragmentManager
 import com.google.android.material.snackbar.Snackbar
+import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.CollectionManager.withCol
 import com.ichi2.anki.dialogs.ConfirmationDialog
 import com.ichi2.anki.dialogs.LocaleSelectionDialog
@@ -45,6 +46,8 @@ import com.ichi2.libanki.NotetypeJson
 import com.ichi2.libanki.exception.ConfirmModSchemaException
 import com.ichi2.ui.FixedEditText
 import com.ichi2.utils.customView
+import com.ichi2.utils.getInputField
+import com.ichi2.utils.input
 import com.ichi2.utils.negativeButton
 import com.ichi2.utils.positiveButton
 import com.ichi2.utils.show
@@ -339,56 +342,66 @@ class ModelFieldEditor :
         }
     }
 
-    /*
-     * Allows the user to select a number less than the number of fields in the current model to
-     * reposition the current field to
-     * Processing time is scales with number of items
+    /**
+     * Displays a dialog to allow the user to reposition a field within a list.
      */
     private fun repositionFieldDialog() {
-        fieldNameInput = FixedEditText(this).apply { focusWithKeyboard() }
-        fieldNameInput?.let { fieldNameInput ->
-            fieldNameInput.setRawInputType(InputType.TYPE_CLASS_NUMBER)
-            AlertDialog.Builder(this).show {
-                customView(view = fieldNameInput, paddingStart = 64, paddingEnd = 64, paddingTop = 32)
-                title(text = String.format(resources.getString(R.string.model_field_editor_reposition), 1, fieldsLabels.size))
-                positiveButton(R.string.dialog_ok) {
-                    val newPosition = fieldNameInput.text.toString()
-                    val pos: Int =
-                        try {
-                            newPosition.toInt()
-                        } catch (n: NumberFormatException) {
-                            Timber.w(n)
-                            fieldNameInput.error = resources.getString(R.string.toast_out_of_range)
-                            return@positiveButton
-                        }
-                    if (pos < 1 || pos > fieldsLabels.size) {
-                        fieldNameInput.error = resources.getString(R.string.toast_out_of_range)
-                    } else {
-                        // Input is valid, now attempt to modify
-                        try {
-                            getColUnsafe.modSchema()
-                            repositionField(pos - 1)
-                        } catch (e: ConfirmModSchemaException) {
-                            e.log()
+        /**
+         * Shows an input dialog for selecting a new position.
+         *
+         * @param numberOfTemplates The total number of available positions.
+         * @param result A lambda function that receives the validated new position as an integer.
+         */
+        fun showDialog(
+            numberOfTemplates: Int,
+            result: (Int) -> Unit,
+        ) {
+            AlertDialog
+                .Builder(this)
+                .show {
+                    positiveButton(R.string.dialog_ok) {
+                        val input = (it as AlertDialog).getInputField()
+                        result(input.text.toString().toInt())
+                    }
+                    negativeButton(R.string.dialog_cancel)
+                    setMessage(TR.fieldsNewPosition1(numberOfTemplates))
+                    setView(R.layout.dialog_generic_text_input)
+                }.input(
+                    prefill = (currentPos + 1).toString(),
+                    inputType = InputType.TYPE_CLASS_NUMBER,
+                    displayKeyboard = true,
+                    waitForPositiveButton = false,
+                ) { dialog, text: CharSequence ->
+                    val number = text.toString().toIntOrNull()
+                    dialog.positiveButton.isEnabled = number != null && number in 1..numberOfTemplates
+                }
+        }
 
-                            // Handle mod schema confirmation
-                            val c = ConfirmationDialog()
-                            c.setArgs(resources.getString(R.string.full_sync_confirmation))
-                            val confirm =
-                                Runnable {
-                                    try {
-                                        getColUnsafe.modSchemaNoCheck()
-                                        repositionField(pos - 1)
-                                    } catch (e1: JSONException) {
-                                        throw RuntimeException(e1)
-                                    }
-                                }
-                            c.setConfirm(confirm)
-                            this@ModelFieldEditor.showDialogFragment(c)
+        // handle repositioning
+        showDialog(fieldsLabels.size) { newPosition ->
+            if (newPosition == currentPos + 1) return@showDialog
+
+            Timber.i("Repositioning field from %d to %d", currentPos, newPosition)
+            try {
+                getColUnsafe.modSchema()
+                repositionField(newPosition - 1)
+            } catch (e: ConfirmModSchemaException) {
+                e.log()
+
+                // Handle mod schema confirmation
+                val c = ConfirmationDialog()
+                c.setArgs(resources.getString(R.string.full_sync_confirmation))
+                val confirm =
+                    Runnable {
+                        try {
+                            getColUnsafe.modSchemaNoCheck()
+                            repositionField(newPosition - 1)
+                        } catch (e1: JSONException) {
+                            throw RuntimeException(e1)
                         }
                     }
-                }
-                negativeButton(R.string.dialog_cancel)
+                c.setConfirm(confirm)
+                this@ModelFieldEditor.showDialogFragment(c)
             }
         }
     }
diff --git a/AnkiDroid/src/main/res/values/17-model-manager.xml b/AnkiDroid/src/main/res/values/17-model-manager.xml
index 74d003777247..0b79d46a20f5 100644
--- a/AnkiDroid/src/main/res/values/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values/17-model-manager.xml
@@ -11,7 +11,6 @@
     <string name="toast_last_field">Note types must have at least one field</string>
     <string name="toast_empty_name">You must enter a name</string>
     <string name="toast_duplicate_field">Field name already used</string>
-    <string name="toast_out_of_range">You must enter a valid value</string>
 
 
     <!--Plurals-->
@@ -46,7 +45,6 @@
     <string name="model_field_editor_rename">Rename field</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Reposition field</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Updating fields</string>
     <string name="model_field_editor_sort_field">Sort by this field</string>

From 82af34ace43474e6294aaee68badcb020fc6339f Mon Sep 17 00:00:00 2001
From: AnkiDroid Translations <ankidroid@ankidroid.org>
Date: Sat, 8 Feb 2025 09:54:58 +0000
Subject: [PATCH 015/200] Updated strings from Crowdin

---
 AnkiDroid/src/main/res/values-af/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-af/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-am/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-am/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-ar/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-ar/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-az/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-az/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-be/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-be/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-bg/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-bg/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-bn/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-bn/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-ca/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-ca/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-ckb/03-dialogs.xml          | 1 -
 AnkiDroid/src/main/res/values-ckb/17-model-manager.xml    | 2 --
 AnkiDroid/src/main/res/values-cs/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-cs/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-da/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-da/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-de/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-de/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-el/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-el/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-eo/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-eo/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-es-rAR/03-dialogs.xml       | 1 -
 AnkiDroid/src/main/res/values-es-rAR/17-model-manager.xml | 2 --
 AnkiDroid/src/main/res/values-es-rES/03-dialogs.xml       | 1 -
 AnkiDroid/src/main/res/values-es-rES/17-model-manager.xml | 2 --
 AnkiDroid/src/main/res/values-et/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-et/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-eu/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-eu/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-fa/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-fa/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-fi/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-fi/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-fil/03-dialogs.xml          | 1 -
 AnkiDroid/src/main/res/values-fil/17-model-manager.xml    | 2 --
 AnkiDroid/src/main/res/values-fr/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-fr/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-fy/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-fy/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-ga/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-ga/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-gl/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-gl/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-got/03-dialogs.xml          | 1 -
 AnkiDroid/src/main/res/values-got/17-model-manager.xml    | 2 --
 AnkiDroid/src/main/res/values-gu/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-gu/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-heb/03-dialogs.xml          | 1 -
 AnkiDroid/src/main/res/values-heb/17-model-manager.xml    | 2 --
 AnkiDroid/src/main/res/values-hi/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-hi/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-hr/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-hr/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-hu/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-hu/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-hy/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-hy/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-ind/03-dialogs.xml          | 1 -
 AnkiDroid/src/main/res/values-ind/17-model-manager.xml    | 2 --
 AnkiDroid/src/main/res/values-is/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-is/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-it/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-it/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-iw/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-iw/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-ja/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-ja/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-jv/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-jv/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-ka/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-ka/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-kk/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-kk/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-km/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-km/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-kn/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-kn/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-ko/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-ko/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-ku/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-ku/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-ky/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-ky/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-lt/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-lt/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-lv/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-lv/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-mk/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-mk/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-ml/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-ml/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-mn/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-mn/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-mr/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-mr/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-ms/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-ms/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-my/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-my/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-nl/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-nl/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-nn/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-nn/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-no/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-no/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-or/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-or/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-pa/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-pa/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-pl/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-pl/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-pt-rBR/03-dialogs.xml       | 1 -
 AnkiDroid/src/main/res/values-pt-rBR/17-model-manager.xml | 2 --
 AnkiDroid/src/main/res/values-pt-rPT/03-dialogs.xml       | 1 -
 AnkiDroid/src/main/res/values-pt-rPT/17-model-manager.xml | 2 --
 AnkiDroid/src/main/res/values-ro/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-ro/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-ru/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-ru/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-sat/03-dialogs.xml          | 1 -
 AnkiDroid/src/main/res/values-sat/17-model-manager.xml    | 2 --
 AnkiDroid/src/main/res/values-sc/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-sc/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-sk/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-sk/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-sl/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-sl/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-sq/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-sq/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-sr/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-sr/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-ss/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-ss/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-sv/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-sv/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-sw/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-sw/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-ta/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-ta/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-te/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-te/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-tg/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-tg/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-tgl/03-dialogs.xml          | 1 -
 AnkiDroid/src/main/res/values-tgl/17-model-manager.xml    | 2 --
 AnkiDroid/src/main/res/values-th/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-th/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-ti/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-ti/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-tn/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-tn/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-tr/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-tr/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-ts/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-ts/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-tt/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-tt/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-ug/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-ug/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-uk/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-uk/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-ur/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-ur/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-uz/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-uz/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-ve/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-ve/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-vi/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-vi/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-wo/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-wo/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-xh/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-xh/17-model-manager.xml     | 2 --
 AnkiDroid/src/main/res/values-yue/03-dialogs.xml          | 1 -
 AnkiDroid/src/main/res/values-yue/17-model-manager.xml    | 2 --
 AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml       | 1 -
 AnkiDroid/src/main/res/values-zh-rCN/17-model-manager.xml | 2 --
 AnkiDroid/src/main/res/values-zh-rTW/03-dialogs.xml       | 1 -
 AnkiDroid/src/main/res/values-zh-rTW/17-model-manager.xml | 2 --
 AnkiDroid/src/main/res/values-zu/03-dialogs.xml           | 1 -
 AnkiDroid/src/main/res/values-zu/17-model-manager.xml     | 2 --
 188 files changed, 282 deletions(-)

diff --git a/AnkiDroid/src/main/res/values-af/03-dialogs.xml b/AnkiDroid/src/main/res/values-af/03-dialogs.xml
index 94c6f895fb1c..0c89eb14c259 100644
--- a/AnkiDroid/src/main/res/values-af/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-af/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Verskuldig</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Tans besig om leë kaarte te vind&#8230;</string>
-    <string name="empty_cards_count">Kaarte om uit te vee: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Kon nie mikrofoon toestemming verkry nie.</string>
     <string name="multimedia_editor_failed">Kon nie Multimedia-Redakteur oopmaak nie</string>
diff --git a/AnkiDroid/src/main/res/values-af/17-model-manager.xml b/AnkiDroid/src/main/res/values-af/17-model-manager.xml
index 86e369688099..3e62f4b670d0 100644
--- a/AnkiDroid/src/main/res/values-af/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-af/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Note types must have at least one field</string>
     <string name="toast_empty_name">You must enter a name</string>
     <string name="toast_duplicate_field">Field name already used</string>
-    <string name="toast_out_of_range">You must enter a valid value</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d note type available</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Rename field</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Reposition field</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Updating fields</string>
     <string name="model_field_editor_sort_field">Sort by this field</string>
diff --git a/AnkiDroid/src/main/res/values-am/03-dialogs.xml b/AnkiDroid/src/main/res/values-am/03-dialogs.xml
index 7c0e7747e67b..8fe479b3a949 100644
--- a/AnkiDroid/src/main/res/values-am/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-am/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
-    <string name="empty_cards_count">Cards to delete: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-am/17-model-manager.xml b/AnkiDroid/src/main/res/values-am/17-model-manager.xml
index 2de8c83c458f..a2e49df4809c 100644
--- a/AnkiDroid/src/main/res/values-am/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-am/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Note types must have at least one field</string>
     <string name="toast_empty_name">You must enter a name</string>
     <string name="toast_duplicate_field">Field name already used</string>
-    <string name="toast_out_of_range">You must enter a valid value</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d note type available</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Rename field</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Reposition field</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Updating fields</string>
     <string name="model_field_editor_sort_field">Sort by this field</string>
diff --git a/AnkiDroid/src/main/res/values-ar/03-dialogs.xml b/AnkiDroid/src/main/res/values-ar/03-dialogs.xml
index c5f33d247ba3..a594b212491c 100644
--- a/AnkiDroid/src/main/res/values-ar/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ar/03-dialogs.xml
@@ -145,7 +145,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">مستحق</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">يجري البحث عن بطاقات فارغة&#8230;</string>
-    <string name="empty_cards_count">بطاقات ستُحذَف: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">تعذر الحصول على إذن الميكروفون.</string>
     <string name="multimedia_editor_failed">تعذر فتح محرر الوسائط المتعددة</string>
diff --git a/AnkiDroid/src/main/res/values-ar/17-model-manager.xml b/AnkiDroid/src/main/res/values-ar/17-model-manager.xml
index 92239205a278..9c318846b3c3 100644
--- a/AnkiDroid/src/main/res/values-ar/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ar/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">يجب أن تحتوي أنواع الملحوظات على حقل واحد على الأقل</string>
     <string name="toast_empty_name">عليك إدخال اسم</string>
     <string name="toast_duplicate_field">اسم الحقل مستخدم بالفعل</string>
-    <string name="toast_out_of_range">عليك إدخال قيمة صالحة</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="zero">يتوفر %d نوع ملحوظة</item>
@@ -66,7 +65,6 @@
     <string name="model_field_editor_rename">تغيير اسم الحقل</string>
     <string name="model_field_editor_language_hint">تعيين تلميح لغة لوحة المفاتيح</string>
     <string name="model_field_editor_reposition_menu">تغيير موضع الحقل</string>
-    <string name="model_field_editor_reposition">تغيير موضع الحقل (أدخل قيمة %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">تذكّر المدخلات الأخيرة عند الإضافة</string>
     <string name="model_field_editor_changing">يجري تحديث الحقول</string>
     <string name="model_field_editor_sort_field">فرز حسب هذا الحقل</string>
diff --git a/AnkiDroid/src/main/res/values-az/03-dialogs.xml b/AnkiDroid/src/main/res/values-az/03-dialogs.xml
index c20b3fc66803..b508ed2b4e15 100644
--- a/AnkiDroid/src/main/res/values-az/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-az/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
-    <string name="empty_cards_count">Cards to delete: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-az/17-model-manager.xml b/AnkiDroid/src/main/res/values-az/17-model-manager.xml
index 01292736d0cd..4a80076d0bd6 100644
--- a/AnkiDroid/src/main/res/values-az/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-az/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Qeyd növlərinin ən az bir sahəsi olmalıdır</string>
     <string name="toast_empty_name">Ad daxil etməlisiniz</string>
     <string name="toast_duplicate_field">Sahə adı artıq istifadədədir</string>
-    <string name="toast_out_of_range">Etibarlı bir dəyər daxil etməlisiniz</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d qeyd növü mövcuddur</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Sahəni yenidən adlandır</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Sahənin yerini dəyişdir</string>
-    <string name="model_field_editor_reposition">Sahənin yerini dəyişdir (%1$d–%2$d arası bir dəyər daxil edin)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Sahələr yenilənir</string>
     <string name="model_field_editor_sort_field">Bu sahəyə görə sırala</string>
diff --git a/AnkiDroid/src/main/res/values-be/03-dialogs.xml b/AnkiDroid/src/main/res/values-be/03-dialogs.xml
index 5e8ddeb28c5c..7f4750087280 100644
--- a/AnkiDroid/src/main/res/values-be/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-be/03-dialogs.xml
@@ -137,7 +137,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Да прагляду</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Пошук пустых картак&#8230;</string>
-    <string name="empty_cards_count">Картак да выдалення: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Памылка атрымання дазволу на выкарыстанне мікрафона.</string>
     <string name="multimedia_editor_failed">Памылка адкрыцця рэдактара мультымедыя</string>
diff --git a/AnkiDroid/src/main/res/values-be/17-model-manager.xml b/AnkiDroid/src/main/res/values-be/17-model-manager.xml
index 0e650ef7535f..5a0b4dd2867a 100644
--- a/AnkiDroid/src/main/res/values-be/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-be/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Тыпы нататак павінны ўтрымліваць хоць адно поле</string>
     <string name="toast_empty_name">Вы павінны ўвесці назву поля</string>
     <string name="toast_duplicate_field">Такая назва поля ўжо існуе</string>
-    <string name="toast_out_of_range">Вы павінны ўвесці карэктнае значэнне</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">Даступны %d тып нататкі</item>
@@ -62,7 +61,6 @@
     <string name="model_field_editor_rename">Перайменаваць поле</string>
     <string name="model_field_editor_language_hint">Прызначыць мову падказак клавіятуры</string>
     <string name="model_field_editor_reposition_menu">Перамясціць поле</string>
-    <string name="model_field_editor_reposition">Перамясціць поле (увядзіце значэнне %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Пры дабаўленні памятаць апошні ўвод</string>
     <string name="model_field_editor_changing">Адбываецца абнаўленне палёў</string>
     <string name="model_field_editor_sort_field">Сартаваць па гэтым полі</string>
diff --git a/AnkiDroid/src/main/res/values-bg/03-dialogs.xml b/AnkiDroid/src/main/res/values-bg/03-dialogs.xml
index 8c4dc7a1ece1..3fa24b5245fa 100644
--- a/AnkiDroid/src/main/res/values-bg/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-bg/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Край</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Намиране на празни карти&#8230;</string>
-    <string name="empty_cards_count">Карти за изтриване: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Разрешението за микрофон не е получено.</string>
     <string name="multimedia_editor_failed">Не може да отвори редактор на мультимедия</string>
diff --git a/AnkiDroid/src/main/res/values-bg/17-model-manager.xml b/AnkiDroid/src/main/res/values-bg/17-model-manager.xml
index 9877f5891fd6..55ce8a4507a6 100644
--- a/AnkiDroid/src/main/res/values-bg/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-bg/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Типът на бележката трябва да има поне едно поле</string>
     <string name="toast_empty_name">Трябва да въведете име</string>
     <string name="toast_duplicate_field">Името на полето вече е използвано</string>
-    <string name="toast_out_of_range">Трябва да въведете валидна стойност</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">Наличен е %d тип на бележка</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Преименуване на поле</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Препозициониране на поле</string>
-    <string name="model_field_editor_reposition">Препозициониране на поле (въведете стойност %1$d-%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Актуализиране на полетата</string>
     <string name="model_field_editor_sort_field">Сортиране по това поле</string>
diff --git a/AnkiDroid/src/main/res/values-bn/03-dialogs.xml b/AnkiDroid/src/main/res/values-bn/03-dialogs.xml
index ca37704d27aa..d475805a357c 100644
--- a/AnkiDroid/src/main/res/values-bn/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-bn/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">খালি কার্ড খুঁজছি&#8230;</string>
-    <string name="empty_cards_count">মুছে ফেলার জন্য কার্ড: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">মাইক্রোফোন অনুমতি পাওয়া যায়নি.</string>
     <string name="multimedia_editor_failed">মাল্টিমিডিয়া সম্পাদক খুলতে ব্যর্থ হয়েছে৷</string>
diff --git a/AnkiDroid/src/main/res/values-bn/17-model-manager.xml b/AnkiDroid/src/main/res/values-bn/17-model-manager.xml
index fdb349e6bbfc..875e607ec032 100644
--- a/AnkiDroid/src/main/res/values-bn/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-bn/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">নোট-যেকোনো টাইপের অন্তত একটি ফিল্ড থাকা জরুরি</string>
     <string name="toast_empty_name">আপনাকে একটি নাম লিখতে হবে</string>
     <string name="toast_duplicate_field">ক্ষেত্রের নাম ইতিমধ্যে ব্যবহার করা হয়েছে</string>
-    <string name="toast_out_of_range">আপনাকে অবশ্যই একটি বৈধ মান লিখতে হবে</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d নোটের ধরন উপলব্ধ</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">ক্ষেত্রের নাম পরিবর্তন করুন</string>
     <string name="model_field_editor_language_hint">কীবোর্ড ভাষার ইঙ্গিত সেট করুন</string>
     <string name="model_field_editor_reposition_menu">Reposition field</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">যোগ করার সময় শেষ ইনপুট মনে রাখবেন</string>
     <string name="model_field_editor_changing">ক্ষেত্র আপডেট করা হচ্ছে</string>
     <string name="model_field_editor_sort_field">এই ক্ষেত্র অনুসারে সাজান</string>
diff --git a/AnkiDroid/src/main/res/values-ca/03-dialogs.xml b/AnkiDroid/src/main/res/values-ca/03-dialogs.xml
index 1e9844617bb7..0da65e5d0d17 100644
--- a/AnkiDroid/src/main/res/values-ca/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ca/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Venciment</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Trobar targetes buides&#8230;</string>
-    <string name="empty_cards_count">Targetes per eliminar: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">No s\'ha pogut obtenir permís per usar el micròfon.</string>
     <string name="multimedia_editor_failed">No s\'ha pogut obrir l\'editor multimèdia</string>
diff --git a/AnkiDroid/src/main/res/values-ca/17-model-manager.xml b/AnkiDroid/src/main/res/values-ca/17-model-manager.xml
index e45c2af4655d..e8c1167937be 100644
--- a/AnkiDroid/src/main/res/values-ca/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ca/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Els tipus de notes han de tenir almenys un camp</string>
     <string name="toast_empty_name">Heu d\'introduir un nom</string>
     <string name="toast_duplicate_field">El nom del camp ja existeix</string>
-    <string name="toast_out_of_range">Heu d\'introduir un valor vàlid</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d tipus de notes disponibles</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Canviar el nom del camp</string>
     <string name="model_field_editor_language_hint">Estableix consell d\'idioma del teclat</string>
     <string name="model_field_editor_reposition_menu">Camp de repós</string>
-    <string name="model_field_editor_reposition">Camp de repós (entri un valor %1$d-%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Recordeu la darrera entrada al afegir</string>
     <string name="model_field_editor_changing">Actualitzant els camps</string>
     <string name="model_field_editor_sort_field">Ordena per aquest camp</string>
diff --git a/AnkiDroid/src/main/res/values-ckb/03-dialogs.xml b/AnkiDroid/src/main/res/values-ckb/03-dialogs.xml
index 4281f96fab60..a607b061a8a5 100644
--- a/AnkiDroid/src/main/res/values-ckb/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ckb/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
-    <string name="empty_cards_count">Cards to delete: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-ckb/17-model-manager.xml b/AnkiDroid/src/main/res/values-ckb/17-model-manager.xml
index 3637310130d9..6b89a122d404 100644
--- a/AnkiDroid/src/main/res/values-ckb/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ckb/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Note types must have at least one field</string>
     <string name="toast_empty_name">You must enter a name</string>
     <string name="toast_duplicate_field">Field name already used</string>
-    <string name="toast_out_of_range">You must enter a valid value</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d note type available</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Rename field</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Reposition field</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Updating fields</string>
     <string name="model_field_editor_sort_field">Sort by this field</string>
diff --git a/AnkiDroid/src/main/res/values-cs/03-dialogs.xml b/AnkiDroid/src/main/res/values-cs/03-dialogs.xml
index 0665f4635ea9..c37af94ea62f 100644
--- a/AnkiDroid/src/main/res/values-cs/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-cs/03-dialogs.xml
@@ -137,7 +137,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Ke zkoušení</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Hledají se prázdné karty&#8230;</string>
-    <string name="empty_cards_count">Karet k odstranění: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Nelze získat oprávnění k mikrofonu.</string>
     <string name="multimedia_editor_failed">Nepodařilo se otevřít multimediální editor</string>
diff --git a/AnkiDroid/src/main/res/values-cs/17-model-manager.xml b/AnkiDroid/src/main/res/values-cs/17-model-manager.xml
index 889e1f39653d..31baf6d625f4 100644
--- a/AnkiDroid/src/main/res/values-cs/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-cs/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Typ poznámky musí mít alespoň jedno pole</string>
     <string name="toast_empty_name">Musíte zadat název</string>
     <string name="toast_duplicate_field">Název pole je již použit</string>
-    <string name="toast_out_of_range">Musíte zadat platnou hodnotu</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">dostupný %d typ poznámky</item>
@@ -62,7 +61,6 @@
     <string name="model_field_editor_rename">Přejmenovat pole</string>
     <string name="model_field_editor_language_hint">Nastavit jazyk nápovědy klávesnice</string>
     <string name="model_field_editor_reposition_menu">Změnit umístění pole</string>
-    <string name="model_field_editor_reposition">Změnit umístění pole (zadejte hodnotu %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Zapamatovat si poslední vstup při přidání</string>
     <string name="model_field_editor_changing">Aktualizace polí</string>
     <string name="model_field_editor_sort_field">Seřadit podle tohoto pole</string>
diff --git a/AnkiDroid/src/main/res/values-da/03-dialogs.xml b/AnkiDroid/src/main/res/values-da/03-dialogs.xml
index ff137be9b1f9..af5b334faf62 100644
--- a/AnkiDroid/src/main/res/values-da/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-da/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finder tomme kort&#8230;</string>
-    <string name="empty_cards_count">Cards to delete: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-da/17-model-manager.xml b/AnkiDroid/src/main/res/values-da/17-model-manager.xml
index 1fd039ee6324..aee4d51cdafd 100644
--- a/AnkiDroid/src/main/res/values-da/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-da/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Note types must have at least one field</string>
     <string name="toast_empty_name">You must enter a name</string>
     <string name="toast_duplicate_field">Field name already used</string>
-    <string name="toast_out_of_range">You must enter a valid value</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d note type available</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Rename field</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Reposition field</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Updating fields</string>
     <string name="model_field_editor_sort_field">Sort by this field</string>
diff --git a/AnkiDroid/src/main/res/values-de/03-dialogs.xml b/AnkiDroid/src/main/res/values-de/03-dialogs.xml
index 6376bc614b72..65212153ec1b 100644
--- a/AnkiDroid/src/main/res/values-de/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-de/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Fällige</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Leere Karten werden gesucht &#8230;</string>
-    <string name="empty_cards_count">%d zu löschende Karten</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Zugriffsberechtigung für das Mikrofon konnte nicht erlangt werden.</string>
     <string name="multimedia_editor_failed">Multimedia-Editor konnte nicht geöffnet werden</string>
diff --git a/AnkiDroid/src/main/res/values-de/17-model-manager.xml b/AnkiDroid/src/main/res/values-de/17-model-manager.xml
index ffb2e5a0fe5a..e20dcbb958e3 100644
--- a/AnkiDroid/src/main/res/values-de/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-de/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Notizypen müssen mindestens ein Feld haben</string>
     <string name="toast_empty_name">Sie müssen einen Namen eingeben</string>
     <string name="toast_duplicate_field">Feldname bereits verwendet</string>
-    <string name="toast_out_of_range">Sie müssen einen gültigen Wert eingeben</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d Notiztyp verfügbar</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Feld umbenennen</string>
     <string name="model_field_editor_language_hint">Hinweis zu Tastatursprache festlegen</string>
     <string name="model_field_editor_reposition_menu">Feld neu positionieren</string>
-    <string name="model_field_editor_reposition">Feld neu positionieren (Wert von %1$d bis %2$d eingeben)</string>
     <string name="model_field_editor_toggle_sticky">Beim Hinzufügen letzte Eingabe merken</string>
     <string name="model_field_editor_changing">Felder werden aktualisiert</string>
     <string name="model_field_editor_sort_field">Nach diesem Feld sortieren</string>
diff --git a/AnkiDroid/src/main/res/values-el/03-dialogs.xml b/AnkiDroid/src/main/res/values-el/03-dialogs.xml
index 5bc3b0ad568d..30113e36d91b 100644
--- a/AnkiDroid/src/main/res/values-el/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-el/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Εύρεση κενών καρτών&#8230;</string>
-    <string name="empty_cards_count">Κάρτες προς διαγραφή: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Δεν ήταν δυνατή η λήψη άδειας μικροφώνου.</string>
     <string name="multimedia_editor_failed">Αποτυχία ανοίγματος του επεξεργαστή πολυμέσων</string>
diff --git a/AnkiDroid/src/main/res/values-el/17-model-manager.xml b/AnkiDroid/src/main/res/values-el/17-model-manager.xml
index 511c519f74b5..8333f9c3f4fa 100644
--- a/AnkiDroid/src/main/res/values-el/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-el/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Οι τύποι σημειώσεων πρέπει να έχουν τουλάχιστον ένα πεδίο</string>
     <string name="toast_empty_name">Πρέπει να εισαγάγετε ένα όνομα</string>
     <string name="toast_duplicate_field">Το όνομα του πεδίου χρησιμοποιείται ήδη</string>
-    <string name="toast_out_of_range">Πρέπει να εισάγετε μια έγκυρη τιμή</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d τύπος σημείωσης διαθέσιμος</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Μετονομασία πεδίου</string>
     <string name="model_field_editor_language_hint">Ορισμός γλώσσας υπόδειξης πληκτρολογίου</string>
     <string name="model_field_editor_reposition_menu">Επανατοποθέτηση πεδίου</string>
-    <string name="model_field_editor_reposition">Επανατοποθέτηση πεδίου (εισάγετε μια τιμή %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Απομνημόνευση τελευταίας καταχώρησης κατά την προσθήκη</string>
     <string name="model_field_editor_changing">Ενημέρωση πεδίων</string>
     <string name="model_field_editor_sort_field">Ταξινόμηση κατά αυτό το πεδίο</string>
diff --git a/AnkiDroid/src/main/res/values-eo/03-dialogs.xml b/AnkiDroid/src/main/res/values-eo/03-dialogs.xml
index 3d618662021a..974ed4590815 100644
--- a/AnkiDroid/src/main/res/values-eo/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-eo/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Lernendaj</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Serĉado de malplenaj kartoj&#8230;</string>
-    <string name="empty_cards_count">Kartoj por forigi: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Ne povis akiri permeson al la mikrofono.</string>
     <string name="multimedia_editor_failed">Fiaskis malfermi redaktilon de plurmedioj</string>
diff --git a/AnkiDroid/src/main/res/values-eo/17-model-manager.xml b/AnkiDroid/src/main/res/values-eo/17-model-manager.xml
index e955ce79a083..f5d563702c27 100644
--- a/AnkiDroid/src/main/res/values-eo/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-eo/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Nototipoj devas havi almenaŭ unu kampon</string>
     <string name="toast_empty_name">Vi devas enigi nomon</string>
     <string name="toast_duplicate_field">Kamponomo estas jam uzata</string>
-    <string name="toast_out_of_range">Vi devas enigi validan valoron</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d nototipo estas havebla</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Alinomi kampon</string>
     <string name="model_field_editor_language_hint">Agordi lingvon de klavaraj sugestoj</string>
     <string name="model_field_editor_reposition_menu">Repozicii kampon</string>
-    <string name="model_field_editor_reposition">Repozicii kampon (enigi valoron de %1$d ĝis %2$d)</string>
     <string name="model_field_editor_toggle_sticky">Memori la antaŭan enigon je aldoni</string>
     <string name="model_field_editor_changing">Ĝisdatigado de kampoj</string>
     <string name="model_field_editor_sort_field">Ordigi laŭ tiu kampo</string>
diff --git a/AnkiDroid/src/main/res/values-es-rAR/03-dialogs.xml b/AnkiDroid/src/main/res/values-es-rAR/03-dialogs.xml
index 74596afc84a7..9c9663ecc9e6 100644
--- a/AnkiDroid/src/main/res/values-es-rAR/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-es-rAR/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Programadas</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Buscando tarjetas vacías&#8230;</string>
-    <string name="empty_cards_count">Tarjetas a eliminar: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">No se pudo obtener el permiso del micrófono.</string>
     <string name="multimedia_editor_failed">Error al abrir el Editor Multimedia</string>
diff --git a/AnkiDroid/src/main/res/values-es-rAR/17-model-manager.xml b/AnkiDroid/src/main/res/values-es-rAR/17-model-manager.xml
index be656ce967ed..f11343bf38f4 100644
--- a/AnkiDroid/src/main/res/values-es-rAR/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-es-rAR/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Los tipos de nota deben tener por lo menos un campo</string>
     <string name="toast_empty_name">Hay que introducir un nombre</string>
     <string name="toast_duplicate_field">Nombre de campo ya utilizado</string>
-    <string name="toast_out_of_range">Hay que introducir un valor válido</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d tipo de nota disponible</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Renombrar campo</string>
     <string name="model_field_editor_language_hint">Establecer pista de idioma del teclado</string>
     <string name="model_field_editor_reposition_menu">Campo de reposicionamiento</string>
-    <string name="model_field_editor_reposition">Campo de reposicionamiento (ingresar un valor %1$d-%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Recordar la última entrada al agregar</string>
     <string name="model_field_editor_changing">Actualizando campos</string>
     <string name="model_field_editor_sort_field">Ordenar por este campo</string>
diff --git a/AnkiDroid/src/main/res/values-es-rES/03-dialogs.xml b/AnkiDroid/src/main/res/values-es-rES/03-dialogs.xml
index bdb3d88b7b62..5bc86185aa1a 100644
--- a/AnkiDroid/src/main/res/values-es-rES/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-es-rES/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Pendientes</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Buscando tarjetas vacías&#8230;</string>
-    <string name="empty_cards_count">Tarjetas a eliminar: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">No se pudo obtener el permiso del micrófono.</string>
     <string name="multimedia_editor_failed">Error al abrir el Editor Multimedia</string>
diff --git a/AnkiDroid/src/main/res/values-es-rES/17-model-manager.xml b/AnkiDroid/src/main/res/values-es-rES/17-model-manager.xml
index 2a1794b85b9c..c256f16673c1 100644
--- a/AnkiDroid/src/main/res/values-es-rES/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-es-rES/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Los tipos de nota deben tener por lo menos un campo</string>
     <string name="toast_empty_name">Hay que introducir un nombre</string>
     <string name="toast_duplicate_field">Nombre de campo ya utilizado</string>
-    <string name="toast_out_of_range">Hay que introducir un valor válido</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d tipo de nota disponible</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Renombrar campo</string>
     <string name="model_field_editor_language_hint">Establecer pista de idioma del teclado</string>
     <string name="model_field_editor_reposition_menu">Campo de reposición</string>
-    <string name="model_field_editor_reposition">Campo de reposición (introducir un valor %1$d-%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Recordar la última entrada al agregar</string>
     <string name="model_field_editor_changing">Actualizando campos</string>
     <string name="model_field_editor_sort_field">Ordenar por este campo</string>
diff --git a/AnkiDroid/src/main/res/values-et/03-dialogs.xml b/AnkiDroid/src/main/res/values-et/03-dialogs.xml
index 7bd6bd5c59e1..b28e12978c2d 100644
--- a/AnkiDroid/src/main/res/values-et/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-et/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Tähtaeg</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
-    <string name="empty_cards_count">Cards to delete: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-et/17-model-manager.xml b/AnkiDroid/src/main/res/values-et/17-model-manager.xml
index 00b2a9a4d81c..50fe144462b5 100644
--- a/AnkiDroid/src/main/res/values-et/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-et/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Note types must have at least one field</string>
     <string name="toast_empty_name">Sa pead sisestama nime</string>
     <string name="toast_duplicate_field">Field name already used</string>
-    <string name="toast_out_of_range">You must enter a valid value</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d note type available</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Nimeta ümber väli</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Reposition field</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Updating fields</string>
     <string name="model_field_editor_sort_field">Sort by this field</string>
diff --git a/AnkiDroid/src/main/res/values-eu/03-dialogs.xml b/AnkiDroid/src/main/res/values-eu/03-dialogs.xml
index 265e9df39d22..4ea0692d45c2 100644
--- a/AnkiDroid/src/main/res/values-eu/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-eu/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Epemuga</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
-    <string name="empty_cards_count">Cards to delete: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-eu/17-model-manager.xml b/AnkiDroid/src/main/res/values-eu/17-model-manager.xml
index 2b6c9a3e623d..786269c01d40 100644
--- a/AnkiDroid/src/main/res/values-eu/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-eu/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Note types must have at least one field</string>
     <string name="toast_empty_name">Izen bat sartu behar duzu</string>
     <string name="toast_duplicate_field">Eremu izena dagoeneko erabilia izan da</string>
-    <string name="toast_out_of_range">Baliodun balio bat sartu behar duzu</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d ohar mota eskuragarri</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Berrizendatu eremua</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Reposition field</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Eremuak eguneratzen</string>
     <string name="model_field_editor_sort_field">Sort by this field</string>
diff --git a/AnkiDroid/src/main/res/values-fa/03-dialogs.xml b/AnkiDroid/src/main/res/values-fa/03-dialogs.xml
index ecb16e09b739..b5bd877d7848 100644
--- a/AnkiDroid/src/main/res/values-fa/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-fa/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">موعد</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">در حال پیدا کردن کارت های خالی&#8230;</string>
-    <string name="empty_cards_count">کارتها برای اینکه حذف شوند: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">دسترسی به میکروفون به آنکی‌دروید داده نشده است.</string>
     <string name="multimedia_editor_failed">باز کردن ویرایشگر رسانه انجام نشد</string>
diff --git a/AnkiDroid/src/main/res/values-fa/17-model-manager.xml b/AnkiDroid/src/main/res/values-fa/17-model-manager.xml
index 2339149e2430..d3c1459c5f76 100644
--- a/AnkiDroid/src/main/res/values-fa/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-fa/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">نوع یادداشت حداقل باید یک فیلد داشته باشد</string>
     <string name="toast_empty_name">باید نام را وارد کنید</string>
     <string name="toast_duplicate_field">نام فیلد قبلا استفاده شده است</string>
-    <string name="toast_out_of_range">شما باید مقدار معتبرى وارد کنید</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d نوع یادداشت دردسترس است</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">تغییر نام فیلد</string>
     <string name="model_field_editor_language_hint">راهنمایی زبان کیبورد را تنظیم کن</string>
     <string name="model_field_editor_reposition_menu">تغییر مکان فیلد</string>
-    <string name="model_field_editor_reposition">مکان فیلد(مقدار %1$d-%2$d را وارد کنید)</string>
     <string name="model_field_editor_toggle_sticky">ذخیرۀ آخرین متن ورودی هنگام افزودن کارت</string>
     <string name="model_field_editor_changing">به روزرسانی فیلدها</string>
     <string name="model_field_editor_sort_field">مرتب کردن بر اساس این فیلد</string>
diff --git a/AnkiDroid/src/main/res/values-fi/03-dialogs.xml b/AnkiDroid/src/main/res/values-fi/03-dialogs.xml
index b1ed56c7dee7..5d8ab414f459 100644
--- a/AnkiDroid/src/main/res/values-fi/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-fi/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Erääntyy</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Etsitään tyhjiä kortteja&#8230;</string>
-    <string name="empty_cards_count">Poistettavat kortit: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Mikrofonin käyttöoikeutta ei myönnetty.</string>
     <string name="multimedia_editor_failed">Multimediaeditorin avaaminen ei onnistunut</string>
diff --git a/AnkiDroid/src/main/res/values-fi/17-model-manager.xml b/AnkiDroid/src/main/res/values-fi/17-model-manager.xml
index 09ef4d6fd49a..a27752aa9775 100644
--- a/AnkiDroid/src/main/res/values-fi/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-fi/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Malleissa on oltava vähintään yksi kenttä</string>
     <string name="toast_empty_name">Sinun tulee syöttää nimi</string>
     <string name="toast_duplicate_field">Kentän nimi on jo käytössä</string>
-    <string name="toast_out_of_range">Anna kelvollinen arvo</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d malli saatavilla</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Uudelleennimeä kenttä</string>
     <string name="model_field_editor_language_hint">Aseta näppäimistön kielen vihje</string>
     <string name="model_field_editor_reposition_menu">Uudelleensijoita kenttä</string>
-    <string name="model_field_editor_reposition">Uudelleensijoita kenttä (syötä arvo %1$d-%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Muista aiempi syöte lisättäessä</string>
     <string name="model_field_editor_changing">Päivitetään kenttiä</string>
     <string name="model_field_editor_sort_field">Järjestä tämän kentän mukaan</string>
diff --git a/AnkiDroid/src/main/res/values-fil/03-dialogs.xml b/AnkiDroid/src/main/res/values-fil/03-dialogs.xml
index 208b537644c3..ff6e1b109920 100644
--- a/AnkiDroid/src/main/res/values-fil/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-fil/03-dialogs.xml
@@ -130,7 +130,6 @@ Mga file na may di-wastong pag-encode:%d</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Nakatakda</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Paghahanap ng mga walang laman na kard&#8230;</string>
-    <string name="empty_cards_count">Mga kard na tatanggalin:%d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Nabigong makakuha ng permiso na gamitin ang mikropono.</string>
     <string name="multimedia_editor_failed">Bigong buksan ang Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-fil/17-model-manager.xml b/AnkiDroid/src/main/res/values-fil/17-model-manager.xml
index de417b5843ce..5de94739c64e 100644
--- a/AnkiDroid/src/main/res/values-fil/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-fil/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Ang mga uri ng tala ay dapat magkaroon ng hindi bababa sa isang larangan</string>
     <string name="toast_empty_name">Dapat kang magpasok ng pangalan</string>
     <string name="toast_duplicate_field">Ginamit na ang pangalan ng patlang</string>
-    <string name="toast_out_of_range">Dapat kang magpasok ng wastong halaga</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d uri ng tala na magagamit</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Palitan ang pangalan ng patlang</string>
     <string name="model_field_editor_language_hint">I-set ang hint ng wika ng keyboard</string>
     <string name="model_field_editor_reposition_menu">Reposition field</string>
-    <string name="model_field_editor_reposition">Reposition field (magpasok ng halaga%1$d-%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Tandaan ang huling input tuwing nagdaragdag</string>
     <string name="model_field_editor_changing">Ina-update ang mga patlang</string>
     <string name="model_field_editor_sort_field">Ayusin ayon sa patlang na ito</string>
diff --git a/AnkiDroid/src/main/res/values-fr/03-dialogs.xml b/AnkiDroid/src/main/res/values-fr/03-dialogs.xml
index 645a90564d0d..67f2154f5926 100644
--- a/AnkiDroid/src/main/res/values-fr/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-fr/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">À faire</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Recherche de cartes vides en cours&#8230;</string>
-    <string name="empty_cards_count">Cartes à supprimer : %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Impossible d\'obtenir l\'autorisation du micro.</string>
     <string name="multimedia_editor_failed">Impossible d’ouvrir l’éditeur multimédia</string>
diff --git a/AnkiDroid/src/main/res/values-fr/17-model-manager.xml b/AnkiDroid/src/main/res/values-fr/17-model-manager.xml
index 642801af87ad..c5f01e7cb2d8 100644
--- a/AnkiDroid/src/main/res/values-fr/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-fr/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Les types de note doivent avoir au moins un champ</string>
     <string name="toast_empty_name">Vous devez entrer un nom</string>
     <string name="toast_duplicate_field">Le nom du champ est déjà utilisé</string>
-    <string name="toast_out_of_range">Vous devez entrer une valeur valide</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d type de note disponible</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Renommer le champ</string>
     <string name="model_field_editor_language_hint">Définir la suggestion de langue du clavier</string>
     <string name="model_field_editor_reposition_menu">Repositionner le champ</string>
-    <string name="model_field_editor_reposition">Repositionner le champ (entrez une valeur %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Se souvenir de la dernière entrée lors de l\'ajout</string>
     <string name="model_field_editor_changing">Mise à jour des champs</string>
     <string name="model_field_editor_sort_field">Trier par ce champ</string>
diff --git a/AnkiDroid/src/main/res/values-fy/03-dialogs.xml b/AnkiDroid/src/main/res/values-fy/03-dialogs.xml
index e9fd422603d8..5852ca3049a5 100644
--- a/AnkiDroid/src/main/res/values-fy/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-fy/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
-    <string name="empty_cards_count">Cards to delete: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-fy/17-model-manager.xml b/AnkiDroid/src/main/res/values-fy/17-model-manager.xml
index 3637310130d9..6b89a122d404 100644
--- a/AnkiDroid/src/main/res/values-fy/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-fy/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Note types must have at least one field</string>
     <string name="toast_empty_name">You must enter a name</string>
     <string name="toast_duplicate_field">Field name already used</string>
-    <string name="toast_out_of_range">You must enter a valid value</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d note type available</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Rename field</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Reposition field</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Updating fields</string>
     <string name="model_field_editor_sort_field">Sort by this field</string>
diff --git a/AnkiDroid/src/main/res/values-ga/03-dialogs.xml b/AnkiDroid/src/main/res/values-ga/03-dialogs.xml
index bba78de7c834..058ac7a0ed20 100644
--- a/AnkiDroid/src/main/res/values-ga/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ga/03-dialogs.xml
@@ -141,7 +141,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
-    <string name="empty_cards_count">Cards to delete: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-ga/17-model-manager.xml b/AnkiDroid/src/main/res/values-ga/17-model-manager.xml
index 946be5c04cdf..07ad00e41c0a 100644
--- a/AnkiDroid/src/main/res/values-ga/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ga/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Note types must have at least one field</string>
     <string name="toast_empty_name">You must enter a name</string>
     <string name="toast_duplicate_field">Field name already used</string>
-    <string name="toast_out_of_range">You must enter a valid value</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d note type available</item>
@@ -64,7 +63,6 @@
     <string name="model_field_editor_rename">Rename field</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Reposition field</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Updating fields</string>
     <string name="model_field_editor_sort_field">Sort by this field</string>
diff --git a/AnkiDroid/src/main/res/values-gl/03-dialogs.xml b/AnkiDroid/src/main/res/values-gl/03-dialogs.xml
index 1911b5f4d406..6ea85f0bef8d 100644
--- a/AnkiDroid/src/main/res/values-gl/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-gl/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Pendentes</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Buscando cartóns baleiros&#8230;</string>
-    <string name="empty_cards_count">Cartóns a eliminar: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-gl/17-model-manager.xml b/AnkiDroid/src/main/res/values-gl/17-model-manager.xml
index 1dc1aa6b1f2d..ecb1b289a3b5 100644
--- a/AnkiDroid/src/main/res/values-gl/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-gl/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Os tipos de notas deben ter polo menos un campo</string>
     <string name="toast_empty_name">Tes de inserir un nome</string>
     <string name="toast_duplicate_field">O nome do campo xa está en uso</string>
-    <string name="toast_out_of_range">Tes de inserir un valor válido</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d tipo de nota dispoñible</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Renomear o campo</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Campo de reposición</string>
-    <string name="model_field_editor_reposition">Campo de reposición (insire un valor entre %1$d-%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Actualizando campos</string>
     <string name="model_field_editor_sort_field">Ordenar por este campo</string>
diff --git a/AnkiDroid/src/main/res/values-got/03-dialogs.xml b/AnkiDroid/src/main/res/values-got/03-dialogs.xml
index 365e2e12e80e..2d97a595cb90 100644
--- a/AnkiDroid/src/main/res/values-got/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-got/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
-    <string name="empty_cards_count">Cards to delete: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-got/17-model-manager.xml b/AnkiDroid/src/main/res/values-got/17-model-manager.xml
index 3637310130d9..6b89a122d404 100644
--- a/AnkiDroid/src/main/res/values-got/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-got/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Note types must have at least one field</string>
     <string name="toast_empty_name">You must enter a name</string>
     <string name="toast_duplicate_field">Field name already used</string>
-    <string name="toast_out_of_range">You must enter a valid value</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d note type available</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Rename field</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Reposition field</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Updating fields</string>
     <string name="model_field_editor_sort_field">Sort by this field</string>
diff --git a/AnkiDroid/src/main/res/values-gu/03-dialogs.xml b/AnkiDroid/src/main/res/values-gu/03-dialogs.xml
index 7a9a8e56baae..8edc3602bf1e 100644
--- a/AnkiDroid/src/main/res/values-gu/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-gu/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">બાકી</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">ખાલી કાર્ડ શોધી રહ્યાં છીએ&#8230;</string>
-    <string name="empty_cards_count">કાઢી નાખવાના કાર્ડ્સ: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">માઇક્રોફોનની પરવાનગી મેળવી શકાઈ નથી.</string>
     <string name="multimedia_editor_failed">મલ્ટીમીડિયા એડિટર ખોલવામાં નિષ્ફળ</string>
diff --git a/AnkiDroid/src/main/res/values-gu/17-model-manager.xml b/AnkiDroid/src/main/res/values-gu/17-model-manager.xml
index fc31b74a5dbf..487d308dbc96 100644
--- a/AnkiDroid/src/main/res/values-gu/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-gu/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">નોંધના પ્રકારોમાં ઓછામાં ઓછું એક ફીલ્ડ હોવું આવશ્યક છે</string>
     <string name="toast_empty_name">તમારે નામ દાખલ કરવું આવશ્યક છે</string>
     <string name="toast_duplicate_field">ક્ષેત્રનું નામ પહેલેથી વપરાયેલ છે</string>
-    <string name="toast_out_of_range">તમારે માન્ય મૂલ્ય દાખલ કરવું આવશ્યક છે</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d નોંધ પ્રકાર ઉપલબ્ધ છે</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">ક્ષેત્રનું નામ બદલો</string>
     <string name="model_field_editor_language_hint">કીબોર્ડ ભાષા સંકેત સેટ કરો</string>
     <string name="model_field_editor_reposition_menu">રિપોઝિશન ફીલ્ડ</string>
-    <string name="model_field_editor_reposition">રિપોઝિશન ફીલ્ડ (મૂલ્ય %1$d–%2$d દાખલ કરો)</string>
     <string name="model_field_editor_toggle_sticky">ઉમેરતી વખતે છેલ્લું ઇનપુટ યાદ રાખો</string>
     <string name="model_field_editor_changing">ફીલ્ડ અપડેટ કરી રહ્યું છે</string>
     <string name="model_field_editor_sort_field">આ ક્ષેત્ર દ્વારા સૉર્ટ કરો</string>
diff --git a/AnkiDroid/src/main/res/values-heb/03-dialogs.xml b/AnkiDroid/src/main/res/values-heb/03-dialogs.xml
index b24afc189478..85c3c1f44e95 100644
--- a/AnkiDroid/src/main/res/values-heb/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-heb/03-dialogs.xml
@@ -138,7 +138,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">מיועד</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">מתבצע איתור כרטיסים ריקים&#8230;</string>
-    <string name="empty_cards_count">כרטיסים למחיקה: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">לא מצליח לקבל הרשאת מיקרופון </string>
     <string name="multimedia_editor_failed">נכשל בפתיחת עורך מדיה.</string>
diff --git a/AnkiDroid/src/main/res/values-heb/17-model-manager.xml b/AnkiDroid/src/main/res/values-heb/17-model-manager.xml
index cb98c01ea704..19458f765e99 100644
--- a/AnkiDroid/src/main/res/values-heb/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-heb/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">סוגי פתקים צריכים לפחות תחום אחד</string>
     <string name="toast_empty_name">עליך להזין שם</string>
     <string name="toast_duplicate_field">שם זה כבר נמצא בשימוש על ידי שדה אחר</string>
-    <string name="toast_out_of_range">עליך להקליד ערך תקף</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%dסוג הערה זמין</item>
@@ -62,7 +61,6 @@
     <string name="model_field_editor_rename">שינוי שם שדה</string>
     <string name="model_field_editor_language_hint">הגדר שפת המקלדת לרמז</string>
     <string name="model_field_editor_reposition_menu">שינוי מיקום שדה</string>
-    <string name="model_field_editor_reposition">שינוי מיקום שדה (נא להקליד ערך %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">זכור קלט אחרון בעת ​​הוספה</string>
     <string name="model_field_editor_changing">השדות מעודכנים</string>
     <string name="model_field_editor_sort_field">מיין לפי שדה</string>
diff --git a/AnkiDroid/src/main/res/values-hi/03-dialogs.xml b/AnkiDroid/src/main/res/values-hi/03-dialogs.xml
index 16d79c09dbda..d3cf0d918833 100644
--- a/AnkiDroid/src/main/res/values-hi/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-hi/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">बाकी</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">रिक्त कार्ड ढूंढ रहा है.. ।</string>
-    <string name="empty_cards_count">कार्ड हटाने के लिए: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">माइक्रोफ़ोन अनुमति प्राप्त नहीं कर सका।</string>
     <string name="multimedia_editor_failed">मल्टीमीडिया संपादक खोलने में विफल</string>
diff --git a/AnkiDroid/src/main/res/values-hi/17-model-manager.xml b/AnkiDroid/src/main/res/values-hi/17-model-manager.xml
index be6037e3798e..9f01712ab164 100644
--- a/AnkiDroid/src/main/res/values-hi/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-hi/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">नोट प्रकार में कम से कम एक फ़ील्ड होना चाहिए।</string>
     <string name="toast_empty_name">आपको एक नाम दर्ज करना होगा</string>
     <string name="toast_duplicate_field">फ़ील्ड का नाम पहले से उपयोग में है</string>
-    <string name="toast_out_of_range">आपको एक मान्य मूल्य दर्ज करना होगा</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d नोट प्रकार उपलब्ध</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">फ़ील्ड का नाम बदलें</string>
     <string name="model_field_editor_language_hint">कीबोर्ड भाषा संकेत सेट करें</string>
     <string name="model_field_editor_reposition_menu">फ़ील्ड का स्थान बदलें</string>
-    <string name="model_field_editor_reposition">फ़ील्ड का स्थान बदलें (%1$d-%2$d के बीच का मूल्य दर्ज करें)</string>
     <string name="model_field_editor_toggle_sticky">जोड़ते समय अंतिम इनपुट याद रखें</string>
     <string name="model_field_editor_changing">फ़ील्ड अद्यतित हो रहे हैं</string>
     <string name="model_field_editor_sort_field">इस फ़ील्ड के अनुसार क्रम में रखें</string>
diff --git a/AnkiDroid/src/main/res/values-hr/03-dialogs.xml b/AnkiDroid/src/main/res/values-hr/03-dialogs.xml
index 999a58f56e02..f6ba86ffc842 100644
--- a/AnkiDroid/src/main/res/values-hr/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-hr/03-dialogs.xml
@@ -133,7 +133,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
-    <string name="empty_cards_count">Cards to delete: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-hr/17-model-manager.xml b/AnkiDroid/src/main/res/values-hr/17-model-manager.xml
index 4f16a0f51459..ed29308a2f68 100644
--- a/AnkiDroid/src/main/res/values-hr/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-hr/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Vrste bilješki moraju imati barem jedno polje</string>
     <string name="toast_empty_name">Morate navesti naziv</string>
     <string name="toast_duplicate_field">Naziv polja već se koristi</string>
-    <string name="toast_out_of_range">Morate unijeti valjanu vrijednost</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d vrsta bilješki dostupna</item>
@@ -60,7 +59,6 @@
     <string name="model_field_editor_rename">Preimenuj polje</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Premjesti polje</string>
-    <string name="model_field_editor_reposition">Premjesti polje (unesite vrijednost %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Ažuriranje polja</string>
     <string name="model_field_editor_sort_field">Sortiraj po ovom polju</string>
diff --git a/AnkiDroid/src/main/res/values-hu/03-dialogs.xml b/AnkiDroid/src/main/res/values-hu/03-dialogs.xml
index 01137ba75edf..52bdd125a683 100644
--- a/AnkiDroid/src/main/res/values-hu/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-hu/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Esedékes</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Üres kártyák keresése&#8230;</string>
-    <string name="empty_cards_count">%d darab törlendő kártya</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Nem sikerült mikrofon engedélyt szerezni. </string>
     <string name="multimedia_editor_failed">A Multimédia Szerkesztő megnyitása sikertelen</string>
diff --git a/AnkiDroid/src/main/res/values-hu/17-model-manager.xml b/AnkiDroid/src/main/res/values-hu/17-model-manager.xml
index 35b4c29ddc3b..395cb2e0c203 100644
--- a/AnkiDroid/src/main/res/values-hu/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-hu/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">A jegyzetfajtáknak legalább egy mezőt kell tartalmazniuk</string>
     <string name="toast_empty_name">Meg kell adnod egy nevet</string>
     <string name="toast_duplicate_field">Már használt mezőnév</string>
-    <string name="toast_out_of_range">Meg kell adnod egy érvényes értéket</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d féle jegyzettípus</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Mező átnevezése</string>
     <string name="model_field_editor_language_hint">Billentyűzet nyelvi javaslat beállítás</string>
     <string name="model_field_editor_reposition_menu">Áthelyezési mező</string>
-    <string name="model_field_editor_reposition">Áthelyezési mező (írj be egy értéket: %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">A beviteli érték megjegyzése hozzáadáskor</string>
     <string name="model_field_editor_changing">Mezők frissítése</string>
     <string name="model_field_editor_sort_field">Aktuális mező szerinti rendezés</string>
diff --git a/AnkiDroid/src/main/res/values-hy/03-dialogs.xml b/AnkiDroid/src/main/res/values-hy/03-dialogs.xml
index 254bb9a3981c..1f6fd67485e7 100644
--- a/AnkiDroid/src/main/res/values-hy/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-hy/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
-    <string name="empty_cards_count">Cards to delete: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-hy/17-model-manager.xml b/AnkiDroid/src/main/res/values-hy/17-model-manager.xml
index d1f2855bbed7..a29697f32409 100644
--- a/AnkiDroid/src/main/res/values-hy/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-hy/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Տեսակը պետք է պարունակի գոնե մեկ դաշտ</string>
     <string name="toast_empty_name">Դուք պետք է մուտքագրեք անվանում</string>
     <string name="toast_duplicate_field">Դաշտի անունը արդեն օգտագործվել է</string>
-    <string name="toast_out_of_range">Պետք է մուտքագրել վավեր արժեք</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d տեսակ է հասանելի</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Rename field</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Reposition field</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Updating fields</string>
     <string name="model_field_editor_sort_field">Sort by this field</string>
diff --git a/AnkiDroid/src/main/res/values-ind/03-dialogs.xml b/AnkiDroid/src/main/res/values-ind/03-dialogs.xml
index bedba5e41442..1aa843ac4173 100644
--- a/AnkiDroid/src/main/res/values-ind/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ind/03-dialogs.xml
@@ -125,7 +125,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Jatuh tempo</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Mencari kartu kosong&#8230;</string>
-    <string name="empty_cards_count">Kartu yang akan dihapus: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Tidak mendapat izin mikrofon</string>
     <string name="multimedia_editor_failed">Gagal membuka Editor Multimedia</string>
diff --git a/AnkiDroid/src/main/res/values-ind/17-model-manager.xml b/AnkiDroid/src/main/res/values-ind/17-model-manager.xml
index 76cfca540cc4..a6dc3d24f7bd 100644
--- a/AnkiDroid/src/main/res/values-ind/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ind/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Tipe catatan harus memiliki setidaknya satu kolom</string>
     <string name="toast_empty_name">Kamu harus memasukkan nama</string>
     <string name="toast_duplicate_field">Nama kolom sudah digunakan</string>
-    <string name="toast_out_of_range">Kamu harus memasukkan nilai yang valid</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="other">%d tipe catatan tersedia</item>
@@ -56,7 +55,6 @@
     <string name="model_field_editor_rename">Ubah nama kolom</string>
     <string name="model_field_editor_language_hint">Atur petunjuk bahasa papan tik</string>
     <string name="model_field_editor_reposition_menu">Pindah posisi bidang</string>
-    <string name="model_field_editor_reposition">Pindah posisi bidang (masukkan nilai %1$d-%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Ingat masukan terakhir saat menambahkan</string>
     <string name="model_field_editor_changing">Memperbarui kolom</string>
     <string name="model_field_editor_sort_field">Urutkan menurut kolom ini</string>
diff --git a/AnkiDroid/src/main/res/values-is/03-dialogs.xml b/AnkiDroid/src/main/res/values-is/03-dialogs.xml
index 2716e35a5122..83030dbf6531 100644
--- a/AnkiDroid/src/main/res/values-is/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-is/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
-    <string name="empty_cards_count">Cards to delete: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-is/17-model-manager.xml b/AnkiDroid/src/main/res/values-is/17-model-manager.xml
index 3637310130d9..6b89a122d404 100644
--- a/AnkiDroid/src/main/res/values-is/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-is/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Note types must have at least one field</string>
     <string name="toast_empty_name">You must enter a name</string>
     <string name="toast_duplicate_field">Field name already used</string>
-    <string name="toast_out_of_range">You must enter a valid value</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d note type available</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Rename field</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Reposition field</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Updating fields</string>
     <string name="model_field_editor_sort_field">Sort by this field</string>
diff --git a/AnkiDroid/src/main/res/values-it/03-dialogs.xml b/AnkiDroid/src/main/res/values-it/03-dialogs.xml
index 227fe11db49a..c7f26154d25c 100644
--- a/AnkiDroid/src/main/res/values-it/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-it/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Ripasso</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Cerco carte vuote&#8230;</string>
-    <string name="empty_cards_count">Carte de eliminare: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Impossibile ottenere il permesso del microfono.</string>
     <string name="multimedia_editor_failed">Apertura dell\'editore multimediale fallita</string>
diff --git a/AnkiDroid/src/main/res/values-it/17-model-manager.xml b/AnkiDroid/src/main/res/values-it/17-model-manager.xml
index aba7dd4fda59..16e5d8076b74 100644
--- a/AnkiDroid/src/main/res/values-it/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-it/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">I tipi di nota devono avere almeno un campo</string>
     <string name="toast_empty_name">Devi inserire un nome</string>
     <string name="toast_duplicate_field">Nome di campo già utilizzato</string>
-    <string name="toast_out_of_range">Devi immettere un valore valido</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d tipo di nota disponibile</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Rinomina il campo</string>
     <string name="model_field_editor_language_hint">Imposta suggerimento lingua tastiera</string>
     <string name="model_field_editor_reposition_menu">Riposiziona il campo</string>
-    <string name="model_field_editor_reposition">Riposiziona il campo (immetti un valore %1$d –%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Ricorda l\'ultimo input quando si aggiunge</string>
     <string name="model_field_editor_changing">Aggiornamento dei campi</string>
     <string name="model_field_editor_sort_field">Ordina per questo campo</string>
diff --git a/AnkiDroid/src/main/res/values-iw/03-dialogs.xml b/AnkiDroid/src/main/res/values-iw/03-dialogs.xml
index b24afc189478..85c3c1f44e95 100644
--- a/AnkiDroid/src/main/res/values-iw/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-iw/03-dialogs.xml
@@ -138,7 +138,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">מיועד</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">מתבצע איתור כרטיסים ריקים&#8230;</string>
-    <string name="empty_cards_count">כרטיסים למחיקה: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">לא מצליח לקבל הרשאת מיקרופון </string>
     <string name="multimedia_editor_failed">נכשל בפתיחת עורך מדיה.</string>
diff --git a/AnkiDroid/src/main/res/values-iw/17-model-manager.xml b/AnkiDroid/src/main/res/values-iw/17-model-manager.xml
index cb98c01ea704..19458f765e99 100644
--- a/AnkiDroid/src/main/res/values-iw/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-iw/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">סוגי פתקים צריכים לפחות תחום אחד</string>
     <string name="toast_empty_name">עליך להזין שם</string>
     <string name="toast_duplicate_field">שם זה כבר נמצא בשימוש על ידי שדה אחר</string>
-    <string name="toast_out_of_range">עליך להקליד ערך תקף</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%dסוג הערה זמין</item>
@@ -62,7 +61,6 @@
     <string name="model_field_editor_rename">שינוי שם שדה</string>
     <string name="model_field_editor_language_hint">הגדר שפת המקלדת לרמז</string>
     <string name="model_field_editor_reposition_menu">שינוי מיקום שדה</string>
-    <string name="model_field_editor_reposition">שינוי מיקום שדה (נא להקליד ערך %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">זכור קלט אחרון בעת ​​הוספה</string>
     <string name="model_field_editor_changing">השדות מעודכנים</string>
     <string name="model_field_editor_sort_field">מיין לפי שדה</string>
diff --git a/AnkiDroid/src/main/res/values-ja/03-dialogs.xml b/AnkiDroid/src/main/res/values-ja/03-dialogs.xml
index 94a3a930fad1..c94947a9b15c 100644
--- a/AnkiDroid/src/main/res/values-ja/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ja/03-dialogs.xml
@@ -125,7 +125,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">期日到来済</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">白紙カード（表側に何も表示されないカード）がないか確認しています&#8230;</string>
-    <string name="empty_cards_count">白紙カードが%d枚見つかりました。削除しますか？</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">マイクの権限を取得できませんでした。</string>
     <string name="multimedia_editor_failed">マルチメディアエディタを開けませんでした</string>
diff --git a/AnkiDroid/src/main/res/values-ja/17-model-manager.xml b/AnkiDroid/src/main/res/values-ja/17-model-manager.xml
index e71ab77c4745..e81c69afade7 100644
--- a/AnkiDroid/src/main/res/values-ja/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ja/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">ノートタイプにはフィールドが少なくとも1つ必要です</string>
     <string name="toast_empty_name">名前を入力してください</string>
     <string name="toast_duplicate_field">そのフィールド名はすでに使用されています</string>
-    <string name="toast_out_of_range">無効な値です</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="other">%d種類のノートタイプ</item>
@@ -56,7 +55,6 @@
     <string name="model_field_editor_rename">名前を変更</string>
     <string name="model_field_editor_language_hint">キーボード言語を設定</string>
     <string name="model_field_editor_reposition_menu">配置順序を変更</string>
-    <string name="model_field_editor_reposition">何番目にこのフィールドを配置しますか？ (%1$d～%2$d)</string>
     <string name="model_field_editor_toggle_sticky">ノート連続追加時に直前の入力内容を保持</string>
     <string name="model_field_editor_changing">フィールドを更新</string>
     <string name="model_field_editor_sort_field">ブラウザでのソートフィールド（見出し・並べ替え用項目）に指定</string>
diff --git a/AnkiDroid/src/main/res/values-jv/03-dialogs.xml b/AnkiDroid/src/main/res/values-jv/03-dialogs.xml
index ac47d28e9b57..4161bf4b46ec 100644
--- a/AnkiDroid/src/main/res/values-jv/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-jv/03-dialogs.xml
@@ -125,7 +125,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
-    <string name="empty_cards_count">Cards to delete: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-jv/17-model-manager.xml b/AnkiDroid/src/main/res/values-jv/17-model-manager.xml
index c776f880d5b2..5fa571a5e4a9 100644
--- a/AnkiDroid/src/main/res/values-jv/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-jv/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Note types must have at least one field</string>
     <string name="toast_empty_name">You must enter a name</string>
     <string name="toast_duplicate_field">Field name already used</string>
-    <string name="toast_out_of_range">You must enter a valid value</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="other">%d note types available</item>
@@ -56,7 +55,6 @@
     <string name="model_field_editor_rename">Rename field</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Reposition field</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Updating fields</string>
     <string name="model_field_editor_sort_field">Sort by this field</string>
diff --git a/AnkiDroid/src/main/res/values-ka/03-dialogs.xml b/AnkiDroid/src/main/res/values-ka/03-dialogs.xml
index c3c8221935a7..8c5ad4b13ae5 100644
--- a/AnkiDroid/src/main/res/values-ka/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ka/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">სასწავლო</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">იძებნება ცარიელი ბარათები&#8230;</string>
-    <string name="empty_cards_count">წასაშლელი ბარათი: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">ვერ მოიპოვა მიკროფონზე წვდომის ნებართვა.</string>
     <string name="multimedia_editor_failed">ვერ გაიხსნა მულტიმედია-რედაქტორი</string>
diff --git a/AnkiDroid/src/main/res/values-ka/17-model-manager.xml b/AnkiDroid/src/main/res/values-ka/17-model-manager.xml
index 92492ac21293..370be12e8281 100644
--- a/AnkiDroid/src/main/res/values-ka/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ka/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">შენიშვნის ტიპს უნდა ჰქონდეს ერთი ველი მაინც</string>
     <string name="toast_empty_name">უნდა შეიყვანოთ სახელი</string>
     <string name="toast_duplicate_field">ველის სახელი უკვე გამოყენებულია</string>
-    <string name="toast_out_of_range">გთხოვთ, შეიყვანოთ მოქმედი რიცხვი</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">ხელმისაწვდომია %d შენიშვნის ტიპი</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">ველის სახელის შეცვლა</string>
     <string name="model_field_editor_language_hint">კლავიატურის ენის მინიშნების დაყენება</string>
     <string name="model_field_editor_reposition_menu">ველის გადაადგილება</string>
-    <string name="model_field_editor_reposition">ველის გადაადგილება (შეიყვანეთ რიცხვი %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">დამატებისას ბოლოს შეყვანილის დამახსოვრება</string>
     <string name="model_field_editor_changing">ველების განახლება</string>
     <string name="model_field_editor_sort_field">ამ ველის მიხედვით დახარისხება</string>
diff --git a/AnkiDroid/src/main/res/values-kk/03-dialogs.xml b/AnkiDroid/src/main/res/values-kk/03-dialogs.xml
index d51a69535b7a..314a0ac4587f 100644
--- a/AnkiDroid/src/main/res/values-kk/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-kk/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
-    <string name="empty_cards_count">Cards to delete: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-kk/17-model-manager.xml b/AnkiDroid/src/main/res/values-kk/17-model-manager.xml
index 3637310130d9..6b89a122d404 100644
--- a/AnkiDroid/src/main/res/values-kk/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-kk/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Note types must have at least one field</string>
     <string name="toast_empty_name">You must enter a name</string>
     <string name="toast_duplicate_field">Field name already used</string>
-    <string name="toast_out_of_range">You must enter a valid value</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d note type available</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Rename field</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Reposition field</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Updating fields</string>
     <string name="model_field_editor_sort_field">Sort by this field</string>
diff --git a/AnkiDroid/src/main/res/values-km/03-dialogs.xml b/AnkiDroid/src/main/res/values-km/03-dialogs.xml
index c2ea270dcdd9..8d8bbf691e8e 100644
--- a/AnkiDroid/src/main/res/values-km/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-km/03-dialogs.xml
@@ -125,7 +125,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
-    <string name="empty_cards_count">Cards to delete: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-km/17-model-manager.xml b/AnkiDroid/src/main/res/values-km/17-model-manager.xml
index c776f880d5b2..5fa571a5e4a9 100644
--- a/AnkiDroid/src/main/res/values-km/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-km/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Note types must have at least one field</string>
     <string name="toast_empty_name">You must enter a name</string>
     <string name="toast_duplicate_field">Field name already used</string>
-    <string name="toast_out_of_range">You must enter a valid value</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="other">%d note types available</item>
@@ -56,7 +55,6 @@
     <string name="model_field_editor_rename">Rename field</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Reposition field</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Updating fields</string>
     <string name="model_field_editor_sort_field">Sort by this field</string>
diff --git a/AnkiDroid/src/main/res/values-kn/03-dialogs.xml b/AnkiDroid/src/main/res/values-kn/03-dialogs.xml
index c09bfa8d6370..25dfc5ca2650 100644
--- a/AnkiDroid/src/main/res/values-kn/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-kn/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">ಕಾರಣ</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">ಖಾಲಿ ಕಾರ್ಡ್‌ಗಳಿಗಾಗಿ ಹುಡುಕಲಾಗುತ್ತಿದೆ&#8230;</string>
-    <string name="empty_cards_count">ಅಳಿಸಲು ಕಾರ್ಡ್‌ಗಳು: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">ಮೈಕ್ರೊಫೋನ್ ಅನುಮತಿಯನ್ನು ಪಡೆಯಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ.</string>
     <string name="multimedia_editor_failed">ಮಲ್ಟಿಮೀಡಿಯಾ ಸಂಪಾದಕವನ್ನು ತೆರೆಯಲು ವಿಫಲವಾಗಿದೆ</string>
diff --git a/AnkiDroid/src/main/res/values-kn/17-model-manager.xml b/AnkiDroid/src/main/res/values-kn/17-model-manager.xml
index b5573785d5bf..935c8d668556 100644
--- a/AnkiDroid/src/main/res/values-kn/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-kn/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">ಟಿಪ್ಪಣಿ ಪ್ರಕಾರಗಳು ಕನಿಷ್ಠ ಒಂದು ಕ್ಷೇತ್ರವನ್ನು ಹೊಂದಿರಬೇಕು</string>
     <string name="toast_empty_name">ನೀವು ಹೆಸರನ್ನು ನಮೂದಿಸಬೇಕು</string>
     <string name="toast_duplicate_field">ಕ್ಷೇತ್ರದ ಹೆಸರನ್ನು ಈಗಾಗಲೇ ಬಳಸಲಾಗಿದೆ</string>
-    <string name="toast_out_of_range">ನೀವು ಮಾನ್ಯವಾದ ಮೌಲ್ಯವನ್ನು ನಮೂದಿಸಬೇಕು</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d ಟಿಪ್ಪಣಿ ಪ್ರಕಾರ ಲಭ್ಯವಿದೆ</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">ಕ್ಷೇತ್ರವನ್ನು ಮರುಹೆಸರಿಸಿ</string>
     <string name="model_field_editor_language_hint">ಕೀಬೋರ್ಡ್ ಭಾಷೆಯ ಸುಳಿವನ್ನು ಹೊಂದಿಸಿ</string>
     <string name="model_field_editor_reposition_menu">ಮರುಸ್ಥಾಪನೆ ಕ್ಷೇತ್ರ</string>
-    <string name="model_field_editor_reposition">ಮರುಸ್ಥಾನ ಕ್ಷೇತ್ರ (ಮೌಲ್ಯವನ್ನು ನಮೂದಿಸಿ %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">ಸೇರಿಸುವಾಗ ಕೊನೆಯ ಇನ್‌ಪುಟ್ ಅನ್ನು ನೆನಪಿಡಿ</string>
     <string name="model_field_editor_changing">ಕ್ಷೇತ್ರಗಳನ್ನು ನವೀಕರಿಸಲಾಗುತ್ತಿದೆ</string>
     <string name="model_field_editor_sort_field">ಈ ಕ್ಷೇತ್ರದಿಂದ ವಿಂಗಡಿಸಿ</string>
diff --git a/AnkiDroid/src/main/res/values-ko/03-dialogs.xml b/AnkiDroid/src/main/res/values-ko/03-dialogs.xml
index d2e057739ac0..bd49f3de78c4 100644
--- a/AnkiDroid/src/main/res/values-ko/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ko/03-dialogs.xml
@@ -125,7 +125,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">예정</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">빈 카드를 찾는 중&#8230;</string>
-    <string name="empty_cards_count">삭제할 카드: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">마이크 사용 권한을 얻을 수 없습니다.</string>
     <string name="multimedia_editor_failed">멀티미디어 편집기를 열기 실패</string>
diff --git a/AnkiDroid/src/main/res/values-ko/17-model-manager.xml b/AnkiDroid/src/main/res/values-ko/17-model-manager.xml
index 0edc5758e8d5..7782d82cb735 100644
--- a/AnkiDroid/src/main/res/values-ko/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ko/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">노트 유형은 최소한 하나의 필드가 필요합니다.</string>
     <string name="toast_empty_name">이름을 입력하셔야 합니다.</string>
     <string name="toast_duplicate_field">필드 이름이 이미 사용 중 입니다.</string>
-    <string name="toast_out_of_range">올바른 값을 입력해야만 합니다</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="other">%d 노트 유형 사용 가능</item>
@@ -56,7 +55,6 @@
     <string name="model_field_editor_rename">필드 이름 변경</string>
     <string name="model_field_editor_language_hint">키보드 언어 힌트 설정</string>
     <string name="model_field_editor_reposition_menu">필드 재배치</string>
-    <string name="model_field_editor_reposition">필드 재배치 (%1$d–%2$d 값을 입력하세요)</string>
     <string name="model_field_editor_toggle_sticky">추가할 때 마지막 입력을 기억하기</string>
     <string name="model_field_editor_changing">필드 업데이트 중</string>
     <string name="model_field_editor_sort_field">이 필드로 정렬</string>
diff --git a/AnkiDroid/src/main/res/values-ku/03-dialogs.xml b/AnkiDroid/src/main/res/values-ku/03-dialogs.xml
index 4281f96fab60..a607b061a8a5 100644
--- a/AnkiDroid/src/main/res/values-ku/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ku/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
-    <string name="empty_cards_count">Cards to delete: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-ku/17-model-manager.xml b/AnkiDroid/src/main/res/values-ku/17-model-manager.xml
index 3637310130d9..6b89a122d404 100644
--- a/AnkiDroid/src/main/res/values-ku/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ku/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Note types must have at least one field</string>
     <string name="toast_empty_name">You must enter a name</string>
     <string name="toast_duplicate_field">Field name already used</string>
-    <string name="toast_out_of_range">You must enter a valid value</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d note type available</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Rename field</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Reposition field</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Updating fields</string>
     <string name="model_field_editor_sort_field">Sort by this field</string>
diff --git a/AnkiDroid/src/main/res/values-ky/03-dialogs.xml b/AnkiDroid/src/main/res/values-ky/03-dialogs.xml
index 717ac612a528..a8566f1fa26f 100644
--- a/AnkiDroid/src/main/res/values-ky/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ky/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
-    <string name="empty_cards_count">Cards to delete: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-ky/17-model-manager.xml b/AnkiDroid/src/main/res/values-ky/17-model-manager.xml
index 3637310130d9..6b89a122d404 100644
--- a/AnkiDroid/src/main/res/values-ky/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ky/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Note types must have at least one field</string>
     <string name="toast_empty_name">You must enter a name</string>
     <string name="toast_duplicate_field">Field name already used</string>
-    <string name="toast_out_of_range">You must enter a valid value</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d note type available</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Rename field</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Reposition field</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Updating fields</string>
     <string name="model_field_editor_sort_field">Sort by this field</string>
diff --git a/AnkiDroid/src/main/res/values-lt/03-dialogs.xml b/AnkiDroid/src/main/res/values-lt/03-dialogs.xml
index 7cf228e6d346..49909e94edaa 100644
--- a/AnkiDroid/src/main/res/values-lt/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-lt/03-dialogs.xml
@@ -137,7 +137,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Numatytos</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Ieškomos tuščios kortelės&#8230;</string>
-    <string name="empty_cards_count">Trinti paruoštos kortelės: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-lt/17-model-manager.xml b/AnkiDroid/src/main/res/values-lt/17-model-manager.xml
index 725b45a607ba..3c28a543476a 100644
--- a/AnkiDroid/src/main/res/values-lt/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-lt/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Užrašų tipai privalo turėti bent po vieną laukelį</string>
     <string name="toast_empty_name">Turite įvesti pavadinimą</string>
     <string name="toast_duplicate_field">Toks laukelio vardas jau naudojamas</string>
-    <string name="toast_out_of_range">Turite įvesti galiojančią reikšmę</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">Yra %d užrašo tipas</item>
@@ -62,7 +61,6 @@
     <string name="model_field_editor_rename">Pervardinti laukelį</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Keisti laukelio vietą</string>
-    <string name="model_field_editor_reposition">Keisti laukelio vietą (įveskite reikšmę %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Atnaujinami laukeliai</string>
     <string name="model_field_editor_sort_field">Rūšiuoti pagal šį lauką</string>
diff --git a/AnkiDroid/src/main/res/values-lv/03-dialogs.xml b/AnkiDroid/src/main/res/values-lv/03-dialogs.xml
index aa9f69be8217..3b7e179f851d 100644
--- a/AnkiDroid/src/main/res/values-lv/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-lv/03-dialogs.xml
@@ -133,7 +133,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
-    <string name="empty_cards_count">Cards to delete: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-lv/17-model-manager.xml b/AnkiDroid/src/main/res/values-lv/17-model-manager.xml
index 7208d19d8f70..0d282d0d0d5f 100644
--- a/AnkiDroid/src/main/res/values-lv/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-lv/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Note types must have at least one field</string>
     <string name="toast_empty_name">You must enter a name</string>
     <string name="toast_duplicate_field">Field name already used</string>
-    <string name="toast_out_of_range">You must enter a valid value</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="zero">%d note types available</item>
@@ -60,7 +59,6 @@
     <string name="model_field_editor_rename">Rename field</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Reposition field</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Updating fields</string>
     <string name="model_field_editor_sort_field">Sort by this field</string>
diff --git a/AnkiDroid/src/main/res/values-mk/03-dialogs.xml b/AnkiDroid/src/main/res/values-mk/03-dialogs.xml
index 564e2ad30c83..fe11400f58d9 100644
--- a/AnkiDroid/src/main/res/values-mk/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-mk/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Доспеано</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Наоѓање празни картички&#8230;</string>
-    <string name="empty_cards_count">Картички за бришење: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-mk/17-model-manager.xml b/AnkiDroid/src/main/res/values-mk/17-model-manager.xml
index 69a3dc8f964a..433093302695 100644
--- a/AnkiDroid/src/main/res/values-mk/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-mk/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Типови на белешки мора да имаат најмалку едно поле</string>
     <string name="toast_empty_name">Мора да внесете име</string>
     <string name="toast_duplicate_field">Името на полето веќе се користи</string>
-    <string name="toast_out_of_range">Мора да внесете валидна вредност</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d note type available</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Преименувај го полето</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Поле за поместување</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Ажурирање на полињата</string>
     <string name="model_field_editor_sort_field">Подреди според ова поле</string>
diff --git a/AnkiDroid/src/main/res/values-ml/03-dialogs.xml b/AnkiDroid/src/main/res/values-ml/03-dialogs.xml
index 4bd6310b9274..be36dfb6feb8 100644
--- a/AnkiDroid/src/main/res/values-ml/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ml/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">കാരണം</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">ശൂന്യമായ കാർഡുകൾ കണ്ടെത്തുന്നു&#8230;</string>
-    <string name="empty_cards_count">ഇല്ലാതാക്കാനുള്ള കാർഡുകൾ: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">മൈക്രോഫോൺ അനുമതി നേടാനായില്ല.</string>
     <string name="multimedia_editor_failed">മൾട്ടിമീഡിയ എഡിറ്റർ തുറക്കുന്നതിൽ പരാജയപ്പെട്ടു</string>
diff --git a/AnkiDroid/src/main/res/values-ml/17-model-manager.xml b/AnkiDroid/src/main/res/values-ml/17-model-manager.xml
index e2ede57e1b3d..75dee61b85d3 100644
--- a/AnkiDroid/src/main/res/values-ml/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ml/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">നോട്ട് തരങ്ങൾക്ക് കുറഞ്ഞത് ഒരു ഫീൽഡെങ്കിലും ഉണ്ടായിരിക്കണം</string>
     <string name="toast_empty_name">നിങ്ങൾ ഒരു പേര് നൽകണം</string>
     <string name="toast_duplicate_field">ഫീൽഡ് പേര് ഇതിനകം ഉപയോഗിച്ചു</string>
-    <string name="toast_out_of_range">നിങ്ങൾ ഒരു സാധുവായ മൂല്യം നൽകണം</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d കുറിപ്പ് തരം ലഭ്യമാണ്</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">ഫീൽഡിൻ്റെ പേര് മാറ്റുക</string>
     <string name="model_field_editor_language_hint">കീബോർഡ് ഭാഷാ സൂചന സജ്ജമാക്കുക</string>
     <string name="model_field_editor_reposition_menu">Reposition field</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">ചേർക്കുമ്പോൾ അവസാന ഇൻപുട്ട് ഓർക്കുക</string>
     <string name="model_field_editor_changing">ഫീൽഡുകൾ അപ്ഡേറ്റ് ചെയ്യുന്നു</string>
     <string name="model_field_editor_sort_field">ഈ ഫീൽഡ് അനുസരിച്ച് അടുക്കുക</string>
diff --git a/AnkiDroid/src/main/res/values-mn/03-dialogs.xml b/AnkiDroid/src/main/res/values-mn/03-dialogs.xml
index e759d9d1abfd..4f39a0bafe0a 100644
--- a/AnkiDroid/src/main/res/values-mn/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-mn/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
-    <string name="empty_cards_count">Cards to delete: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-mn/17-model-manager.xml b/AnkiDroid/src/main/res/values-mn/17-model-manager.xml
index 3637310130d9..6b89a122d404 100644
--- a/AnkiDroid/src/main/res/values-mn/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-mn/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Note types must have at least one field</string>
     <string name="toast_empty_name">You must enter a name</string>
     <string name="toast_duplicate_field">Field name already used</string>
-    <string name="toast_out_of_range">You must enter a valid value</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d note type available</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Rename field</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Reposition field</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Updating fields</string>
     <string name="model_field_editor_sort_field">Sort by this field</string>
diff --git a/AnkiDroid/src/main/res/values-mr/03-dialogs.xml b/AnkiDroid/src/main/res/values-mr/03-dialogs.xml
index 2752efaa3250..acc18c9d0344 100644
--- a/AnkiDroid/src/main/res/values-mr/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-mr/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">देय</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">रिक्त कार्ड शोधत आहे &#8230;</string>
-    <string name="empty_cards_count">हटविण्यासाठी कार्डे:%d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">मायक्रोफोन परवानगी प्राप्त करू शकलो नाही.</string>
     <string name="multimedia_editor_failed">मल्टीमीडिया संपादक उघडण्यात अयशस्वी</string>
diff --git a/AnkiDroid/src/main/res/values-mr/17-model-manager.xml b/AnkiDroid/src/main/res/values-mr/17-model-manager.xml
index d745cff15d59..af6dbc60be4e 100644
--- a/AnkiDroid/src/main/res/values-mr/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-mr/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">टीप प्रकारात कमीतकमी एक फील्ड असणे आवश्यक आहे</string>
     <string name="toast_empty_name">आपण नाव प्रविष्ट केलेच पाहिजे</string>
     <string name="toast_duplicate_field">फील्ड नाव आधीपासून वापरलेले आहे</string>
-    <string name="toast_out_of_range">आपण एक वैध मूल्य प्रविष्ट करणे आवश्यक आहे</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d टीप प्रकार उपलब्ध</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">फील्ड पुनर्नामित करा</string>
     <string name="model_field_editor_language_hint">कीबोर्ड भाषेचा संकेत सेट करा</string>
     <string name="model_field_editor_reposition_menu">स्थान फील्ड</string>
-    <string name="model_field_editor_reposition">स्थान फील्ड (%1$d–%2$d मूल्य प्रविष्ट करा)</string>
     <string name="model_field_editor_toggle_sticky">जोडताना शेवटचे इनपुट लक्षात ठेवा</string>
     <string name="model_field_editor_changing">फील्ड अद्यतनित करीत आहे</string>
     <string name="model_field_editor_sort_field">या फील्डनुसार क्रमवारी लावा</string>
diff --git a/AnkiDroid/src/main/res/values-ms/03-dialogs.xml b/AnkiDroid/src/main/res/values-ms/03-dialogs.xml
index c0810cf666c9..ab03fa1dbf17 100644
--- a/AnkiDroid/src/main/res/values-ms/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ms/03-dialogs.xml
@@ -125,7 +125,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Tunggakan</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Mencari kad kosong&#8230;</string>
-    <string name="empty_cards_count">Kad untuk dipadam: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Tidak dapat memperoleh kebenaran mikrofon.</string>
     <string name="multimedia_editor_failed">Gagal membuka Penyunting Multimedia</string>
diff --git a/AnkiDroid/src/main/res/values-ms/17-model-manager.xml b/AnkiDroid/src/main/res/values-ms/17-model-manager.xml
index 27507d4de089..ceaccdbe90f0 100644
--- a/AnkiDroid/src/main/res/values-ms/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ms/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Jenis nota hendaklah mengandungi sekurang-kurangnya satu medan</string>
     <string name="toast_empty_name">Anda hendaklah masukkan nama</string>
     <string name="toast_duplicate_field">Nama medan sudah digunakan</string>
-    <string name="toast_out_of_range">Anda hendaklah masukkan nilai sah</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="other">%d jenis nota tersedia</item>
@@ -56,7 +55,6 @@
     <string name="model_field_editor_rename">Nama semula medan</string>
     <string name="model_field_editor_language_hint">Tetapkan petunjuk bahasa papan kekunci</string>
     <string name="model_field_editor_reposition_menu">Alih posisi medan</string>
-    <string name="model_field_editor_reposition">Alih posisi medan (masukkan nilai %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Ingat input terakhir apabila menambah</string>
     <string name="model_field_editor_changing">Mengemas kini medan</string>
     <string name="model_field_editor_sort_field">Susun ikut medan ini</string>
diff --git a/AnkiDroid/src/main/res/values-my/03-dialogs.xml b/AnkiDroid/src/main/res/values-my/03-dialogs.xml
index 2abb851836ae..27ec775ba812 100644
--- a/AnkiDroid/src/main/res/values-my/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-my/03-dialogs.xml
@@ -125,7 +125,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
-    <string name="empty_cards_count">Cards to delete: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-my/17-model-manager.xml b/AnkiDroid/src/main/res/values-my/17-model-manager.xml
index c776f880d5b2..5fa571a5e4a9 100644
--- a/AnkiDroid/src/main/res/values-my/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-my/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Note types must have at least one field</string>
     <string name="toast_empty_name">You must enter a name</string>
     <string name="toast_duplicate_field">Field name already used</string>
-    <string name="toast_out_of_range">You must enter a valid value</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="other">%d note types available</item>
@@ -56,7 +55,6 @@
     <string name="model_field_editor_rename">Rename field</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Reposition field</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Updating fields</string>
     <string name="model_field_editor_sort_field">Sort by this field</string>
diff --git a/AnkiDroid/src/main/res/values-nl/03-dialogs.xml b/AnkiDroid/src/main/res/values-nl/03-dialogs.xml
index 4d8689569747..137403c783fd 100644
--- a/AnkiDroid/src/main/res/values-nl/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-nl/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Te doen</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Lege kaarten aan het zoeken&#8230;</string>
-    <string name="empty_cards_count">Kaarten te verwijderen: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Kon geen toestemming voor de microfoon verkrijgen.</string>
     <string name="multimedia_editor_failed">Openen van de multimedia-editor is mislukt</string>
diff --git a/AnkiDroid/src/main/res/values-nl/17-model-manager.xml b/AnkiDroid/src/main/res/values-nl/17-model-manager.xml
index 1905db29c5ed..cda5fa103223 100644
--- a/AnkiDroid/src/main/res/values-nl/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-nl/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Notitietypes moeten ten minste één veld hebben</string>
     <string name="toast_empty_name">U moet een naam invoeren</string>
     <string name="toast_duplicate_field">Veldnaam al in gebruik</string>
-    <string name="toast_out_of_range">U moet een geldige waarde invoeren</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d memotype beschikbaar</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Naam van veld wijzigen</string>
     <string name="model_field_editor_language_hint">Suggestie voor de toetsenbordtaal instellen</string>
     <string name="model_field_editor_reposition_menu">Verplaats veld</string>
-    <string name="model_field_editor_reposition">Verplaats veld (geef een waarde %1$d –%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Laatste invoer onthouden bij het toevoegen</string>
     <string name="model_field_editor_changing">Velden bijwerken</string>
     <string name="model_field_editor_sort_field">Sorteren op dit veld</string>
diff --git a/AnkiDroid/src/main/res/values-nn/03-dialogs.xml b/AnkiDroid/src/main/res/values-nn/03-dialogs.xml
index 9d869123712a..b7e49be39995 100644
--- a/AnkiDroid/src/main/res/values-nn/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-nn/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Forfaller</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Leter etter tomme kort&#8230;</string>
-    <string name="empty_cards_count">Kort å slette: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-nn/17-model-manager.xml b/AnkiDroid/src/main/res/values-nn/17-model-manager.xml
index a9e33676dd34..896c5a01bde4 100644
--- a/AnkiDroid/src/main/res/values-nn/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-nn/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Notattyper må ha minst ett felt</string>
     <string name="toast_empty_name">Du må angi et navn</string>
     <string name="toast_duplicate_field">Feltnavn allerede brukt</string>
-    <string name="toast_out_of_range">Du må angi en gyldig verdi</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d notattype tilgjengelig</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Gjev felt nytt namn</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Flytt felt</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Husk siste inndata når du legger til</string>
     <string name="model_field_editor_changing">Oppdaterer felt</string>
     <string name="model_field_editor_sort_field">Sorter etter dette feltet</string>
diff --git a/AnkiDroid/src/main/res/values-no/03-dialogs.xml b/AnkiDroid/src/main/res/values-no/03-dialogs.xml
index 17373ab4ff46..532724960b7c 100644
--- a/AnkiDroid/src/main/res/values-no/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-no/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Forfaller</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Leter etter tomme kort&#8230;</string>
-    <string name="empty_cards_count">Kort å slette: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-no/17-model-manager.xml b/AnkiDroid/src/main/res/values-no/17-model-manager.xml
index 2d061a73f221..7c4d063bc823 100644
--- a/AnkiDroid/src/main/res/values-no/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-no/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Notattyper må ha minst ett felt</string>
     <string name="toast_empty_name">Du må angi et navn</string>
     <string name="toast_duplicate_field">Feltnavn allerede brukt</string>
-    <string name="toast_out_of_range">Du må angi en gyldig verdi</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d notattype tilgjengelig</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Endre navn på felt</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Flytt felt</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Husk siste inndata når du legger til</string>
     <string name="model_field_editor_changing">Oppdaterer felt</string>
     <string name="model_field_editor_sort_field">Sorter etter dette feltet</string>
diff --git a/AnkiDroid/src/main/res/values-or/03-dialogs.xml b/AnkiDroid/src/main/res/values-or/03-dialogs.xml
index 9d4e4e9aad74..542ce88a13ca 100644
--- a/AnkiDroid/src/main/res/values-or/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-or/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">ବାକି</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">ଖାଲି ପତ୍ର ଖୋଜାହେଉଛି&#8230;</string>
-    <string name="empty_cards_count">ବିଲୋପ କରିବାକୁ ପତ୍ର : %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">ମାଇକ୍ରୋଫୋନ୍ ଅନୁମତି ପାଇପାରିଲୁ ନାହିଁ।</string>
     <string name="multimedia_editor_failed">ମଲ୍ଟିମିଡ଼ିଆ ସମ୍ପାଦକ ଖୋଲିବାରେ ବିଫଳ</string>
diff --git a/AnkiDroid/src/main/res/values-or/17-model-manager.xml b/AnkiDroid/src/main/res/values-or/17-model-manager.xml
index 456962fe89be..5e7d43771d69 100644
--- a/AnkiDroid/src/main/res/values-or/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-or/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">ନୋଟ୍ ପ୍ରକାରର ଅତିକମରେ ଗୋଟିଏ କ୍ଷେତ୍ର ଥିବା ଆବଶ୍ୟକ</string>
     <string name="toast_empty_name">ଆପଣ ଗୋଟିଏ ନାମ ପ୍ରବେଶ କରିବା ଜରୁରୀ</string>
     <string name="toast_duplicate_field">କ୍ଷେତ୍ର ନାଁଟି ଆଗରୁ ଵ୍ୟଵହାର ହୋଇଛି</string>
-    <string name="toast_out_of_range">ଆପଣ ନିଶ୍ଚିତ ଭାବରେ ଏକ ବୈଧ ମୂଲ୍ୟ ପ୍ରବେଶ କରିବେ</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%dଟିଏ ନୋଟ୍ ପ୍ରକାର ଉପଲବ୍ଧ</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">କ୍ଷେତ୍ରଟିର ନାମ ବଦଳାନ୍ତୁ</string>
     <string name="model_field_editor_language_hint">କୀବୋର୍ଡର ସୂଚକ ଭାଷା ସେଟ୍ କରନ୍ତୁ</string>
     <string name="model_field_editor_reposition_menu">କ୍ଷେତ୍ରଟିକୁ ପୁନଃଅଵସ୍ଥିତ କରିବା</string>
-    <string name="model_field_editor_reposition">କ୍ଷେତ୍ରଟିକୁ ପୁନଃଅଵସ୍ଥିତ କରିବେ (%1$d–%2$d ମଧ୍ୟରେ ଗୋଟେ ମୂଲ୍ୟ ପ୍ରଵେଶ କରନ୍ତୁ)</string>
     <string name="model_field_editor_toggle_sticky">ଯୋଡ଼ିବା ସମୟରେ ଶେଷ ଇନପୁଟ୍ ମନେରଖ</string>
     <string name="model_field_editor_changing">କ୍ଷେତ୍ରଗୁଡ଼ିକ ଅଦ୍ୟତିତ ହେଉଛି</string>
     <string name="model_field_editor_sort_field">ଏହି କ୍ଷେତ୍ର ଅନୁଯାୟୀ ସଜାନ୍ତୁ</string>
diff --git a/AnkiDroid/src/main/res/values-pa/03-dialogs.xml b/AnkiDroid/src/main/res/values-pa/03-dialogs.xml
index 781f5b7fe7a5..78c6aea7c539 100644
--- a/AnkiDroid/src/main/res/values-pa/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-pa/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">ਬਕਾਇਆ</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">ਖਾਲੀ ਕਾਰਡ ਲੱਭੇ ਜਾ ਰਹੇ ਹਨ&#8230;</string>
-    <string name="empty_cards_count">ਮਿਟਾਉਣ ਲਈ ਕਾਰਡ: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਮਿਲ ਸਕੀ।</string>
     <string name="multimedia_editor_failed">ਮਲਟੀਮੀਡੀਆ ਸੰਪਾਦਕ ਨੂੰ ਖੋਲ੍ਹਣ ਵਿੱਚ ਅਸਫਲ</string>
diff --git a/AnkiDroid/src/main/res/values-pa/17-model-manager.xml b/AnkiDroid/src/main/res/values-pa/17-model-manager.xml
index 6e3f4cdaf9af..ba70eebf9de0 100644
--- a/AnkiDroid/src/main/res/values-pa/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-pa/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">ਨੋਟ ਕਿਸਮਾਂ ਵਿੱਚ ਘੱਟੋ-ਘੱਟ ਇੱਕ ਖੇਤਰ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ</string>
     <string name="toast_empty_name">ਤੁਹਾਨੂੰ ਇੱਕ ਨਾਮ ਦਰਜ ਕਰਨਾ ਚਾਹੀਦਾ ਹੈ</string>
     <string name="toast_duplicate_field">ਖੇਤਰ ਦਾ ਨਾਮ ਪਹਿਲਾਂ ਹੀ ਵਰਤਿਆ ਗਿਆ ਹੈ</string>
-    <string name="toast_out_of_range">ਤੁਹਾਨੂੰ ਇੱਕ ਵੈਧ ਮੁੱਲ ਦਾਖਲ ਕਰਨਾ ਚਾਹੀਦਾ ਹੈ</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d ਨੋਟ ਕਿਸਮਾਂ ਉਪਲਬਧ ਹਨ</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">ਖੇਤਰ ਦਾ ਨਾਮ ਬਦਲੋ</string>
     <string name="model_field_editor_language_hint">ਕੀਬੋਰਡ ਭਾਸ਼ਾ ਸੰਕੇਤ ਸੈੱਟ ਕਰੋ</string>
     <string name="model_field_editor_reposition_menu">ਰੀਪੋਜੀਸ਼ਨ ਫੀਲਡ</string>
-    <string name="model_field_editor_reposition">ਰੀਪੋਜ਼ੀਸ਼ਨ ਫੀਲਡ (ਇੱਕ ਮੁੱਲ %1$d–%2$d ਦਾਖਲ ਕਰੋ)</string>
     <string name="model_field_editor_toggle_sticky">ਜੋੜਨ ਵੇਲੇ ਆਖਰੀ ਇਨਪੁਟ ਯਾਦ ਰੱਖੋ</string>
     <string name="model_field_editor_changing">ਖੇਤਰਾਂ ਨੂੰ ਅੱਪਡੇਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ</string>
     <string name="model_field_editor_sort_field">ਇਸ ਖੇਤਰ ਦੁਆਰਾ ਕ੍ਰਮਬੱਧ ਕਰੋ</string>
diff --git a/AnkiDroid/src/main/res/values-pl/03-dialogs.xml b/AnkiDroid/src/main/res/values-pl/03-dialogs.xml
index 9f7f3fdbcd99..2191a0271d50 100644
--- a/AnkiDroid/src/main/res/values-pl/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-pl/03-dialogs.xml
@@ -137,7 +137,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Do przejrzenia</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Wyszukiwanie pustych kart&#8230;</string>
-    <string name="empty_cards_count">Kart do usunięcia: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Nie udało się uzyskać uprawnień do interakcji z mikrofonem.</string>
     <string name="multimedia_editor_failed">Nie udało się otworzyć edytora multimediów</string>
diff --git a/AnkiDroid/src/main/res/values-pl/17-model-manager.xml b/AnkiDroid/src/main/res/values-pl/17-model-manager.xml
index 240ad5225aa2..824a8d3020b8 100644
--- a/AnkiDroid/src/main/res/values-pl/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-pl/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Typy notatek muszą mieć co najmniej jedno pole</string>
     <string name="toast_empty_name">Musisz wprowadzić nazwę</string>
     <string name="toast_duplicate_field">Nazwa pola już zajęta</string>
-    <string name="toast_out_of_range">Musisz wprowadzić prawidłową wartość</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d typ notatki dostępny</item>
@@ -62,7 +61,6 @@
     <string name="model_field_editor_rename">Zmień nazwę pola</string>
     <string name="model_field_editor_language_hint">Ustaw podpowiedź języka klawiatury</string>
     <string name="model_field_editor_reposition_menu">Zmień pozycję pola</string>
-    <string name="model_field_editor_reposition">Zmień pozycję pola (wprowadź wartość %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Zapamiętaj ostatni wpis podczas dodawania</string>
     <string name="model_field_editor_changing">Aktualizowanie pól</string>
     <string name="model_field_editor_sort_field">Sortuj według tego pola</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rBR/03-dialogs.xml b/AnkiDroid/src/main/res/values-pt-rBR/03-dialogs.xml
index e0ccf79a979e..57f32c42ba2b 100644
--- a/AnkiDroid/src/main/res/values-pt-rBR/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-pt-rBR/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Pendentes</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Buscando cards vazios&#8230;</string>
-    <string name="empty_cards_count">Cards a deletar: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Não foi possível obter permissão de microfone.</string>
     <string name="multimedia_editor_failed">Falha ao abrir o Editor de Multimídia</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rBR/17-model-manager.xml b/AnkiDroid/src/main/res/values-pt-rBR/17-model-manager.xml
index 2d7addafe679..b82f3ae2cb6f 100644
--- a/AnkiDroid/src/main/res/values-pt-rBR/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-pt-rBR/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Tipos de nota devem ter pelo menos um campo</string>
     <string name="toast_empty_name">Você deve digitar um nome</string>
     <string name="toast_duplicate_field">Nome do campo já utilizado</string>
-    <string name="toast_out_of_range">Você deve colocar um valor válido</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d tipo de nota disponível</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Renomear campo</string>
     <string name="model_field_editor_language_hint">Definir idioma do teclado</string>
     <string name="model_field_editor_reposition_menu">Campo de reposição</string>
-    <string name="model_field_editor_reposition">Reposicionar campo (digite um valor %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Lembrar da última entrada ao adicionar</string>
     <string name="model_field_editor_changing">Atualizando os campos</string>
     <string name="model_field_editor_sort_field">Ordenar por esse campo</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rPT/03-dialogs.xml b/AnkiDroid/src/main/res/values-pt-rPT/03-dialogs.xml
index 8c63c113c4fd..e20f6f15c84c 100644
--- a/AnkiDroid/src/main/res/values-pt-rPT/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-pt-rPT/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Pendentes</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">A encontrar fichas vazias&#8230;</string>
-    <string name="empty_cards_count">Fichas para apagar: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Não foi possível obter permissão para utilizar o microfone.</string>
     <string name="multimedia_editor_failed">Falha ao abrir o Editor de Multimédia</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rPT/17-model-manager.xml b/AnkiDroid/src/main/res/values-pt-rPT/17-model-manager.xml
index 0ae8cfa7a80a..63588ebdf79f 100644
--- a/AnkiDroid/src/main/res/values-pt-rPT/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-pt-rPT/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Os tipos de nota devem ter pelo menos um campo</string>
     <string name="toast_empty_name">Tem de digitar um nome</string>
     <string name="toast_duplicate_field">Nome de campo já utilizado</string>
-    <string name="toast_out_of_range">Deve inserir um valor válido</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d tipo de nota disponível</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Renomear campo</string>
     <string name="model_field_editor_language_hint">Definir a língua associada ao teclado</string>
     <string name="model_field_editor_reposition_menu">Campo de reposição</string>
-    <string name="model_field_editor_reposition">Campo de reposição (digite um valor entre %1$d e %2$d)</string>
     <string name="model_field_editor_toggle_sticky">Lembrar última entrada ao adicionar</string>
     <string name="model_field_editor_changing">A atualizar os campos</string>
     <string name="model_field_editor_sort_field">Ordenar por este campo</string>
diff --git a/AnkiDroid/src/main/res/values-ro/03-dialogs.xml b/AnkiDroid/src/main/res/values-ro/03-dialogs.xml
index 2478d2a53bba..7144344fef25 100644
--- a/AnkiDroid/src/main/res/values-ro/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ro/03-dialogs.xml
@@ -133,7 +133,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
-    <string name="empty_cards_count">Cards to delete: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-ro/17-model-manager.xml b/AnkiDroid/src/main/res/values-ro/17-model-manager.xml
index bc37a7739596..41068390377f 100644
--- a/AnkiDroid/src/main/res/values-ro/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ro/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Note types must have at least one field</string>
     <string name="toast_empty_name">You must enter a name</string>
     <string name="toast_duplicate_field">Field name already used</string>
-    <string name="toast_out_of_range">You must enter a valid value</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d note type available</item>
@@ -60,7 +59,6 @@
     <string name="model_field_editor_rename">Rename field</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Reposition field</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Actualizare câmpuri</string>
     <string name="model_field_editor_sort_field">Sortează după acest câmp</string>
diff --git a/AnkiDroid/src/main/res/values-ru/03-dialogs.xml b/AnkiDroid/src/main/res/values-ru/03-dialogs.xml
index f6c1b177dea7..28b0cf2e1fbb 100644
--- a/AnkiDroid/src/main/res/values-ru/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ru/03-dialogs.xml
@@ -138,7 +138,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">К просмотру</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Поиск пустых карточек&#8230;</string>
-    <string name="empty_cards_count">Карточек к удалению: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Не удалось получить разрешение на микрофон.</string>
     <string name="multimedia_editor_failed">Не удалось открыть редактор мультимедиа</string>
diff --git a/AnkiDroid/src/main/res/values-ru/17-model-manager.xml b/AnkiDroid/src/main/res/values-ru/17-model-manager.xml
index 331068b7ed86..89298eb75ada 100644
--- a/AnkiDroid/src/main/res/values-ru/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ru/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">В типе записей должно быть хотя бы одно поле</string>
     <string name="toast_empty_name">Введите имя</string>
     <string name="toast_duplicate_field">Имя поля уже используется</string>
-    <string name="toast_out_of_range">Введите допустимое значение</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">Доступен %d тип карточек</item>
@@ -62,7 +61,6 @@
     <string name="model_field_editor_rename">Переименовать поле</string>
     <string name="model_field_editor_language_hint">Задать язык подсказок клавиатуры</string>
     <string name="model_field_editor_reposition_menu">Переместить поле</string>
-    <string name="model_field_editor_reposition">Переместить поле (введите значение %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">При добавлении запоминать последний ввод</string>
     <string name="model_field_editor_changing">Поля обновляются</string>
     <string name="model_field_editor_sort_field">Сортировать по этому полю</string>
diff --git a/AnkiDroid/src/main/res/values-sat/03-dialogs.xml b/AnkiDroid/src/main/res/values-sat/03-dialogs.xml
index 3e594d8a36c4..f7ceb31bad39 100644
--- a/AnkiDroid/src/main/res/values-sat/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sat/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">ᱮᱢᱚᱜ ᱥᱚᱢᱚᱭ</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">ᱠᱷᱟᱹᱞᱤ ᱠᱟᱰ ᱯᱟᱱᱛᱮ ᱪᱟᱹᱞᱩ ᱠᱟᱱᱟ&#8230;</string>
-    <string name="empty_cards_count">ᱜᱮᱫ ᱜᱤᱰᱤ ᱞᱟᱹᱜᱤᱫ ᱠᱟᱰ: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">ᱢᱟᱤᱠᱨᱚᱯᱷᱚᱱ ᱪᱷᱟᱰ ᱵᱟᱝ ᱟᱜᱩ ᱫᱟᱲᱮᱟᱫᱟᱠ ᱟ ᱾</string>
     <string name="multimedia_editor_failed">ᱢᱟᱹᱞᱴᱤᱢᱤᱰᱤᱭᱟ ᱮᱰᱤᱴᱚᱨ ᱚᱰᱚᱠ ᱰᱤᱜᱟᱹᱣᱮᱱᱟ</string>
diff --git a/AnkiDroid/src/main/res/values-sat/17-model-manager.xml b/AnkiDroid/src/main/res/values-sat/17-model-manager.xml
index 6f8ef7463df6..51d70a993ba7 100644
--- a/AnkiDroid/src/main/res/values-sat/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-sat/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">ᱠᱷᱟᱴᱚ ᱵᱤᱪᱟᱹᱨ ᱯᱨᱚᱠᱟᱨ ᱴᱷᱮᱱ ᱢᱤᱫᱴᱟᱝ ᱠᱷᱚᱱ ᱡᱟᱹᱥᱛᱤ ᱡᱟᱭᱜᱟ ᱛᱟᱦᱮᱱ ᱠᱟᱛᱷᱟ</string>
     <string name="toast_empty_name">ᱟᱢ ᱫᱚ ᱧᱩᱛᱩᱢ ᱚᱞ ᱛᱮ ᱦᱩᱭᱟᱢᱟ </string>
     <string name="toast_duplicate_field">ᱡᱟᱭᱜᱟ ᱧᱩᱛᱩᱢ ᱠᱟᱹᱢᱤ ᱨᱮ ᱟᱜᱩ ᱠᱟᱱᱟ</string>
-    <string name="toast_out_of_range">ᱟᱢ ᱢᱟᱱᱭᱚ ᱢᱩᱞ ᱚᱞ‌ ᱛᱮ ᱦᱩᱭᱟᱢᱟ</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d ᱠᱷᱟᱴᱚ ᱵᱤᱪᱟᱹᱨ ᱯᱨᱚᱠᱟᱨ ᱢᱮᱱᱟᱜᱼᱟ</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">ᱡᱟᱭᱜᱟ ᱫᱩᱦᱲᱟ ᱧᱩᱛᱩᱢᱟᱱ</string>
     <string name="model_field_editor_language_hint">ᱠᱤᱵᱚᱰ ᱯᱟᱹᱨᱥᱤ ᱦᱤᱸᱴ ᱥᱮᱴ ᱢᱮ</string>
     <string name="model_field_editor_reposition_menu">ᱡᱟᱭᱜᱟ ᱵᱚᱫᱚᱞ</string>
-    <string name="model_field_editor_reposition">ᱡᱟᱭᱜᱟ ᱵᱚᱫᱚᱞ ( ᱢᱩᱞ %1$d ᱠᱷᱚᱱ %2$d ‌ᱚᱞᱢᱮ)</string>
     <string name="model_field_editor_toggle_sticky">ᱥᱮᱞᱮᱫ ‌ᱡᱷᱚᱜ ᱢᱟᱲᱟᱝᱼᱟᱜ ᱤᱱᱯᱩᱴ ᱩᱭᱦᱟᱹᱨᱢᱮ</string>
     <string name="model_field_editor_changing">ᱡᱟᱭᱜᱟ ᱟᱹᱯᱰᱟᱴᱼᱚᱜ ᱠᱟᱱᱟ</string>
     <string name="model_field_editor_sort_field">ᱡᱟᱭᱜᱟ ᱛᱮ ᱥᱚᱴᱼᱚᱜ ᱠᱟᱱᱟ </string>
diff --git a/AnkiDroid/src/main/res/values-sc/03-dialogs.xml b/AnkiDroid/src/main/res/values-sc/03-dialogs.xml
index da52470aae27..b3ac11dcbd44 100644
--- a/AnkiDroid/src/main/res/values-sc/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sc/03-dialogs.xml
@@ -134,7 +134,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">De revisionare</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Agatende sas cartas bòidas&#8230;</string>
-    <string name="empty_cards_count">Cartas de iscantzellare: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">No est istadu possìbile otènnere su permissu pro su micròfonu.</string>
     <string name="multimedia_editor_failed">Abertura de s\'Editore Multimediale fallida</string>
diff --git a/AnkiDroid/src/main/res/values-sc/17-model-manager.xml b/AnkiDroid/src/main/res/values-sc/17-model-manager.xml
index 14433b638f86..01610bc01a64 100644
--- a/AnkiDroid/src/main/res/values-sc/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-sc/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Sas castas de notas depent tènnere a su nessi unu campu</string>
     <string name="toast_empty_name">Depes insertare unu nùmene</string>
     <string name="toast_duplicate_field">Nùmene de su campu giai impreadu</string>
-    <string name="toast_out_of_range">Depes insertare unu valore vàlidu</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d casta de nota a disponimentu</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Muda su campu de nùmene</string>
     <string name="model_field_editor_language_hint">Imposta s\'impòsitu de limba de su tecladu</string>
     <string name="model_field_editor_reposition_menu">Torra a positzionare su campu</string>
-    <string name="model_field_editor_reposition">Torra a positzionare su campu (inserta unu valore %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Ammenta s\'ùrtima intrada cando annanghes</string>
     <string name="model_field_editor_changing">Atualizatzione de sos campos</string>
     <string name="model_field_editor_sort_field">Òrdina sighende custu campu</string>
diff --git a/AnkiDroid/src/main/res/values-sk/03-dialogs.xml b/AnkiDroid/src/main/res/values-sk/03-dialogs.xml
index 3063fc1f1728..f58ec4fd4187 100644
--- a/AnkiDroid/src/main/res/values-sk/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sk/03-dialogs.xml
@@ -137,7 +137,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Na preskúšanie</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Hľadanie prázdnych kartičiek&#8230;</string>
-    <string name="empty_cards_count">Počet kartičiek, ktoré budú vymazané: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Nepodarilo sa získať povolenie k mikrofónu.</string>
     <string name="multimedia_editor_failed">Nepodarilo sa otvoriť editor multimédií</string>
diff --git a/AnkiDroid/src/main/res/values-sk/17-model-manager.xml b/AnkiDroid/src/main/res/values-sk/17-model-manager.xml
index a776700e0c6f..13117b6adcfb 100644
--- a/AnkiDroid/src/main/res/values-sk/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-sk/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Typy poznámok musia mať aspoň jedno pole</string>
     <string name="toast_empty_name">Musíte zadať názov</string>
     <string name="toast_duplicate_field">Názov poľa sa už používa</string>
-    <string name="toast_out_of_range">Musíte zadať platnú hodnotu</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d typ poznámok k dispozícii</item>
@@ -62,7 +61,6 @@
     <string name="model_field_editor_rename">Premenovať pole</string>
     <string name="model_field_editor_language_hint">Nastaviť jazykový tip klávesnice</string>
     <string name="model_field_editor_reposition_menu">Premiestniť pole</string>
-    <string name="model_field_editor_reposition">Premiestniť pole (zadajte hodnotu %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Zapamätať posledný vstupný údaj pri pridávaní</string>
     <string name="model_field_editor_changing">Aktualizácia polí</string>
     <string name="model_field_editor_sort_field">Usporiadať podľa tohto poľa</string>
diff --git a/AnkiDroid/src/main/res/values-sl/03-dialogs.xml b/AnkiDroid/src/main/res/values-sl/03-dialogs.xml
index 5aca1b39661a..c3bdfbe1a911 100644
--- a/AnkiDroid/src/main/res/values-sl/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sl/03-dialogs.xml
@@ -137,7 +137,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Zapadle</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Iskanje praznih kartic &#8230;</string>
-    <string name="empty_cards_count">Kartice za izbris: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-sl/17-model-manager.xml b/AnkiDroid/src/main/res/values-sl/17-model-manager.xml
index 11a4bfd22f81..aa11a5c055f3 100644
--- a/AnkiDroid/src/main/res/values-sl/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-sl/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Vrste zapiskov morajo imeti vsaj eno polje</string>
     <string name="toast_empty_name">Vnesti morate ime</string>
     <string name="toast_duplicate_field">Ime polja je že uporabljeno</string>
-    <string name="toast_out_of_range">Vnesti morate veljavno vrednost</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">Na voljo je %d vrsta zapiskov</item>
@@ -62,7 +61,6 @@
     <string name="model_field_editor_rename">Preimenuj polje</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Prestavi polje</string>
-    <string name="model_field_editor_reposition">Prestavi polje (vnesite vrednost %1$d - %2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Posodabljanje polj</string>
     <string name="model_field_editor_sort_field">Razvrsti po temu polju</string>
diff --git a/AnkiDroid/src/main/res/values-sq/03-dialogs.xml b/AnkiDroid/src/main/res/values-sq/03-dialogs.xml
index 0229518d39fd..e222cc65ad0e 100644
--- a/AnkiDroid/src/main/res/values-sq/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sq/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Pritet</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Po gjen karta boshe&#8230;</string>
-    <string name="empty_cards_count">Kartat për të fshirë: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Nuk mund të merrej leja për mikrofonin.</string>
     <string name="multimedia_editor_failed">Hapja e redaktuesit të multimedias dështoi</string>
diff --git a/AnkiDroid/src/main/res/values-sq/17-model-manager.xml b/AnkiDroid/src/main/res/values-sq/17-model-manager.xml
index 3637310130d9..6b89a122d404 100644
--- a/AnkiDroid/src/main/res/values-sq/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-sq/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Note types must have at least one field</string>
     <string name="toast_empty_name">You must enter a name</string>
     <string name="toast_duplicate_field">Field name already used</string>
-    <string name="toast_out_of_range">You must enter a valid value</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d note type available</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Rename field</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Reposition field</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Updating fields</string>
     <string name="model_field_editor_sort_field">Sort by this field</string>
diff --git a/AnkiDroid/src/main/res/values-sr/03-dialogs.xml b/AnkiDroid/src/main/res/values-sr/03-dialogs.xml
index 2a2e71af79e3..15749d8b0b58 100644
--- a/AnkiDroid/src/main/res/values-sr/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sr/03-dialogs.xml
@@ -133,7 +133,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Рок</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
-    <string name="empty_cards_count">Cards to delete: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-sr/17-model-manager.xml b/AnkiDroid/src/main/res/values-sr/17-model-manager.xml
index c18603176f22..35bcd4533d55 100644
--- a/AnkiDroid/src/main/res/values-sr/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-sr/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Тип белешке мора да има бар једно поље</string>
     <string name="toast_empty_name">Морате да унесете име</string>
     <string name="toast_duplicate_field">Назив поља се већ користи</string>
-    <string name="toast_out_of_range">Морате да унесете важећу вредност</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d типова бележака доступно</item>
@@ -60,7 +59,6 @@
     <string name="model_field_editor_rename">Преименуј поље</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Репозиција поље</string>
-    <string name="model_field_editor_reposition">Репозиција поље (унесите вредности %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Поље ажурирања</string>
     <string name="model_field_editor_sort_field">Сортирај по овом пољу</string>
diff --git a/AnkiDroid/src/main/res/values-ss/03-dialogs.xml b/AnkiDroid/src/main/res/values-ss/03-dialogs.xml
index e759d9d1abfd..4f39a0bafe0a 100644
--- a/AnkiDroid/src/main/res/values-ss/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ss/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
-    <string name="empty_cards_count">Cards to delete: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-ss/17-model-manager.xml b/AnkiDroid/src/main/res/values-ss/17-model-manager.xml
index 3637310130d9..6b89a122d404 100644
--- a/AnkiDroid/src/main/res/values-ss/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ss/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Note types must have at least one field</string>
     <string name="toast_empty_name">You must enter a name</string>
     <string name="toast_duplicate_field">Field name already used</string>
-    <string name="toast_out_of_range">You must enter a valid value</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d note type available</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Rename field</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Reposition field</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Updating fields</string>
     <string name="model_field_editor_sort_field">Sort by this field</string>
diff --git a/AnkiDroid/src/main/res/values-sv/03-dialogs.xml b/AnkiDroid/src/main/res/values-sv/03-dialogs.xml
index 29887c1bb681..99587138a3c8 100644
--- a/AnkiDroid/src/main/res/values-sv/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sv/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Kö</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Hittar tomma kort&#8230;</string>
-    <string name="empty_cards_count">Kort att ta bort: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Kunde inte få mikrofonbehörighet.</string>
     <string name="multimedia_editor_failed">Det gick inte att öppna Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-sv/17-model-manager.xml b/AnkiDroid/src/main/res/values-sv/17-model-manager.xml
index b42f0893046b..9b3f99ed6715 100644
--- a/AnkiDroid/src/main/res/values-sv/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-sv/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Nottyper måste ha åtminstone ett fält</string>
     <string name="toast_empty_name">Du måste ange ett namn</string>
     <string name="toast_duplicate_field">Fältnamnet används redan</string>
-    <string name="toast_out_of_range">Du måste ange ett giltigt värde</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d nottyp tillgänglig</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Byt namn på fält</string>
     <string name="model_field_editor_language_hint">Ange tips på tangentbordsspråk</string>
     <string name="model_field_editor_reposition_menu">Flytta fält</string>
-    <string name="model_field_editor_reposition">Flytta fält (ange ett värde %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Kom ihåg senaste inmatning när du lägger till</string>
     <string name="model_field_editor_changing">Uppdaterar fält</string>
     <string name="model_field_editor_sort_field">Sortera efter detta fält</string>
diff --git a/AnkiDroid/src/main/res/values-sw/03-dialogs.xml b/AnkiDroid/src/main/res/values-sw/03-dialogs.xml
index e759d9d1abfd..4f39a0bafe0a 100644
--- a/AnkiDroid/src/main/res/values-sw/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sw/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
-    <string name="empty_cards_count">Cards to delete: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-sw/17-model-manager.xml b/AnkiDroid/src/main/res/values-sw/17-model-manager.xml
index 3637310130d9..6b89a122d404 100644
--- a/AnkiDroid/src/main/res/values-sw/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-sw/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Note types must have at least one field</string>
     <string name="toast_empty_name">You must enter a name</string>
     <string name="toast_duplicate_field">Field name already used</string>
-    <string name="toast_out_of_range">You must enter a valid value</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d note type available</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Rename field</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Reposition field</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Updating fields</string>
     <string name="model_field_editor_sort_field">Sort by this field</string>
diff --git a/AnkiDroid/src/main/res/values-ta/03-dialogs.xml b/AnkiDroid/src/main/res/values-ta/03-dialogs.xml
index a8a16a8f763c..06be64c5c069 100644
--- a/AnkiDroid/src/main/res/values-ta/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ta/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">இறுதி தேதி</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">வெற்று அட்டைகளைக் கண்டறிகிறது&#8230;</string>
-    <string name="empty_cards_count">நீக்க வேண்டிய கார்டுகள்: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">மைக்ரோஃபோன் அனுமதியைப் பெற முடியவில்லை.</string>
     <string name="multimedia_editor_failed">மல்டிமீடியா எடிட்டரைத் திறக்க முடியவில்லை</string>
diff --git a/AnkiDroid/src/main/res/values-ta/17-model-manager.xml b/AnkiDroid/src/main/res/values-ta/17-model-manager.xml
index 7cf38e6521c5..846f7c887e31 100644
--- a/AnkiDroid/src/main/res/values-ta/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ta/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">குறிப்பு வகைகளில் குறைந்தது ஒரு புலம் இருக்க வேண்டும்</string>
     <string name="toast_empty_name">நீங்கள் ஒரு பெயரை உள்ளிட வேண்டும்</string>
     <string name="toast_duplicate_field">புலத்தின் பெயர் ஏற்கனவே பயன்படுத்தப்பட்டுள்ளது</string>
-    <string name="toast_out_of_range">நீங்கள் சரியான மதிப்பை உள்ளிட வேண்டும்</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d குறிப்பு வகை உள்ளது</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">புலத்தை மறுபெயரிடவும்</string>
     <string name="model_field_editor_language_hint">விசைப்பலகை மொழி குறிப்பை அமைக்கவும்</string>
     <string name="model_field_editor_reposition_menu">இடமாற்ற புலம்</string>
-    <string name="model_field_editor_reposition">இடமாற்ற புலம் (%1$d–%2$d மதிப்பை உள்ளிடவும்)</string>
     <string name="model_field_editor_toggle_sticky">சேர்க்கும்போது கடைசி உள்ளீட்டை நினைவில் கொள்ளுங்கள்</string>
     <string name="model_field_editor_changing">புதுப்பிப்பு புலங்கள்</string>
     <string name="model_field_editor_sort_field">இந்தப் புலத்தின்படி வரிசைப்படுத்தவும்</string>
diff --git a/AnkiDroid/src/main/res/values-te/03-dialogs.xml b/AnkiDroid/src/main/res/values-te/03-dialogs.xml
index ad364b8ddd41..e67edd9944d9 100644
--- a/AnkiDroid/src/main/res/values-te/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-te/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">గడువు</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">ఖాళీ కార్డ్లు కనుగొనడం&#8230;</string>
-    <string name="empty_cards_count">తొలగించడానికి కార్డులు:%d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">మైక్రోఫోన్ అనుమతిని పొందడం సాధ్యపడలేదు.</string>
     <string name="multimedia_editor_failed">మల్టీమీడియా ఎడిటర్‌ని తెరవడంలో విఫలమైంది</string>
diff --git a/AnkiDroid/src/main/res/values-te/17-model-manager.xml b/AnkiDroid/src/main/res/values-te/17-model-manager.xml
index 772d40187ab2..1c77d5665f9a 100644
--- a/AnkiDroid/src/main/res/values-te/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-te/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">గమనిక గమనికలు కనీసం ఒక ఫీల్డ్ అయి ఉండాలి</string>
     <string name="toast_empty_name">మీరు తప్పనిసరిగా పేరు నమోదు చేయాలి</string>
     <string name="toast_duplicate_field">ఫీల్డ్ పేరు ఇప్పటికే ఉపయోగించబడింది</string>
-    <string name="toast_out_of_range">మీరు చెల్లుబాటు అయ్యే విలువను నమోదు చేయాలి</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d గమనిక రకం అందుబాటులో ఉంది</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">ఫీల్డ్ పేరు మార్చండి</string>
     <string name="model_field_editor_language_hint">కీబోర్డ్ భాష సూచనను సెట్ చేయండి</string>
     <string name="model_field_editor_reposition_menu">రీపోషన్ ఫీల్డ్</string>
-    <string name="model_field_editor_reposition">ప్రత్యామ్నాయ క్షేత్రం (%1$d-%2$d విలువను నమోదు చేయండి)</string>
     <string name="model_field_editor_toggle_sticky">జోడించేటప్పుడు చివరి ఇన్‌పుట్‌ను గుర్తుంచుకోండి</string>
     <string name="model_field_editor_changing">ఖాళీలను నవీకరిస్తోంది</string>
     <string name="model_field_editor_sort_field">ఈ ఫీల్డ్ ద్వారా క్రమబద్ధీకరించు</string>
diff --git a/AnkiDroid/src/main/res/values-tg/03-dialogs.xml b/AnkiDroid/src/main/res/values-tg/03-dialogs.xml
index 5393a2b50b76..6565167a5adc 100644
--- a/AnkiDroid/src/main/res/values-tg/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-tg/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
-    <string name="empty_cards_count">Cards to delete: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-tg/17-model-manager.xml b/AnkiDroid/src/main/res/values-tg/17-model-manager.xml
index 3637310130d9..6b89a122d404 100644
--- a/AnkiDroid/src/main/res/values-tg/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-tg/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Note types must have at least one field</string>
     <string name="toast_empty_name">You must enter a name</string>
     <string name="toast_duplicate_field">Field name already used</string>
-    <string name="toast_out_of_range">You must enter a valid value</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d note type available</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Rename field</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Reposition field</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Updating fields</string>
     <string name="model_field_editor_sort_field">Sort by this field</string>
diff --git a/AnkiDroid/src/main/res/values-tgl/03-dialogs.xml b/AnkiDroid/src/main/res/values-tgl/03-dialogs.xml
index a702086d63a6..fa874d1856f6 100644
--- a/AnkiDroid/src/main/res/values-tgl/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-tgl/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Marapat</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Paghahanap ng mga walang laman na kard&#8230;</string>
-    <string name="empty_cards_count">Mga kard na tatanggalin: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-tgl/17-model-manager.xml b/AnkiDroid/src/main/res/values-tgl/17-model-manager.xml
index 3637310130d9..6b89a122d404 100644
--- a/AnkiDroid/src/main/res/values-tgl/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-tgl/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Note types must have at least one field</string>
     <string name="toast_empty_name">You must enter a name</string>
     <string name="toast_duplicate_field">Field name already used</string>
-    <string name="toast_out_of_range">You must enter a valid value</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d note type available</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Rename field</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Reposition field</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Updating fields</string>
     <string name="model_field_editor_sort_field">Sort by this field</string>
diff --git a/AnkiDroid/src/main/res/values-th/03-dialogs.xml b/AnkiDroid/src/main/res/values-th/03-dialogs.xml
index ac47d28e9b57..4161bf4b46ec 100644
--- a/AnkiDroid/src/main/res/values-th/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-th/03-dialogs.xml
@@ -125,7 +125,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
-    <string name="empty_cards_count">Cards to delete: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-th/17-model-manager.xml b/AnkiDroid/src/main/res/values-th/17-model-manager.xml
index e0897df44907..ebbccce50b08 100644
--- a/AnkiDroid/src/main/res/values-th/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-th/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Note types must have at least one field</string>
     <string name="toast_empty_name">คุณต้องใส่ชื่อ</string>
     <string name="toast_duplicate_field">Field name already used</string>
-    <string name="toast_out_of_range">You must enter a valid value</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="other">%d note types available</item>
@@ -56,7 +55,6 @@
     <string name="model_field_editor_rename">Rename field</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Reposition field</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Updating fields</string>
     <string name="model_field_editor_sort_field">Sort by this field</string>
diff --git a/AnkiDroid/src/main/res/values-ti/03-dialogs.xml b/AnkiDroid/src/main/res/values-ti/03-dialogs.xml
index e759d9d1abfd..4f39a0bafe0a 100644
--- a/AnkiDroid/src/main/res/values-ti/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ti/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
-    <string name="empty_cards_count">Cards to delete: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-ti/17-model-manager.xml b/AnkiDroid/src/main/res/values-ti/17-model-manager.xml
index 3637310130d9..6b89a122d404 100644
--- a/AnkiDroid/src/main/res/values-ti/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ti/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Note types must have at least one field</string>
     <string name="toast_empty_name">You must enter a name</string>
     <string name="toast_duplicate_field">Field name already used</string>
-    <string name="toast_out_of_range">You must enter a valid value</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d note type available</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Rename field</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Reposition field</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Updating fields</string>
     <string name="model_field_editor_sort_field">Sort by this field</string>
diff --git a/AnkiDroid/src/main/res/values-tn/03-dialogs.xml b/AnkiDroid/src/main/res/values-tn/03-dialogs.xml
index e759d9d1abfd..4f39a0bafe0a 100644
--- a/AnkiDroid/src/main/res/values-tn/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-tn/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
-    <string name="empty_cards_count">Cards to delete: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-tn/17-model-manager.xml b/AnkiDroid/src/main/res/values-tn/17-model-manager.xml
index 3637310130d9..6b89a122d404 100644
--- a/AnkiDroid/src/main/res/values-tn/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-tn/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Note types must have at least one field</string>
     <string name="toast_empty_name">You must enter a name</string>
     <string name="toast_duplicate_field">Field name already used</string>
-    <string name="toast_out_of_range">You must enter a valid value</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d note type available</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Rename field</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Reposition field</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Updating fields</string>
     <string name="model_field_editor_sort_field">Sort by this field</string>
diff --git a/AnkiDroid/src/main/res/values-tr/03-dialogs.xml b/AnkiDroid/src/main/res/values-tr/03-dialogs.xml
index e560140c86fb..afb1f2ce69df 100644
--- a/AnkiDroid/src/main/res/values-tr/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-tr/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Sırası gelmiş</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Boş kartlar aranıyor&#8230;</string>
-    <string name="empty_cards_count">Silinecek kartlar %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Mikrofon izni alınamadı.</string>
     <string name="multimedia_editor_failed">Multimedya Düzenleyiciyi açma başarısız oldu</string>
diff --git a/AnkiDroid/src/main/res/values-tr/17-model-manager.xml b/AnkiDroid/src/main/res/values-tr/17-model-manager.xml
index 129e7ac2171e..5b5e30f51361 100644
--- a/AnkiDroid/src/main/res/values-tr/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-tr/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Not türlerinin en az bir alanı olmak zorundadır</string>
     <string name="toast_empty_name">İsim girmeniz gerekiyor</string>
     <string name="toast_duplicate_field">Alan ismi zaten kullanılıyor</string>
-    <string name="toast_out_of_range">Geçerli bir değer girmeniz gerekiyor</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d not türü mevcut</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Alanı yeniden adlandır</string>
     <string name="model_field_editor_language_hint">Klavye dili ipucunu ayarla</string>
     <string name="model_field_editor_reposition_menu">Alanın yerini değiştir</string>
-    <string name="model_field_editor_reposition">Alanın yerini değiştir (%1$d–%2$d arası bir değer girin)</string>
     <string name="model_field_editor_toggle_sticky">Eklerken son girişi hatırla</string>
     <string name="model_field_editor_changing">Alanlar güncelleniyor</string>
     <string name="model_field_editor_sort_field">Bu alana göre sırala</string>
diff --git a/AnkiDroid/src/main/res/values-ts/03-dialogs.xml b/AnkiDroid/src/main/res/values-ts/03-dialogs.xml
index e759d9d1abfd..4f39a0bafe0a 100644
--- a/AnkiDroid/src/main/res/values-ts/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ts/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
-    <string name="empty_cards_count">Cards to delete: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-ts/17-model-manager.xml b/AnkiDroid/src/main/res/values-ts/17-model-manager.xml
index 3637310130d9..6b89a122d404 100644
--- a/AnkiDroid/src/main/res/values-ts/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ts/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Note types must have at least one field</string>
     <string name="toast_empty_name">You must enter a name</string>
     <string name="toast_duplicate_field">Field name already used</string>
-    <string name="toast_out_of_range">You must enter a valid value</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d note type available</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Rename field</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Reposition field</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Updating fields</string>
     <string name="model_field_editor_sort_field">Sort by this field</string>
diff --git a/AnkiDroid/src/main/res/values-tt/03-dialogs.xml b/AnkiDroid/src/main/res/values-tt/03-dialogs.xml
index ed279ff4a58f..54ac21319da2 100644
--- a/AnkiDroid/src/main/res/values-tt/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-tt/03-dialogs.xml
@@ -125,7 +125,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
-    <string name="empty_cards_count">Cards to delete: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-tt/17-model-manager.xml b/AnkiDroid/src/main/res/values-tt/17-model-manager.xml
index fa61a5428763..67ca3da2910a 100644
--- a/AnkiDroid/src/main/res/values-tt/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-tt/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Note types must have at least one field</string>
     <string name="toast_empty_name">You must enter a name</string>
     <string name="toast_duplicate_field">Field name already used</string>
-    <string name="toast_out_of_range">You must enter a valid value</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="other">%d note types available</item>
@@ -56,7 +55,6 @@
     <string name="model_field_editor_rename">Rename field</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Reposition field</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Updating fields</string>
     <string name="model_field_editor_sort_field">Sort by this field</string>
diff --git a/AnkiDroid/src/main/res/values-ug/03-dialogs.xml b/AnkiDroid/src/main/res/values-ug/03-dialogs.xml
index e9989c9c22a1..b7361cfcc174 100644
--- a/AnkiDroid/src/main/res/values-ug/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ug/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">مۆھلەت</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">بوش كارتىنى ئىزدەۋاتىدۇ&#8230;</string>
-    <string name="empty_cards_count">ئۆچۈرىدىغان كارتا: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">مىكروفون ئىجازىتىگە ئېرىشەلمىدى.</string>
     <string name="multimedia_editor_failed">كۆپ ۋاسىتە تەھرىرلىگۈچنى ئاچالمىدى</string>
diff --git a/AnkiDroid/src/main/res/values-ug/17-model-manager.xml b/AnkiDroid/src/main/res/values-ug/17-model-manager.xml
index 0f01045b2360..2dcf9196b77e 100644
--- a/AnkiDroid/src/main/res/values-ug/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ug/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">خاتىرە تۈرىنىڭ كەم دېگەندە بىر  بۆلىكى بولۇشى كېرەك</string>
     <string name="toast_empty_name">ئىسىم چوقۇم كىرگۈزۈلىدۇ</string>
     <string name="toast_duplicate_field">بۆلەك ئاتى ئىشلىتىلگەن</string>
-    <string name="toast_out_of_range">چوقۇم ئىناۋەتلىك قىممەت كىرگۈزۈڭ</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d خاتىرە تۈرى بار</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">بۆلەك ئاتىنى ئۆزگەرت</string>
     <string name="model_field_editor_language_hint">ھەرپتاختا تىل كۆرسەتمىسىنى تەڭشەيدۇ</string>
     <string name="model_field_editor_reposition_menu">بۆلەك ئورنىنى تەڭشەيدۇ</string>
-    <string name="model_field_editor_reposition">بۆلەك ئورنىنى تەڭشەيدۇ (%1$d–%2$d قىممەت كىرگۈزۈلىدۇ)</string>
     <string name="model_field_editor_toggle_sticky">قوشقاندا ئاخىرقى كىرگۈزگەننى ئەستە تۇتىدۇ</string>
     <string name="model_field_editor_changing">بۆلەك يېڭىلا</string>
     <string name="model_field_editor_sort_field">بۇ بۆلەك بويىچە تەرتىپلە</string>
diff --git a/AnkiDroid/src/main/res/values-uk/03-dialogs.xml b/AnkiDroid/src/main/res/values-uk/03-dialogs.xml
index be588ddffcca..038612166c38 100644
--- a/AnkiDroid/src/main/res/values-uk/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-uk/03-dialogs.xml
@@ -137,7 +137,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">На черзі</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Пошук порожніх карток&#8230;</string>
-    <string name="empty_cards_count">Картки до видалення: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Не вдалося отримати дозвіл на використання мікрофона.</string>
     <string name="multimedia_editor_failed">Не вдалося відкрити мультимедійний редактор</string>
diff --git a/AnkiDroid/src/main/res/values-uk/17-model-manager.xml b/AnkiDroid/src/main/res/values-uk/17-model-manager.xml
index 062baeeafdd6..412671fc9dd8 100644
--- a/AnkiDroid/src/main/res/values-uk/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-uk/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Типи записів повинні містити хоча б одне поле</string>
     <string name="toast_empty_name">Необхідно ввести ім\'я</string>
     <string name="toast_duplicate_field">Ім\'я поля вже використовується</string>
-    <string name="toast_out_of_range">Введіть дійсне значення</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d тип записів доступний</item>
@@ -62,7 +61,6 @@
     <string name="model_field_editor_rename">Перейменувати поле</string>
     <string name="model_field_editor_language_hint">Встановлення мови підказок клавіатури</string>
     <string name="model_field_editor_reposition_menu">Перемістити поле</string>
-    <string name="model_field_editor_reposition">Перемістити поле (введіть значення %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Запам\'ятовувати останні вхідні дані під час додавання</string>
     <string name="model_field_editor_changing">Оновлення полів</string>
     <string name="model_field_editor_sort_field">Сортувати за цим полем</string>
diff --git a/AnkiDroid/src/main/res/values-ur/03-dialogs.xml b/AnkiDroid/src/main/res/values-ur/03-dialogs.xml
index d4f8992d62e4..db8645588a28 100644
--- a/AnkiDroid/src/main/res/values-ur/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ur/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">بقایا</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">خالی کارڈز تلاش کیے جا رہے ہیں&#8230;</string>
-    <string name="empty_cards_count">حذف کرنے کے لیے کارڈز: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">مائیکروفون کی اجازت حاصل نہیں کی جا سکی۔</string>
     <string name="multimedia_editor_failed">ملٹی میڈیا ایڈیٹر کھولنے میں ناکام</string>
diff --git a/AnkiDroid/src/main/res/values-ur/17-model-manager.xml b/AnkiDroid/src/main/res/values-ur/17-model-manager.xml
index dd91cf63db9b..4cd47e53b961 100644
--- a/AnkiDroid/src/main/res/values-ur/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ur/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">نوٹ کی قسم میں کم از کم ایک فیلڈ ہونا ضروری ہے</string>
     <string name="toast_empty_name">آپ نام ضرور درج کریں۔</string>
     <string name="toast_duplicate_field">فیلڈ کا نام پہلے ہی استعمال کیا گیا ہے</string>
-    <string name="toast_out_of_range">آپ کو ایک درست قدر درج کرنی ہوگی</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d نوٹ کی قسم دستیاب ہے۔</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">فیلڈ کا نام تبدیل کریں۔</string>
     <string name="model_field_editor_language_hint">کی بورڈ کی زبان کا اشارہ سیٹ کریں</string>
     <string name="model_field_editor_reposition_menu">ریپوزیشن فیلڈ</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">شامل کرتے وقت آخری ان پٹ یاد رکھیں</string>
     <string name="model_field_editor_changing">فیلڈز کو اپ ڈیٹ کرنا</string>
     <string name="model_field_editor_sort_field">اس فیلڈ کے مطابق ترتیب دیں۔</string>
diff --git a/AnkiDroid/src/main/res/values-uz/03-dialogs.xml b/AnkiDroid/src/main/res/values-uz/03-dialogs.xml
index 9f9ec9d876b4..454b6066f43c 100644
--- a/AnkiDroid/src/main/res/values-uz/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-uz/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
-    <string name="empty_cards_count">Cards to delete: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-uz/17-model-manager.xml b/AnkiDroid/src/main/res/values-uz/17-model-manager.xml
index 3637310130d9..6b89a122d404 100644
--- a/AnkiDroid/src/main/res/values-uz/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-uz/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Note types must have at least one field</string>
     <string name="toast_empty_name">You must enter a name</string>
     <string name="toast_duplicate_field">Field name already used</string>
-    <string name="toast_out_of_range">You must enter a valid value</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d note type available</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Rename field</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Reposition field</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Updating fields</string>
     <string name="model_field_editor_sort_field">Sort by this field</string>
diff --git a/AnkiDroid/src/main/res/values-ve/03-dialogs.xml b/AnkiDroid/src/main/res/values-ve/03-dialogs.xml
index e759d9d1abfd..4f39a0bafe0a 100644
--- a/AnkiDroid/src/main/res/values-ve/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ve/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
-    <string name="empty_cards_count">Cards to delete: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-ve/17-model-manager.xml b/AnkiDroid/src/main/res/values-ve/17-model-manager.xml
index 3637310130d9..6b89a122d404 100644
--- a/AnkiDroid/src/main/res/values-ve/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ve/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Note types must have at least one field</string>
     <string name="toast_empty_name">You must enter a name</string>
     <string name="toast_duplicate_field">Field name already used</string>
-    <string name="toast_out_of_range">You must enter a valid value</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d note type available</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Rename field</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Reposition field</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Updating fields</string>
     <string name="model_field_editor_sort_field">Sort by this field</string>
diff --git a/AnkiDroid/src/main/res/values-vi/03-dialogs.xml b/AnkiDroid/src/main/res/values-vi/03-dialogs.xml
index baf51b40d96d..9dbfa521e073 100644
--- a/AnkiDroid/src/main/res/values-vi/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-vi/03-dialogs.xml
@@ -125,7 +125,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Tới hạn</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Đang tìm thẻ rỗng&#8230;</string>
-    <string name="empty_cards_count">Thẻ sẽ được xóa: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Không thể quyền micrô.</string>
     <string name="multimedia_editor_failed">Không mở được Trình chỉnh sửa Đa phương tiện</string>
diff --git a/AnkiDroid/src/main/res/values-vi/17-model-manager.xml b/AnkiDroid/src/main/res/values-vi/17-model-manager.xml
index b1c0a4e97b29..56d485ff02ae 100644
--- a/AnkiDroid/src/main/res/values-vi/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-vi/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Các loại ghi chú phải có ít nhất một trường</string>
     <string name="toast_empty_name">Bạn phải nhập tên</string>
     <string name="toast_duplicate_field">Tên trường đã được sử dụng</string>
-    <string name="toast_out_of_range">Bạn phải nhập một giá trị hợp lệ</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="other">%d loại ghi chú có sẵn</item>
@@ -56,7 +55,6 @@
     <string name="model_field_editor_rename">Đổi tên trường</string>
     <string name="model_field_editor_language_hint">Đặt gợi ý ngôn ngữ bàn phím</string>
     <string name="model_field_editor_reposition_menu">Định vị lại trường</string>
-    <string name="model_field_editor_reposition">Đặt lại vị trí trường (nhập giá trị %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Nhớ quá trình nhập liệu cùng khi thêm</string>
     <string name="model_field_editor_changing">Cập nhật các trường</string>
     <string name="model_field_editor_sort_field">Sắp xếp theo trường này</string>
diff --git a/AnkiDroid/src/main/res/values-wo/03-dialogs.xml b/AnkiDroid/src/main/res/values-wo/03-dialogs.xml
index ac47d28e9b57..4161bf4b46ec 100644
--- a/AnkiDroid/src/main/res/values-wo/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-wo/03-dialogs.xml
@@ -125,7 +125,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
-    <string name="empty_cards_count">Cards to delete: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-wo/17-model-manager.xml b/AnkiDroid/src/main/res/values-wo/17-model-manager.xml
index c776f880d5b2..5fa571a5e4a9 100644
--- a/AnkiDroid/src/main/res/values-wo/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-wo/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Note types must have at least one field</string>
     <string name="toast_empty_name">You must enter a name</string>
     <string name="toast_duplicate_field">Field name already used</string>
-    <string name="toast_out_of_range">You must enter a valid value</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="other">%d note types available</item>
@@ -56,7 +55,6 @@
     <string name="model_field_editor_rename">Rename field</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Reposition field</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Updating fields</string>
     <string name="model_field_editor_sort_field">Sort by this field</string>
diff --git a/AnkiDroid/src/main/res/values-xh/03-dialogs.xml b/AnkiDroid/src/main/res/values-xh/03-dialogs.xml
index e759d9d1abfd..4f39a0bafe0a 100644
--- a/AnkiDroid/src/main/res/values-xh/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-xh/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
-    <string name="empty_cards_count">Cards to delete: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-xh/17-model-manager.xml b/AnkiDroid/src/main/res/values-xh/17-model-manager.xml
index 3637310130d9..6b89a122d404 100644
--- a/AnkiDroid/src/main/res/values-xh/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-xh/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Note types must have at least one field</string>
     <string name="toast_empty_name">You must enter a name</string>
     <string name="toast_duplicate_field">Field name already used</string>
-    <string name="toast_out_of_range">You must enter a valid value</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d note type available</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Rename field</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Reposition field</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Updating fields</string>
     <string name="model_field_editor_sort_field">Sort by this field</string>
diff --git a/AnkiDroid/src/main/res/values-yue/03-dialogs.xml b/AnkiDroid/src/main/res/values-yue/03-dialogs.xml
index b83c08724cfe..b732fb4dbb82 100644
--- a/AnkiDroid/src/main/res/values-yue/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-yue/03-dialogs.xml
@@ -125,7 +125,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
-    <string name="empty_cards_count">Cards to delete: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-yue/17-model-manager.xml b/AnkiDroid/src/main/res/values-yue/17-model-manager.xml
index c776f880d5b2..5fa571a5e4a9 100644
--- a/AnkiDroid/src/main/res/values-yue/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-yue/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Note types must have at least one field</string>
     <string name="toast_empty_name">You must enter a name</string>
     <string name="toast_duplicate_field">Field name already used</string>
-    <string name="toast_out_of_range">You must enter a valid value</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="other">%d note types available</item>
@@ -56,7 +55,6 @@
     <string name="model_field_editor_rename">Rename field</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Reposition field</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Updating fields</string>
     <string name="model_field_editor_sort_field">Sort by this field</string>
diff --git a/AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml b/AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml
index d59d1c8f316b..c17353e03451 100644
--- a/AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml
@@ -125,7 +125,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">待复习</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">正在查找空白卡牌&#8230;</string>
-    <string name="empty_cards_count">将要删除卡牌：%d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">无法获取麦克风权限。</string>
     <string name="multimedia_editor_failed">打开多媒体编辑器失败</string>
diff --git a/AnkiDroid/src/main/res/values-zh-rCN/17-model-manager.xml b/AnkiDroid/src/main/res/values-zh-rCN/17-model-manager.xml
index 538fc0956d97..ffbcc241d21a 100644
--- a/AnkiDroid/src/main/res/values-zh-rCN/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-zh-rCN/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">笔记类型至少需要包含一个字段</string>
     <string name="toast_empty_name">您必须输入一个名称</string>
     <string name="toast_duplicate_field">名称已被其他字段使用</string>
-    <string name="toast_out_of_range">您必须输入一个有效的值</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="other">%d个笔记类型可用</item>
@@ -56,7 +55,6 @@
     <string name="model_field_editor_rename">重命名字段</string>
     <string name="model_field_editor_language_hint">设置键盘语言提示</string>
     <string name="model_field_editor_reposition_menu">修改字段位置</string>
-    <string name="model_field_editor_reposition">修改字段位置(输入%1$d~%2$d的数值)</string>
     <string name="model_field_editor_toggle_sticky">添加时记住上次输入</string>
     <string name="model_field_editor_changing">更新字段</string>
     <string name="model_field_editor_sort_field">按此字段排序</string>
diff --git a/AnkiDroid/src/main/res/values-zh-rTW/03-dialogs.xml b/AnkiDroid/src/main/res/values-zh-rTW/03-dialogs.xml
index 19e708662680..765786a4051d 100644
--- a/AnkiDroid/src/main/res/values-zh-rTW/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-zh-rTW/03-dialogs.xml
@@ -125,7 +125,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">到期</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">正在搜尋空白卡片&#8230;&#8230;</string>
-    <string name="empty_cards_count">將要刪除卡片：%d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">無法取得語音權限</string>
     <string name="multimedia_editor_failed">無法開啟多媒體編輯器</string>
diff --git a/AnkiDroid/src/main/res/values-zh-rTW/17-model-manager.xml b/AnkiDroid/src/main/res/values-zh-rTW/17-model-manager.xml
index 08e4d00ed623..90ea54eef6b2 100644
--- a/AnkiDroid/src/main/res/values-zh-rTW/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-zh-rTW/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">筆記類型至少需要包含一個字段</string>
     <string name="toast_empty_name">您必須輸入一個名稱</string>
     <string name="toast_duplicate_field">名稱已被其他字段使用</string>
-    <string name="toast_out_of_range">您必須輸入一個有效的值</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="other">%d個筆記類型可用</item>
@@ -56,7 +55,6 @@
     <string name="model_field_editor_rename">重新命名欄位</string>
     <string name="model_field_editor_language_hint">選擇鍵盤提示語言</string>
     <string name="model_field_editor_reposition_menu">修改字段位置</string>
-    <string name="model_field_editor_reposition">修改字段位置 (輸入%1$d~%2$d的數值)</string>
     <string name="model_field_editor_toggle_sticky">新增時記住最後輸入</string>
     <string name="model_field_editor_changing">更新欄位</string>
     <string name="model_field_editor_sort_field">按此字段排序</string>
diff --git a/AnkiDroid/src/main/res/values-zu/03-dialogs.xml b/AnkiDroid/src/main/res/values-zu/03-dialogs.xml
index e759d9d1abfd..4f39a0bafe0a 100644
--- a/AnkiDroid/src/main/res/values-zu/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-zu/03-dialogs.xml
@@ -129,7 +129,6 @@
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
-    <string name="empty_cards_count">Cards to delete: %d</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
diff --git a/AnkiDroid/src/main/res/values-zu/17-model-manager.xml b/AnkiDroid/src/main/res/values-zu/17-model-manager.xml
index 3637310130d9..6b89a122d404 100644
--- a/AnkiDroid/src/main/res/values-zu/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-zu/17-model-manager.xml
@@ -33,7 +33,6 @@
     <string name="toast_last_field">Note types must have at least one field</string>
     <string name="toast_empty_name">You must enter a name</string>
     <string name="toast_duplicate_field">Field name already used</string>
-    <string name="toast_out_of_range">You must enter a valid value</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
         <item quantity="one">%d note type available</item>
@@ -58,7 +57,6 @@
     <string name="model_field_editor_rename">Rename field</string>
     <string name="model_field_editor_language_hint">Set keyboard language hint</string>
     <string name="model_field_editor_reposition_menu">Reposition field</string>
-    <string name="model_field_editor_reposition">Reposition field (enter a value %1$d–%2$d)</string>
     <string name="model_field_editor_toggle_sticky">Remember last input when adding</string>
     <string name="model_field_editor_changing">Updating fields</string>
     <string name="model_field_editor_sort_field">Sort by this field</string>

From 3c181efe0b302bf627a2a9d9b05e2eaaf04a964c Mon Sep 17 00:00:00 2001
From: SanjaySargam <sargamsanjaykumar@gmail.com>
Date: Sat, 25 Jan 2025 01:43:28 +0530
Subject: [PATCH 016/200] Add drag-and-drop support for TEXT/CSV/TSV files

---
 .../main/java/com/ichi2/anki/DeckPicker.kt    |  2 +-
 .../main/java/com/ichi2/utils/ImportUtils.kt  | 23 ++++++++++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt b/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
index e3f83f3df7a1..6bc56c6205e5 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
@@ -694,7 +694,7 @@ open class DeckPicker :
 
             try {
                 // Intent is nullable because `clip.getItemAt(0).intent` always returns null
-                ImportUtils.FileImporter().handleContentProviderFile(this, uri)
+                ImportUtils.FileImporter().handleContentProviderFile(this, uri, Intent().setData(uri))
                 onResume()
             } catch (e: Exception) {
                 Timber.w(e)
diff --git a/AnkiDroid/src/main/java/com/ichi2/utils/ImportUtils.kt b/AnkiDroid/src/main/java/com/ichi2/utils/ImportUtils.kt
index e314e374e6df..d45a841af5de 100644
--- a/AnkiDroid/src/main/java/com/ichi2/utils/ImportUtils.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/utils/ImportUtils.kt
@@ -33,6 +33,7 @@ import com.ichi2.anki.R
 import com.ichi2.anki.dialogs.DialogHandler
 import com.ichi2.anki.dialogs.DialogHandlerMessage
 import com.ichi2.anki.dialogs.ImportDialog
+import com.ichi2.anki.onSelectedCsvForImport
 import com.ichi2.anki.showImportDialog
 import com.ichi2.annotations.NeedsTest
 import com.ichi2.compat.CompatHelper
@@ -99,6 +100,22 @@ object ImportUtils {
     fun isFileAValidDeck(fileName: String): Boolean =
         FileImporter.hasExtension(fileName, "apkg") || FileImporter.hasExtension(fileName, "colpkg")
 
+    @NeedsTest("Verify that only valid text or data file MIME types return true")
+    fun isValidTextOrDataFile(
+        context: Context,
+        uri: Uri,
+    ): Boolean {
+        val mimeType = context.contentResolver.getType(uri)
+        return mimeType in
+            listOf(
+                "text/plain",
+                "text/comma-separated-values",
+                "text/tab-separated-values",
+                "text/csv",
+                "text/tsv",
+            )
+    }
+
     @SuppressWarnings("WeakerAccess")
     open class FileImporter {
         /**
@@ -200,7 +217,10 @@ object ImportUtils {
                 }
             }
             val tempOutDir: String
-            if (!isValidPackageName(filename)) {
+            if (isValidTextOrDataFile(context, importPathUri)) {
+                (context as Activity).onSelectedCsvForImport(intent!!)
+                return ImportResult.fromSuccess()
+            } else if (!isValidPackageName(filename)) {
                 return if (isAnkiDatabase(filename)) {
                     // .anki2 files aren't supported by Anki Desktop, we should eventually support them, because we can
                     // but for now, show a "nice" error.
@@ -242,6 +262,7 @@ object ImportUtils {
             return when {
                 isDeckPackage(fileName) -> true
                 isCollectionPackage(fileName) -> true
+                isValidTextOrDataFile(context, importPathUri) -> true
                 else -> false
             }
         }

From f8f2ec9eb235b4c59d41d0adc6b274c7b0114094 Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Wed, 15 Jan 2025 21:06:57 -0300
Subject: [PATCH 017/200] refactor: use Android's minTouchTargetSize

It replaces @dimen/touch_target with a Material standard attribute

It uses @dimen/mtrl_min_touch_target_size by default, which is the same `48dp` of before
---
 .../res/layout/browser_columns_selection_entry.xml     |  4 ++--
 AnkiDroid/src/main/res/layout/note_editor.xml          |  2 +-
 AnkiDroid/src/main/res/layout/reviewer2.xml            |  2 +-
 .../src/main/res/layout/reviewer_answer_buttons.xml    | 10 +++++-----
 AnkiDroid/src/main/res/layout/sync_progress_layout.xml |  4 ++--
 AnkiDroid/src/main/res/values/dimens.xml               |  1 -
 6 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/AnkiDroid/src/main/res/layout/browser_columns_selection_entry.xml b/AnkiDroid/src/main/res/layout/browser_columns_selection_entry.xml
index 9fe0689cb333..f73e0cfab440 100644
--- a/AnkiDroid/src/main/res/layout/browser_columns_selection_entry.xml
+++ b/AnkiDroid/src/main/res/layout/browser_columns_selection_entry.xml
@@ -66,8 +66,8 @@
 
     <androidx.appcompat.widget.AppCompatImageButton
         android:id="@+id/button_toggle_column"
-        android:layout_width="@dimen/touch_target"
-        android:layout_height="@dimen/touch_target"
+        android:layout_width="?minTouchTargetSize"
+        android:layout_height="?minTouchTargetSize"
         style="@android:style/Widget.ActionButton"
         android:padding="8dp"
         tools:srcCompat="@drawable/ic_add"
diff --git a/AnkiDroid/src/main/res/layout/note_editor.xml b/AnkiDroid/src/main/res/layout/note_editor.xml
index fdad897f5833..77709076a8b6 100644
--- a/AnkiDroid/src/main/res/layout/note_editor.xml
+++ b/AnkiDroid/src/main/res/layout/note_editor.xml
@@ -48,7 +48,7 @@
                     <Spinner
                         android:id="@+id/note_type_spinner"
                         android:layout_width="match_parent"
-                        android:layout_height="@dimen/touch_target"
+                        android:layout_height="?minTouchTargetSize"
                         />
                 </LinearLayout>
 
diff --git a/AnkiDroid/src/main/res/layout/reviewer2.xml b/AnkiDroid/src/main/res/layout/reviewer2.xml
index 83c4d909cd9e..44112c4e51cc 100644
--- a/AnkiDroid/src/main/res/layout/reviewer2.xml
+++ b/AnkiDroid/src/main/res/layout/reviewer2.xml
@@ -120,7 +120,7 @@
             android:id="@+id/buttons_area"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:minHeight="@dimen/touch_target"
+            android:minHeight="?minTouchTargetSize"
             android:layout_marginTop="2dp"
             android:layout_marginHorizontal="@dimen/reviewer_side_margin"
             >
diff --git a/AnkiDroid/src/main/res/layout/reviewer_answer_buttons.xml b/AnkiDroid/src/main/res/layout/reviewer_answer_buttons.xml
index 8ce2f4598268..a028d40a6b4e 100644
--- a/AnkiDroid/src/main/res/layout/reviewer_answer_buttons.xml
+++ b/AnkiDroid/src/main/res/layout/reviewer_answer_buttons.xml
@@ -65,7 +65,7 @@
                 android:id="@+id/flashcard_layout_ease1"
                 android:nextFocusRight="@id/flashcard_layout_ease2"
                 android:layout_width="0dip"
-                android:layout_height="@dimen/touch_target"
+                android:layout_height="?minTouchTargetSize"
                 android:layout_weight="1"
                 android:orientation="vertical"
                 android:theme="@style/AgainButton"
@@ -89,7 +89,7 @@
                 android:nextFocusRight="@id/flashcard_layout_ease3"
                 android:nextFocusLeft="@id/flashcard_layout_ease1"
                 android:layout_width="0dip"
-                android:layout_height="@dimen/touch_target"
+                android:layout_height="?minTouchTargetSize"
                 android:layout_weight="1"
                 android:orientation="vertical"
                 android:theme="@style/HardButton"
@@ -113,7 +113,7 @@
                 android:nextFocusRight="@id/flashcard_layout_ease4"
                 android:nextFocusLeft="@id/flashcard_layout_ease2"
                 android:layout_width="0dip"
-                android:layout_height="@dimen/touch_target"
+                android:layout_height="?minTouchTargetSize"
                 android:layout_weight="1"
                 android:orientation="vertical"
                 android:theme="@style/GoodButton"
@@ -136,7 +136,7 @@
                 android:id="@+id/flashcard_layout_ease4"
                 android:nextFocusLeft="@id/flashcard_layout_ease3"
                 android:layout_width="0dip"
-                android:layout_height="@dimen/touch_target"
+                android:layout_height="?minTouchTargetSize"
                 android:layout_weight="1"
                 android:orientation="vertical"
                 android:theme="@style/EasyButton"
@@ -157,7 +157,7 @@
         <FrameLayout
             android:id="@+id/flashcard_layout_flip"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/touch_target"
+            android:layout_height="?minTouchTargetSize"
             android:orientation="vertical"
             android:focusable="true"
             android:background="?attr/hardButtonRef"
diff --git a/AnkiDroid/src/main/res/layout/sync_progress_layout.xml b/AnkiDroid/src/main/res/layout/sync_progress_layout.xml
index 18c3414e24b6..fef37a895075 100644
--- a/AnkiDroid/src/main/res/layout/sync_progress_layout.xml
+++ b/AnkiDroid/src/main/res/layout/sync_progress_layout.xml
@@ -8,8 +8,8 @@
 
     <androidx.appcompat.widget.AppCompatImageButton
         android:id="@+id/button"
-        android:layout_width="@dimen/touch_target"
-        android:layout_height="@dimen/touch_target"
+        android:layout_width="?minTouchTargetSize"
+        android:layout_height="?minTouchTargetSize"
         app:srcCompat="@drawable/ic_sync"
         style="@android:style/Widget.ActionButton"
         android:tooltipText="@string/button_sync"
diff --git a/AnkiDroid/src/main/res/values/dimens.xml b/AnkiDroid/src/main/res/values/dimens.xml
index 246a717470e1..e458b35ddbf6 100644
--- a/AnkiDroid/src/main/res/values/dimens.xml
+++ b/AnkiDroid/src/main/res/values/dimens.xml
@@ -2,7 +2,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources,DuplicateCrowdInStrings">
     <!-- Material UI side margin: http://web.archive.org/web/20180105203433if_/https://material.io/guidelines/layout/metrics-keylines.html#metrics-keylines-keylines-spacing -->
     <dimen name="side_margin">16dp</dimen>
-    <dimen name="touch_target">48dp</dimen>
     <dimen name="default_width">56dp</dimen>
     <dimen name="keyline_1">16dp</dimen>
     <dimen name="study_options_padding">8dp</dimen>

From 7f20a0e712d18062a9d99a290ba271eb808439a6 Mon Sep 17 00:00:00 2001
From: Arman Singh <armansinghof@gmail.com>
Date: Thu, 30 Jan 2025 23:46:00 +0530
Subject: [PATCH 018/200] fix: Card Browser Border and Header Height

* The header is made taller to make it accessible as a tappable element
* The vertical border between columns is removed
  * There was design consensus that this looks better

Fixes 17894
Fixes 17896
---
 .../anki/browser/BrowserMultiColumnAdapter.kt |  4 ----
 .../browser_heading_bottom_divider.xml        | 16 +++++++++++++++
 .../main/res/layout/browser_column_cell.xml   |  2 +-
 .../res/layout/browser_column_divider.xml     | 20 -------------------
 .../res/layout/browser_column_heading.xml     |  5 +++--
 .../src/main/res/layout/card_browser.xml      |  2 +-
 6 files changed, 21 insertions(+), 28 deletions(-)
 create mode 100644 AnkiDroid/src/main/res/drawable/browser_heading_bottom_divider.xml
 delete mode 100644 AnkiDroid/src/main/res/layout/browser_column_divider.xml

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserMultiColumnAdapter.kt b/AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserMultiColumnAdapter.kt
index e1c3567f1287..ea0081d54083 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserMultiColumnAdapter.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserMultiColumnAdapter.kt
@@ -102,10 +102,6 @@ class BrowserMultiColumnAdapter(
                     inflate(R.layout.browser_column_cell).apply {
                         columnViews.add(this as TextView)
                     }
-
-                    if (index <= value) {
-                        inflate(R.layout.browser_column_divider)
-                    }
                 }
 
                 columnViews.forEach { it.setupTextSize() }
diff --git a/AnkiDroid/src/main/res/drawable/browser_heading_bottom_divider.xml b/AnkiDroid/src/main/res/drawable/browser_heading_bottom_divider.xml
new file mode 100644
index 000000000000..598623347511
--- /dev/null
+++ b/AnkiDroid/src/main/res/drawable/browser_heading_bottom_divider.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?attr/colorControlHighlight">
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <solid android:color="@android:color/white" />
+        </shape>
+    </item>
+
+    <item android:gravity="bottom">
+        <shape android:shape="rectangle">
+            <size android:height="1dp" />
+            <solid android:color="?attr/cardBrowserDivider" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/AnkiDroid/src/main/res/layout/browser_column_cell.xml b/AnkiDroid/src/main/res/layout/browser_column_cell.xml
index 6f75fda7214c..058b77e7a39c 100644
--- a/AnkiDroid/src/main/res/layout/browser_column_cell.xml
+++ b/AnkiDroid/src/main/res/layout/browser_column_cell.xml
@@ -18,7 +18,7 @@
     android:layout_width="0dp"
     android:layout_height="match_parent"
     android:layout_weight="1"
-    android:paddingStart="4dp"
+    android:paddingStart="8dp"
     android:paddingVertical="1dp"
     android:layout_gravity="top"
 />
\ No newline at end of file
diff --git a/AnkiDroid/src/main/res/layout/browser_column_divider.xml b/AnkiDroid/src/main/res/layout/browser_column_divider.xml
deleted file mode 100644
index 2cdee641e6aa..000000000000
--- a/AnkiDroid/src/main/res/layout/browser_column_divider.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~  Copyright (c) 2025 David Allison <davidallisongithub@gmail.com>
-  ~
-  ~  This program is free software; you can redistribute it and/or modify it under
-  ~  the terms of the GNU General Public License as published by the Free Software
-  ~  Foundation; either version 3 of the License, or (at your option) any later
-  ~  version.
-  ~
-  ~  This program is distributed in the hope that it will be useful, but WITHOUT ANY
-  ~  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-  ~  PARTICULAR PURPOSE. See the GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License along with
-  ~  this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="0.5dp"
-    android:layout_height="match_parent"
-    android:background="?attr/cardBrowserDivider"/>
diff --git a/AnkiDroid/src/main/res/layout/browser_column_heading.xml b/AnkiDroid/src/main/res/layout/browser_column_heading.xml
index 919b5466f4d9..932df2c8e4de 100644
--- a/AnkiDroid/src/main/res/layout/browser_column_heading.xml
+++ b/AnkiDroid/src/main/res/layout/browser_column_heading.xml
@@ -17,9 +17,10 @@
 <com.ichi2.ui.FixedTextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="0dp"
     android:layout_height="match_parent"
+    android:minHeight="?minTouchTargetSize"
     android:layout_weight="1"
     android:textFontWeight="700"
-    android:paddingStart="4dp"
+    android:paddingStart="8dp"
     android:textAppearance="@style/TextAppearance.AppCompat.Widget.TextView.SpinnerItem"
-    android:layout_gravity="center_vertical"
+    android:gravity="center_vertical"
 />
\ No newline at end of file
diff --git a/AnkiDroid/src/main/res/layout/card_browser.xml b/AnkiDroid/src/main/res/layout/card_browser.xml
index 755bafbadacb..f55d83242882 100644
--- a/AnkiDroid/src/main/res/layout/card_browser.xml
+++ b/AnkiDroid/src/main/res/layout/card_browser.xml
@@ -18,7 +18,7 @@
         <LinearLayout
             android:id="@+id/browser_column_headings"
             android:layout_width="match_parent"
-            android:background="?attr/selectableItemBackground"
+            android:background="@drawable/browser_heading_bottom_divider"
             android:orientation="horizontal"
             android:paddingVertical="2dp"
             android:layout_height="wrap_content"

From fb589176858abbcdd832887633cbece1f2eb1913 Mon Sep 17 00:00:00 2001
From: Ashish Yadav <48384865+criticalAY@users.noreply.github.com>
Date: Sat, 8 Feb 2025 03:18:54 +0530
Subject: [PATCH 019/200] fix: instant note editor tap mode inconsistency

---
 .../InstantNoteEditorActivity.kt              | 26 ++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/instantnoteeditor/InstantNoteEditorActivity.kt b/AnkiDroid/src/main/java/com/ichi2/anki/instantnoteeditor/InstantNoteEditorActivity.kt
index 063320fcdc04..59a5ccc1adaf 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/instantnoteeditor/InstantNoteEditorActivity.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/instantnoteeditor/InstantNoteEditorActivity.kt
@@ -84,7 +84,8 @@ class InstantNoteEditorActivity :
 
     private var dialogView: View? = null
 
-    private var editMode = EditMode.ADVANCED
+    private val editMode: EditMode
+        get() = viewModel.editorMode.value
 
     private lateinit var editModeButton: MaterialButton
 
@@ -217,6 +218,8 @@ class InstantNoteEditorActivity :
             editFieldsLayout?.addView(editField)
         }
 
+        setLayoutVisibility()
+
         instantAlertDialog =
             AlertDialog.Builder(this).show {
                 setView(dialogView)
@@ -304,10 +307,9 @@ class InstantNoteEditorActivity :
         editModeButton.setOnClickListener {
             viewModel.setClozeFieldText(textBox.text.toString())
             when (editMode) {
-                EditMode.SINGLE_TAP -> {
+                EditMode.ADVANCED -> {
                     hideKeyboard()
                     textBox.setText(clozeFieldText)
-                    editMode = EditMode.ADVANCED
                     viewModel.setEditorMode(EditMode.SINGLE_TAP)
                     editModeButton.setIconResource(R.drawable.ic_mode_edit_white)
 
@@ -318,10 +320,9 @@ class InstantNoteEditorActivity :
                     viewModel.setClozeFieldText(textBox.text.toString())
                 }
 
-                EditMode.ADVANCED -> {
-                    viewModel.setEditorMode(EditMode.ADVANCED)
+                EditMode.SINGLE_TAP -> {
                     editModeButton.setIconResource(R.drawable.ic_touch)
-                    editMode = EditMode.SINGLE_TAP
+                    viewModel.setEditorMode(EditMode.ADVANCED)
 
                     singleTapLayout.visibility = View.GONE
                     editFieldsLayout?.visibility = View.VISIBLE
@@ -330,6 +331,19 @@ class InstantNoteEditorActivity :
         }
     }
 
+    private fun setLayoutVisibility() {
+        when (editMode) {
+            EditMode.SINGLE_TAP -> {
+                singleTapLayout.visibility = View.VISIBLE
+                editFieldsLayout?.visibility = View.GONE
+            }
+            EditMode.ADVANCED -> {
+                singleTapLayout.visibility = View.GONE
+                editFieldsLayout?.visibility = View.VISIBLE
+            }
+        }
+    }
+
     private fun hideKeyboard() {
         val inputMethodManager =
             this.getSystemService(Activity.INPUT_METHOD_SERVICE) as InputMethodManager

From 9599a1d5c444d7e3cc2c10ec486b4ce7dc3cc56e Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Sat, 8 Feb 2025 11:38:58 -0300
Subject: [PATCH 020/200] fix(new reviewer): box frame style bottom margin

the bottom margin was removed, but it shouldn't.

The difference is barely noticeable in phones, but it can be easily seen on tablets
---
 .../ui/windows/reviewer/ReviewerFragment.kt   |  7 ++++--
 .../main/java/com/ichi2/anki/utils/Layout.kt  | 23 -------------------
 AnkiDroid/src/main/res/layout/reviewer2.xml   |  1 -
 3 files changed, 5 insertions(+), 26 deletions(-)
 delete mode 100644 AnkiDroid/src/main/java/com/ichi2/anki/utils/Layout.kt

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt
index 0e9f140d3e13..786a4a7e0931 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt
@@ -23,6 +23,7 @@ import android.text.style.UnderlineSpan
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
+import android.view.ViewGroup.MarginLayoutParams
 import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputMethodManager
 import android.webkit.WebView
@@ -104,7 +105,6 @@ import com.ichi2.anki.utils.ext.menu
 import com.ichi2.anki.utils.ext.removeSubMenu
 import com.ichi2.anki.utils.ext.sharedPrefs
 import com.ichi2.anki.utils.ext.window
-import com.ichi2.anki.utils.setMargins
 import com.ichi2.libanki.sched.Counts
 import kotlinx.coroutines.launch
 
@@ -490,7 +490,10 @@ class ReviewerFragment :
     private fun setupFrame(view: View) {
         if (Prefs.frameStyle == FrameStyle.BOX) {
             view.findViewById<MaterialCardView>(R.id.webview_container).apply {
-                setMargins(0)
+                updateLayoutParams<MarginLayoutParams> {
+                    leftMargin = 0
+                    rightMargin = 0
+                }
                 cardElevation = 0F
                 shapeAppearanceModel = ShapeAppearanceModel() // Remove corners
             }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/utils/Layout.kt b/AnkiDroid/src/main/java/com/ichi2/anki/utils/Layout.kt
deleted file mode 100644
index 24f3e2e80e7b..000000000000
--- a/AnkiDroid/src/main/java/com/ichi2/anki/utils/Layout.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) 2025 Brayan Oliveira <brayandso.dev@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3 of the License, or (at your option) any later
- * version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.ichi2.anki.utils
-
-import android.view.ViewGroup.MarginLayoutParams
-import android.widget.FrameLayout
-
-fun FrameLayout.setMargins(value: Int) {
-    (layoutParams as? MarginLayoutParams)?.setMargins(value, value, value, value)
-}
diff --git a/AnkiDroid/src/main/res/layout/reviewer2.xml b/AnkiDroid/src/main/res/layout/reviewer2.xml
index 44112c4e51cc..901646567196 100644
--- a/AnkiDroid/src/main/res/layout/reviewer2.xml
+++ b/AnkiDroid/src/main/res/layout/reviewer2.xml
@@ -121,7 +121,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:minHeight="?minTouchTargetSize"
-            android:layout_marginTop="2dp"
             android:layout_marginHorizontal="@dimen/reviewer_side_margin"
             >
 

From 168cad0f4f9a0e6e5df653ec5137958c2a97fb0b Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Sat, 8 Feb 2025 12:58:41 -0300
Subject: [PATCH 021/200] fix(settings): disable ignoreDisplayCutout when
 necessary

`Ignore display cutout` is only useful if `Hide system bars` is set to something other than `None`
---
 .../anki/preferences/ReviewerOptionsFragment.kt     | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/ReviewerOptionsFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/ReviewerOptionsFragment.kt
index c091c45d7fc4..199d1189d7a0 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/ReviewerOptionsFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/ReviewerOptionsFragment.kt
@@ -16,11 +16,15 @@
 package com.ichi2.anki.preferences
 
 import android.os.Bundle
+import androidx.preference.ListPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
+import androidx.preference.SwitchPreferenceCompat
 import com.ichi2.anki.R
 import com.ichi2.anki.SingleFragmentActivity
 import com.ichi2.anki.preferences.reviewer.ReviewerMenuSettingsFragment
+import com.ichi2.anki.settings.Prefs
+import com.ichi2.anki.settings.enums.HideSystemBars
 
 /**
  * Developer options to test some of the new reviewer settings and features
@@ -51,5 +55,14 @@ class ReviewerOptionsFragment :
             startActivity(intent)
             true
         }
+
+        val ignoreDisplayCutout =
+            requirePreference<SwitchPreferenceCompat>(R.string.ignore_display_cutout_key).apply {
+                isEnabled = Prefs.hideSystemBars != HideSystemBars.NONE
+            }
+
+        requirePreference<ListPreference>(R.string.hide_system_bars_key).setOnPreferenceChangeListener { value ->
+            ignoreDisplayCutout.isEnabled = value != HideSystemBars.NONE.entryValue
+        }
     }
 }

From ce9eb684961fa1a25453d9aecf640131d4b26ffc Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Fri, 7 Feb 2025 12:47:25 -0300
Subject: [PATCH 022/200] fix(sync): notification getting stuck

cancel it after the work is done in case it wasn't dismissed
---
 .../src/main/java/com/ichi2/anki/worker/SyncMediaWorker.kt     | 3 +++
 AnkiDroid/src/main/java/com/ichi2/anki/worker/SyncWorker.kt    | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/worker/SyncMediaWorker.kt b/AnkiDroid/src/main/java/com/ichi2/anki/worker/SyncMediaWorker.kt
index b7fa39238eef..ac636e90afcb 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/worker/SyncMediaWorker.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/worker/SyncMediaWorker.kt
@@ -84,6 +84,9 @@ class SyncMediaWorker(
                 setContentTitle(CollectionManager.TR.syncMediaFailed())
             }
             return Result.failure()
+        } finally {
+            Timber.d("SyncMediaWorker: cancelling notification")
+            notificationManager.cancel(NotificationId.SYNC_MEDIA)
         }
 
         Timber.d("SyncMediaWorker: success")
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/worker/SyncWorker.kt b/AnkiDroid/src/main/java/com/ichi2/anki/worker/SyncWorker.kt
index cbab0b484790..aed0a2be0f7a 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/worker/SyncWorker.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/worker/SyncWorker.kt
@@ -104,6 +104,9 @@ class SyncWorker(
                 setContentTitle(applicationContext.getString(R.string.sync_error))
             }
             return Result.failure()
+        } finally {
+            Timber.d("SyncWorker: cancelling notification")
+            notificationManager.cancel(NotificationId.SYNC)
         }
 
         Timber.d("SyncWorker: success")

From ed1ca6e03be5e7302e1c90c75c2837a14ef0e8a0 Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Fri, 7 Feb 2025 14:25:27 -0300
Subject: [PATCH 023/200] fix(preferences): status bar color

Also make transparent the default color for the status bar in SingleFragmentActivity
---
 AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt   |  3 +++
 .../main/java/com/ichi2/anki/SingleFragmentActivity.kt |  2 ++
 .../src/main/java/com/ichi2/anki/pages/CsvImporter.kt  | 10 ----------
 .../main/java/com/ichi2/anki/pages/ImageOcclusion.kt   |  2 --
 .../src/main/java/com/ichi2/anki/pages/PageFragment.kt |  2 --
 .../src/main/java/com/ichi2/anki/pages/Statistics.kt   |  2 --
 6 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt b/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt
index de109a6c37db..9ab8a77ddfe5 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt
@@ -71,6 +71,7 @@ import androidx.core.util.component1
 import androidx.core.util.component2
 import androidx.core.view.MenuProvider
 import androidx.core.view.OnReceiveContentListener
+import androidx.core.view.WindowInsetsControllerCompat
 import androidx.core.view.isVisible
 import androidx.draganddrop.DropHelper
 import androidx.fragment.app.Fragment
@@ -134,6 +135,7 @@ import com.ichi2.anki.ui.setupNoteTypeSpinner
 import com.ichi2.anki.utils.ext.isImageOcclusion
 import com.ichi2.anki.utils.ext.sharedPrefs
 import com.ichi2.anki.utils.ext.showDialogFragment
+import com.ichi2.anki.utils.ext.window
 import com.ichi2.anki.widgets.DeckDropDownAdapter.SubtitleListener
 import com.ichi2.annotations.NeedsTest
 import com.ichi2.compat.CompatHelper.Companion.getSerializableCompat
@@ -516,6 +518,7 @@ class NoteEditor :
         view: View,
         savedInstanceState: Bundle?,
     ) {
+        WindowInsetsControllerCompat(window, window.decorView).isAppearanceLightStatusBars = false
         @Suppress("deprecation", "API35 properly handle edge-to-edge")
         requireActivity().window.statusBarColor = Themes.getColorFromAttr(requireContext(), R.attr.appBarColor)
         super.onViewCreated(view, savedInstanceState)
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/SingleFragmentActivity.kt b/AnkiDroid/src/main/java/com/ichi2/anki/SingleFragmentActivity.kt
index 8fd72fe824ac..7ecca6d63af6 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/SingleFragmentActivity.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/SingleFragmentActivity.kt
@@ -25,6 +25,7 @@ import androidx.fragment.app.commit
 import com.ichi2.anki.android.input.ShortcutGroup
 import com.ichi2.anki.android.input.ShortcutGroupProvider
 import com.ichi2.anki.dialogs.customstudy.CustomStudyDialog.CustomStudyAction
+import com.ichi2.themes.setTransparentStatusBar
 import com.ichi2.utils.FragmentFactoryUtils
 import timber.log.Timber
 import kotlin.reflect.KClass
@@ -50,6 +51,7 @@ open class SingleFragmentActivity : AnkiActivity() {
             return
         }
         setContentView(R.layout.single_fragment_activity)
+        setTransparentStatusBar()
 
         // avoid recreating the fragment on configuration changes
         // the fragment should handle state restoration
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/pages/CsvImporter.kt b/AnkiDroid/src/main/java/com/ichi2/anki/pages/CsvImporter.kt
index b2cd374ee47a..2589e7ac6fa5 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/pages/CsvImporter.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/pages/CsvImporter.kt
@@ -18,14 +18,12 @@ package com.ichi2.anki.pages
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.view.View
 import android.webkit.WebView
 import androidx.activity.OnBackPressedCallback
 import com.ichi2.anki.CollectionManager
 import com.ichi2.anki.R
 import com.ichi2.anki.SingleFragmentActivity
 import com.ichi2.anki.hideShowButtonCss
-import com.ichi2.themes.setTransparentStatusBar
 
 /**
  * Anki page used to import text/csv files
@@ -46,14 +44,6 @@ class CsvImporter : PageFragment() {
         return CsvImporterWebViewClient(backCallback)
     }
 
-    override fun onViewCreated(
-        view: View,
-        savedInstanceState: Bundle?,
-    ) {
-        super.onViewCreated(view, savedInstanceState)
-        requireActivity().setTransparentStatusBar()
-    }
-
     inner class CsvImporterWebViewClient(
         private val backCallback: OnBackPressedCallback,
     ) : PageWebViewClient() {
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/pages/ImageOcclusion.kt b/AnkiDroid/src/main/java/com/ichi2/anki/pages/ImageOcclusion.kt
index 7c8380c18d0f..b450124a2ff1 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/pages/ImageOcclusion.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/pages/ImageOcclusion.kt
@@ -30,7 +30,6 @@ import com.ichi2.anki.SingleFragmentActivity
 import com.ichi2.anki.dialogs.DiscardChangesDialog
 import com.ichi2.annotations.NeedsTest
 import com.ichi2.libanki.DeckId
-import com.ichi2.themes.setTransparentStatusBar
 import kotlinx.coroutines.launch
 import org.json.JSONObject
 import timber.log.Timber
@@ -41,7 +40,6 @@ class ImageOcclusion : PageFragment(R.layout.image_occlusion) {
         savedInstanceState: Bundle?,
     ) {
         super.onViewCreated(view, savedInstanceState)
-        requireActivity().setTransparentStatusBar()
         with(requireActivity()) {
             onBackPressedDispatcher.addCallback(this) {
                 DiscardChangesDialog.showDialog(this@with) {
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/pages/PageFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/pages/PageFragment.kt
index 6cb97edef933..6c4ca52a3400 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/pages/PageFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/pages/PageFragment.kt
@@ -32,7 +32,6 @@ import com.google.android.material.progressindicator.CircularProgressIndicator
 import com.ichi2.anki.R
 import com.ichi2.anki.SingleFragmentActivity
 import com.ichi2.themes.Themes
-import com.ichi2.themes.setTransparentStatusBar
 import timber.log.Timber
 import kotlin.reflect.KClass
 
@@ -118,7 +117,6 @@ open class PageFragment(
         setupBridgeCommand(pageWebViewClient)
         onWebViewCreated(webView)
 
-        requireActivity().setTransparentStatusBar()
         val arguments = requireArguments()
         val path = requireNotNull(arguments.getString(PATH_ARG_KEY)) { "'$PATH_ARG_KEY' missing" }
         val title = arguments.getString(TITLE_ARG_KEY)
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/pages/Statistics.kt b/AnkiDroid/src/main/java/com/ichi2/anki/pages/Statistics.kt
index d05be8d3feb3..fe80c01dda82 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/pages/Statistics.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/pages/Statistics.kt
@@ -37,7 +37,6 @@ import com.ichi2.anki.utils.getTimestamp
 import com.ichi2.libanki.DeckId
 import com.ichi2.libanki.DeckNameId
 import com.ichi2.libanki.utils.TimeManager
-import com.ichi2.themes.setTransparentStatusBar
 import com.ichi2.utils.BundleUtils.getNullableLong
 
 class Statistics :
@@ -54,7 +53,6 @@ class Statistics :
         super.onViewCreated(view, savedInstanceState)
         webView.isNestedScrollingEnabled = true
 
-        requireActivity().setTransparentStatusBar()
         spinner = view.findViewById(R.id.deck_selector)
         view
             .findViewById<AppBarLayout>(R.id.app_bar)

From 57e107249e30ee4fa142112811eeb0791173f91c Mon Sep 17 00:00:00 2001
From: AnkiDroid Translations <ankidroid@ankidroid.org>
Date: Sun, 9 Feb 2025 13:24:39 +0000
Subject: [PATCH 024/200] Updated strings from Crowdin

---
 AnkiDroid/src/main/res/values-ar/01-core.xml  |  8 ++++----
 .../src/main/res/values-ar/02-strings.xml     | 18 ++++++++---------
 .../src/main/res/values-ar/06-statistics.xml  |  2 +-
 .../src/main/res/values-ar/07-cardbrowser.xml | 20 +++++++++----------
 .../res/values-ar/16-multimedia-editor.xml    |  4 ++--
 5 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/AnkiDroid/src/main/res/values-ar/01-core.xml b/AnkiDroid/src/main/res/values-ar/01-core.xml
index f813e8da71aa..ad2453e54618 100644
--- a/AnkiDroid/src/main/res/values-ar/01-core.xml
+++ b/AnkiDroid/src/main/res/values-ar/01-core.xml
@@ -74,11 +74,11 @@
     </plurals>
     <plurals name="reviewer_window_title_days_new">
         <item quantity="zero">%1$d days %2$dh left</item>
-        <item quantity="one">%1$d day %2$dh left</item>
-        <item quantity="two">%1$d days %2$dh left</item>
+        <item quantity="one">تبقى يوماً %1$d و %2$d ساعة</item>
+        <item quantity="two">تبقى يومين %1$d و %2$d ساعة</item>
         <item quantity="few">%1$d days %2$dh left</item>
         <item quantity="many">%1$d days %2$dh left</item>
-        <item quantity="other">%1$d days %2$dh left</item>
+        <item quantity="other">تبقى %1$d يومًا و %2$d ساعة</item>
     </plurals>
     <string name="no_cards_placeholder_title">المجموعة فارغة</string>
     <string name="no_cards_placeholder_description">ابدأ بإضافة البطاقات\nباستخدام أيقونة +.</string>
@@ -141,7 +141,7 @@
     <string name="empty_deck">هذه الرزمة فارغة</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">بحث عن رزمة</string>
     <string name="invalid_deck_name">اسم رزمة غير صالح</string>
-    <string name="studyoptions_congrats_finished">Congratulations! You have finished for today.</string>
+    <string name="studyoptions_congrats_finished">مبروك! لقد أتممت مهامك لهذا اليوم.</string>
     <string name="studyoptions_congrats_next_due_in" comment="The param will be replaced with \'The next card will be ready in X time\'">انتهت حصتك المحددة من الرزمة  %s</string>
     <string name="studyoptions_no_cards_due">لا توجد بطاقات مستحقة بعد</string>
     <string name="sd_card_not_mounted">لا توجد وحدة تخزين خارجية</string>
diff --git a/AnkiDroid/src/main/res/values-ar/02-strings.xml b/AnkiDroid/src/main/res/values-ar/02-strings.xml
index 55fb3408ba61..cae878827c69 100644
--- a/AnkiDroid/src/main/res/values-ar/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ar/02-strings.xml
@@ -85,14 +85,14 @@
     <string name="custom_study_limit_tags">اقتصر على وسوم معينة</string>
     <plurals name="studyoptions_buried_count">
         <item quantity="zero">+%d buried</item>
-        <item quantity="one">+%d buried</item>
+        <item quantity="one">+ %d مدفونة</item>
         <item quantity="two">+%d buried</item>
         <item quantity="few">+%d buried</item>
         <item quantity="many">+%d buried</item>
         <item quantity="other">+%d buried</item>
     </plurals>
-    <string name="studyoptions_total_new_label">Total new cards</string>
-    <string name="studyoptions_total_label">Total cards</string>
+    <string name="studyoptions_total_new_label">مجموع البطاقات الجديدة</string>
+    <string name="studyoptions_total_label">مجموع البطاقات</string>
     <!-- Card editor -->
     <string name="cardeditor_title_edit_card" maxLength="28">تعديل الملحوظة</string>
     <string name="discard">تجاهل</string>
@@ -292,7 +292,7 @@
     <string name="scoped_storage_learn_more">تعلم المزيد</string>
     <string name="search_card_js_api_no_results">لم يجد البحث أي نتائج</string>
     <!--  JS Addons  -->
-    <string name="not_valid_js_addon_package">%s is not a valid JavaScript addon package</string>
+    <string name="not_valid_js_addon_package">%s ليس حزمة جافا سكريبت صالحة</string>
     <string name="could_not_create_dir">فشل إنشاء المجلد %s</string>
     <string name="malicious_archive_entry_outside">أرشيف خبيث. يحتوي على مدخلة خارج المجلد الهدف: %s</string>
     <string name="malicious_archive_exceeds_limit">أرشيف خبيث. يتخطى الحجم %1$s أو يحتوي على أكثر من %2$d ملف</string>
@@ -321,7 +321,7 @@
     <string name="show_notes" comment="Label for toggle notes button in BrowserOptionsDialog">ملحوظات</string>
     <string name="toggle_cards_notes">تبديل عرض البطاقات/الملحوظات</string>
     <string name="truncate_content_help">حد ارتفاع كل صف من المتصفح لإظهار أول 3 سطور فقط</string>
-    <string name="browser_options_dialog_heading">Browser options</string>
+    <string name="browser_options_dialog_heading">خيارات المتصفح</string>
     <string name="audio_saved">تم حفظ التسجيل</string>
     <string name="deleting_selected_notes">حذف الملحوظات المحددة</string>
     <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        انقر على صوت للاستماع
@@ -356,15 +356,15 @@
     <string name="play_recording">تشغيل</string>
     <string name="next_recording">التالي</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
-    <string name="orphan_note_title">Cannot Delete Card Type</string>
-    <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
+    <string name="orphan_note_title">لا يمكنك حذف البطاقات من هذا النوع</string>
+    <string name="orphan_note_message">حذف هذا النوع من البطاقات سيترك بعض الملحوظات بدون أي بطاقة.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
     <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
-    <string name="select_deck" comment="Description of the shortcut that opens the deck selection dialog">Select deck</string>
+    <string name="select_deck" comment="Description of the shortcut that opens the deck selection dialog">اختر رزمة</string>
     <string name="select_note_type" comment="Description of the shortcut that shows the note selection spinner">Select note type</string>
     <string name="tag_editor" comment="Description of the shortcut that opens the tags dialog">Tag editor</string>
     <string name="card_template_editor_group" comment="Label for the group of shortcuts related to the card template editor">Card Template Editor</string>
@@ -373,7 +373,7 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
+    <string name="show_shortcuts_message">اضغط Alt+K لإظهار اختصارات الكيبورد</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ar/06-statistics.xml b/AnkiDroid/src/main/res/values-ar/06-statistics.xml
index a50118f626c8..95eb7b2acc73 100644
--- a/AnkiDroid/src/main/res/values-ar/06-statistics.xml
+++ b/AnkiDroid/src/main/res/values-ar/06-statistics.xml
@@ -44,5 +44,5 @@
 ~ this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <resources>
-    <string name="open_statistics" comment="Description of the shortcut that opens the statistics page">Open statistics</string>
+    <string name="open_statistics" comment="Description of the shortcut that opens the statistics page">افتح صفحة الاحصائيات</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ar/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-ar/07-cardbrowser.xml
index 92ceec0165df..6b2d7be0ec1e 100644
--- a/AnkiDroid/src/main/res/values-ar/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-ar/07-cardbrowser.xml
@@ -82,11 +82,11 @@
     <string name="card_browser_list_my_searches_new_name">اسم عبارة البحث الحالية</string>
     <string name="card_browser_list_my_searches_new_search_error_empty_name">لا يمكنك حفظ عبارة بحث بدون اسم</string>
     <string name="card_browser_list_my_searches_new_search_error_dup">الاسم موجود</string>
-    <string name="no_note_to_edit">No note to edit</string>
+    <string name="no_note_to_edit">لا يوجد ملحوظات لتعديلها </string>
     <string name="card_browser_list_my_searches_remove_content">هل تريد حذف “%1$s”؟</string>
     <string name="card_browser_change_display_order" maxLength="28">تغيير ترتيب العرض</string>
-    <string name="card_browser_search_hint" comment="Message displayed in the search text field in the card browser.">Search</string>
-    <string name="card_browser_cram_search" maxLength="28" comment="Menu entry to start a search.">Search</string>
+    <string name="card_browser_search_hint" comment="Message displayed in the search text field in the card browser.">بحث</string>
+    <string name="card_browser_cram_search" maxLength="28" comment="Menu entry to start a search.">بحث</string>
     <string name="card_browser_change_display_order_title">اختر ترتيب العرض</string>
     <string name="card_details_tags">وسوم</string>
     <string-array name="card_browser_order_labels">
@@ -134,12 +134,12 @@
     </plurals>
     <!--Keyboard shortcuts dialog-->
     <string name="edit_tags_dialog" comment="Description of the shortcut that opens the edit tags dialog">Edit tags dialog</string>
-    <string name="show_order_dialog" comment="Description of the shortcut that shows the order dialog">Show order dialog</string>
+    <string name="show_order_dialog" comment="Description of the shortcut that shows the order dialog">إظهار مربع حوار الطلب</string>
     <!-- Manage columns dialog -->
-    <string name="browse_manage_columns_main_heading">Columns</string>
-    <string name="browse_manage_columns">Manage columns</string>
-    <string name="user_active_columns">Active</string>
-    <string name="user_potential_columns">Available</string>
-    <string name="include_column">Include column</string>
-    <string name="exclude_column">Exclude column</string>
+    <string name="browse_manage_columns_main_heading">أعمدة </string>
+    <string name="browse_manage_columns">إدارة الأعمدة</string>
+    <string name="user_active_columns">فعال</string>
+    <string name="user_potential_columns">متوفر </string>
+    <string name="include_column">إضافة عمود</string>
+    <string name="exclude_column">استخراج عمود</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ar/16-multimedia-editor.xml b/AnkiDroid/src/main/res/values-ar/16-multimedia-editor.xml
index 730c53900f45..c75fb20fa3b7 100644
--- a/AnkiDroid/src/main/res/values-ar/16-multimedia-editor.xml
+++ b/AnkiDroid/src/main/res/values-ar/16-multimedia-editor.xml
@@ -69,8 +69,8 @@
     <!-- Crop function-->
     <string name="crop_image">هل تريد قص هذه الصورة؟</string>
     <string name="crop_button" maxLength="28">قص الصورة</string>
-    <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
+    <string name="save_dialog_content">حجم الصورة الحالي هو %s ميغابايت. حد الحجم الافتراضي هو 1 ميغابايت. هل تريد ضغطها؟</string>
     <string name="select_image_failed">"فشل تحديد الصورة، الرجاء إعادة المحاولة"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">محتويات الحقل</string>
-    <string name="reselect" maxLength="28">Reselect</string>
+    <string name="reselect" maxLength="28">إعادة الاختيار</string>
 </resources>

From e5f9af17092f0b1f0e96c537fae8ab96b0b27370 Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Sun, 12 Jan 2025 17:39:52 -0300
Subject: [PATCH 025/200] remove `Alt + K` keyboard dialog shortcut

issue 17633
---
 .../main/java/com/ichi2/anki/AnkiActivity.kt  | 39 +------------------
 .../main/java/com/ichi2/anki/CardBrowser.kt   |  4 --
 .../com/ichi2/anki/android/input/Shortcut.kt  | 13 -------
 AnkiDroid/src/main/res/values/02-strings.xml  |  2 -
 .../test/java/com/ichi2/anki/ShortcutTest.kt  | 34 ----------------
 5 files changed, 1 insertion(+), 91 deletions(-)
 delete mode 100644 AnkiDroid/src/test/java/com/ichi2/anki/ShortcutTest.kt

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/AnkiActivity.kt b/AnkiDroid/src/main/java/com/ichi2/anki/AnkiActivity.kt
index bc89e7d2a9cf..11d5d47cab9b 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/AnkiActivity.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/AnkiActivity.kt
@@ -16,7 +16,6 @@ import android.media.AudioManager
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
-import android.view.KeyEvent
 import android.view.KeyboardShortcutGroup
 import android.view.Menu
 import android.view.MenuItem
@@ -47,13 +46,11 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import com.google.android.material.color.MaterialColors
-import com.google.android.material.snackbar.Snackbar
 import com.ichi2.anim.ActivityTransitionAnimation
 import com.ichi2.anim.ActivityTransitionAnimation.Direction
 import com.ichi2.anim.ActivityTransitionAnimation.Direction.DEFAULT
 import com.ichi2.anim.ActivityTransitionAnimation.Direction.NONE
 import com.ichi2.anki.analytics.UsageAnalytics
-import com.ichi2.anki.android.input.Shortcut
 import com.ichi2.anki.android.input.ShortcutGroup
 import com.ichi2.anki.android.input.ShortcutGroupProvider
 import com.ichi2.anki.android.input.shortcut
@@ -658,26 +655,13 @@ open class AnkiActivity :
         super.onProvideKeyboardShortcuts(data, menu, deviceId)
     }
 
-    /**
-     * Shows keyboard shortcuts dialog
-     */
-    fun showKeyboardShortcutsDialog() {
-        val shortcutsGroup = getShortcuts()
-        // Don't show keyboard shortcuts dialog if there is no available shortcuts and also
-        // if there's 1 item because shortcutsGroup always includes generalShortcutGroup.
-        if (shortcutsGroup.size <= 1) return
-        Timber.i("displaying keyboard shortcut screen")
-        requestShowKeyboardShortcuts()
-    }
-
     /**
      * Get current activity keyboard shortcuts
      */
-    fun getShortcuts(): List<KeyboardShortcutGroup> {
+    private fun getShortcuts(): List<KeyboardShortcutGroup> {
         val generalShortcutGroup =
             ShortcutGroup(
                 listOf(
-                    shortcut("Alt+K", R.string.show_keyboard_shortcuts_dialog),
                     shortcut("Ctrl+Z", R.string.undo),
                 ),
                 R.string.pref_cat_general,
@@ -686,27 +670,6 @@ open class AnkiActivity :
         return listOfNotNull(shortcuts?.toShortcutGroup(this), generalShortcutGroup)
     }
 
-    override fun onKeyUp(
-        keyCode: Int,
-        event: KeyEvent,
-    ): Boolean {
-        if (event.isAltPressed && keyCode == KeyEvent.KEYCODE_K) {
-            showKeyboardShortcutsDialog()
-            return true
-        }
-
-        val done = super.onKeyUp(keyCode, event)
-
-        if (done || shortcuts == null) return false
-
-        // Show snackbar only if the current activity have shortcuts, a modifier key is pressed and the keyCode is an unmapped alphabet or num key
-        if (Shortcut.isPotentialShortcutCombination(event, keyCode)) {
-            showSnackbar(R.string.show_shortcuts_message, Snackbar.LENGTH_SHORT)
-            return true
-        }
-        return false
-    }
-
     /**
      * If storage permissions are not granted, shows a toast message and finishes the activity.
      *
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt b/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt
index b64235d6edc1..16c82dc468a5 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt
@@ -654,10 +654,6 @@ open class CardBrowser :
                     Timber.i("Ctrl+K: Toggle Mark")
                     toggleMark()
                     return true
-                } else if (event.isAltPressed) {
-                    Timber.i("Alt+K: Show keyboard shortcuts dialog")
-                    showKeyboardShortcutsDialog()
-                    return true
                 }
             }
             KeyEvent.KEYCODE_R -> {
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/android/input/Shortcut.kt b/AnkiDroid/src/main/java/com/ichi2/anki/android/input/Shortcut.kt
index 0df74146e4a9..884e1d6a6041 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/android/input/Shortcut.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/android/input/Shortcut.kt
@@ -19,7 +19,6 @@ package com.ichi2.anki.android.input
 
 import android.view.KeyEvent
 import android.view.KeyboardShortcutInfo
-import androidx.annotation.CheckResult
 import androidx.annotation.StringRes
 import com.ichi2.anki.AnkiActivityProvider
 import com.ichi2.anki.CollectionManager.TR
@@ -77,18 +76,6 @@ data class Shortcut(
             in "0".."9" -> KeyEvent.KEYCODE_0 + (key.toInt() - 0) // Handle number keys
             else -> KeyEvent.keyCodeFromString(key)
         }
-
-    companion object {
-        @CheckResult
-        fun isPotentialShortcutCombination(
-            event: KeyEvent,
-            keyCode: Int,
-        ): Boolean {
-            if (!(event.isCtrlPressed || event.isAltPressed || event.isMetaPressed)) return false
-            return (keyCode in KeyEvent.KEYCODE_A..KeyEvent.KEYCODE_Z) ||
-                (keyCode in KeyEvent.KEYCODE_NUMPAD_0..KeyEvent.KEYCODE_NUMPAD_9)
-        }
-    }
 }
 
 /**
diff --git a/AnkiDroid/src/main/res/values/02-strings.xml b/AnkiDroid/src/main/res/values/02-strings.xml
index b1633eb806c5..be0b47418a9e 100644
--- a/AnkiDroid/src/main/res/values/02-strings.xml
+++ b/AnkiDroid/src/main/res/values/02-strings.xml
@@ -399,7 +399,6 @@ opening the system text to speech settings fails">
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
 
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -413,7 +412,6 @@ opening the system text to speech settings fails">
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
 
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
 
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ShortcutTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ShortcutTest.kt
deleted file mode 100644
index a5a1a8119a5d..000000000000
--- a/AnkiDroid/src/test/java/com/ichi2/anki/ShortcutTest.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  Copyright (c) 2024 David Allison <davidallisongithub@gmail.com>
- *
- *  This program is free software; you can redistribute it and/or modify it under
- *  the terms of the GNU General Public License as published by the Free Software
- *  Foundation; either version 3 of the License, or (at your option) any later
- *  version.
- *
- *  This program is distributed in the hope that it will be useful, but WITHOUT ANY
- *  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- *  PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with
- *  this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.ichi2.anki
-
-import android.view.KeyEvent
-import com.ichi2.anki.android.input.Shortcut
-import org.mockito.kotlin.mock
-import kotlin.test.Test
-import kotlin.test.assertFalse
-
-class ShortcutTest {
-    val keyEventWithNoModifiers: KeyEvent = mock { }
-
-    @Test
-    fun `single number is not a shortcut hint`() {
-        assertFalse(
-            Shortcut.isPotentialShortcutCombination(keyEventWithNoModifiers, KeyEvent.KEYCODE_NUMPAD_1),
-        )
-    }
-}

From baf31be77302ba256ac20fdd92c67556c2cd3d18 Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Sun, 9 Feb 2025 09:39:10 -0300
Subject: [PATCH 026/200] feat: Show keyboard shortcuts preference

it shows up the system dialog with the available shortcuts if the user has a physical keyboard attached. It helps the discoverability of keyboard shortcuts along the app.

After the user knows that the app has keyboard shortcuts, they can use the system shortcut (which can be seen in the dialog itself) in any other screen to see the available shortcuts there
---
 .../anki/preferences/ControlsSettingsFragment.kt     | 12 ++++++++++++
 AnkiDroid/src/main/res/drawable/ic_keyboard.xml      |  5 +++++
 AnkiDroid/src/main/res/values/10-preferences.xml     |  1 +
 AnkiDroid/src/main/res/values/preferences.xml        |  1 +
 AnkiDroid/src/main/res/xml/preferences_controls.xml  | 11 +++++++++--
 .../ichi2/anki/analytics/PreferencesAnalyticsTest.kt |  1 +
 6 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 AnkiDroid/src/main/res/drawable/ic_keyboard.xml

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/ControlsSettingsFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/ControlsSettingsFragment.kt
index 6e223c9d3dc8..7df837ebf0f0 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/ControlsSettingsFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/ControlsSettingsFragment.kt
@@ -15,7 +15,9 @@
  */
 package com.ichi2.anki.preferences
 
+import android.content.res.Configuration
 import androidx.annotation.StringRes
+import androidx.preference.Preference
 import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.R
 import com.ichi2.anki.cardviewer.ViewerCommand
@@ -41,6 +43,16 @@ class ControlsSettingsFragment : SettingsFragment() {
             .forEach { pref -> pref.value = commands[pref.key]?.defaultValue?.toPreferenceString() }
 
         setDynamicTitle()
+
+        // TODO replace the preference with something dismissible. This is meant only to improve
+        //  the discoverability of the system shortcut for the shortcuts dialog.
+        requirePreference<Preference>(R.string.pref_keyboard_shortcuts_key).apply {
+            isVisible = resources.configuration.keyboard == Configuration.KEYBOARD_QWERTY
+            setOnPreferenceClickListener {
+                requireActivity().requestShowKeyboardShortcuts()
+                true
+            }
+        }
     }
 
     private fun setDynamicTitle() {
diff --git a/AnkiDroid/src/main/res/drawable/ic_keyboard.xml b/AnkiDroid/src/main/res/drawable/ic_keyboard.xml
new file mode 100644
index 000000000000..121be9b643e8
--- /dev/null
+++ b/AnkiDroid/src/main/res/drawable/ic_keyboard.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="?attr/colorControlNormal" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M20,5L4,5c-1.1,0 -1.99,0.9 -1.99,2L2,17c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,7c0,-1.1 -0.9,-2 -2,-2zM11,8h2v2h-2L11,8zM11,11h2v2h-2v-2zM8,8h2v2L8,10L8,8zM8,11h2v2L8,13v-2zM7,13L5,13v-2h2v2zM7,10L5,10L5,8h2v2zM16,17L8,17v-2h8v2zM16,13h-2v-2h2v2zM16,10h-2L14,8h2v2zM19,13h-2v-2h2v2zM19,10h-2L17,8h2v2z"/>
+    
+</vector>
diff --git a/AnkiDroid/src/main/res/values/10-preferences.xml b/AnkiDroid/src/main/res/values/10-preferences.xml
index f94e06889400..c90430f1c029 100644
--- a/AnkiDroid/src/main/res/values/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values/10-preferences.xml
@@ -74,6 +74,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values/preferences.xml b/AnkiDroid/src/main/res/values/preferences.xml
index 763685ea379e..a818352e19fa 100644
--- a/AnkiDroid/src/main/res/values/preferences.xml
+++ b/AnkiDroid/src/main/res/values/preferences.xml
@@ -84,6 +84,7 @@
     <string name="gestures_preference">gestures</string>
     <string name="gestures_corner_touch_preference">gestureCornerTouch</string>
     <string name="nav_drawer_gesture_key">gestureFullScreenNavigationDrawer</string>
+    <string name="pref_keyboard_shortcuts_key">showKeyboardShortcuts</string>
     <string name="pref_swipe_sensitivity_key">swipeSensitivity</string>
     <string name="show_answer_command_key">binding_SHOW_ANSWER</string>
     <string name="answer_again_command_key">binding_FLIP_OR_ANSWER_EASE1</string>
diff --git a/AnkiDroid/src/main/res/xml/preferences_controls.xml b/AnkiDroid/src/main/res/xml/preferences_controls.xml
index 47433f2b0cbc..3cd8bbdec0c5 100644
--- a/AnkiDroid/src/main/res/xml/preferences_controls.xml
+++ b/AnkiDroid/src/main/res/xml/preferences_controls.xml
@@ -20,7 +20,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:title="@string/pref_cat_controls"
-    android:key="@string/pref_controls_screen_key">
+    android:key="@string/pref_controls_screen_key"
+    tools:context=".preferences.ControlsSettingsFragment">
 
     <SwitchPreferenceCompat
         android:defaultValue="false"
@@ -48,7 +49,13 @@
         android:defaultValue="100"
         android:valueFrom="20"
         android:valueTo="180"
-        app:displayValue="true"/>
+        app:displayValue="true" />
+
+    <Preference
+        android:key="@string/pref_keyboard_shortcuts_key"
+        android:title="@string/show_keyboard_shortcuts"
+        android:icon="@drawable/ic_keyboard"
+        />
 
     <PreferenceCategory android:title="@string/answer_buttons">
         <com.ichi2.preferences.ControlPreference
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/analytics/PreferencesAnalyticsTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/analytics/PreferencesAnalyticsTest.kt
index 48b9842f310a..94d5e1227fc9 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/analytics/PreferencesAnalyticsTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/analytics/PreferencesAnalyticsTest.kt
@@ -66,6 +66,7 @@ class PreferencesAnalyticsTest : RobolectricTest() {
             // Preferences that only click: don't have a value
             R.string.tts_key, // tts
             R.string.pref_reset_languages_key, // resetLanguages
+            R.string.pref_keyboard_shortcuts_key, // showKeyboardShortcuts
             // Opens App Bar buttons fragment
             R.string.custom_buttons_link_preference, // custom_buttons_link
             // Opens Custom sync server fragment

From 1e0af2cc2f001386a44aebca3030b609dfa01495 Mon Sep 17 00:00:00 2001
From: AnkiDroid Translations <ankidroid@ankidroid.org>
Date: Sun, 9 Feb 2025 14:35:17 +0000
Subject: [PATCH 027/200] Updated strings from Crowdin

---
 AnkiDroid/src/main/res/values-af/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-af/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-am/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-am/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-ar/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-ar/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-az/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-az/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-be/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-be/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-bg/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-bg/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-bn/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-bn/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-ca/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-ca/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-ckb/02-strings.xml        | 2 --
 AnkiDroid/src/main/res/values-ckb/10-preferences.xml    | 1 +
 AnkiDroid/src/main/res/values-cs/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-cs/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-da/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-da/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-de/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-de/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-el/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-el/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-eo/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-eo/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-es-rAR/02-strings.xml     | 2 --
 AnkiDroid/src/main/res/values-es-rAR/10-preferences.xml | 1 +
 AnkiDroid/src/main/res/values-es-rES/02-strings.xml     | 2 --
 AnkiDroid/src/main/res/values-es-rES/10-preferences.xml | 1 +
 AnkiDroid/src/main/res/values-et/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-et/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-eu/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-eu/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-fa/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-fa/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-fi/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-fi/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-fil/02-strings.xml        | 2 --
 AnkiDroid/src/main/res/values-fil/10-preferences.xml    | 1 +
 AnkiDroid/src/main/res/values-fr/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-fr/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-fy/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-fy/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-ga/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-ga/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-gl/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-gl/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-got/02-strings.xml        | 2 --
 AnkiDroid/src/main/res/values-got/10-preferences.xml    | 1 +
 AnkiDroid/src/main/res/values-gu/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-gu/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-heb/02-strings.xml        | 2 --
 AnkiDroid/src/main/res/values-heb/10-preferences.xml    | 1 +
 AnkiDroid/src/main/res/values-hi/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-hi/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-hr/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-hr/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-hu/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-hu/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-hy/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-hy/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-ind/02-strings.xml        | 2 --
 AnkiDroid/src/main/res/values-ind/10-preferences.xml    | 1 +
 AnkiDroid/src/main/res/values-is/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-is/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-it/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-it/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-iw/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-iw/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-ja/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-ja/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-jv/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-jv/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-ka/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-ka/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-kk/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-kk/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-km/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-km/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-kn/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-kn/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-ko/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-ko/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-ku/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-ku/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-ky/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-ky/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-lt/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-lt/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-lv/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-lv/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-mk/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-mk/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-ml/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-ml/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-mn/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-mn/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-mr/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-mr/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-ms/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-ms/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-my/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-my/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-nl/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-nl/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-nn/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-nn/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-no/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-no/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-or/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-or/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-pa/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-pa/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-pl/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-pl/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml     | 2 --
 AnkiDroid/src/main/res/values-pt-rBR/10-preferences.xml | 1 +
 AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml     | 2 --
 AnkiDroid/src/main/res/values-pt-rPT/10-preferences.xml | 1 +
 AnkiDroid/src/main/res/values-ro/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-ro/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-ru/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-ru/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-sat/02-strings.xml        | 2 --
 AnkiDroid/src/main/res/values-sat/10-preferences.xml    | 1 +
 AnkiDroid/src/main/res/values-sc/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-sc/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-sk/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-sk/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-sl/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-sl/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-sq/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-sq/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-sr/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-sr/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-ss/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-ss/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-sv/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-sv/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-sw/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-sw/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-ta/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-ta/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-te/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-te/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-tg/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-tg/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-tgl/02-strings.xml        | 2 --
 AnkiDroid/src/main/res/values-tgl/10-preferences.xml    | 1 +
 AnkiDroid/src/main/res/values-th/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-th/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-ti/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-ti/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-tn/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-tn/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-tr/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-tr/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-ts/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-ts/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-tt/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-tt/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-ug/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-ug/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-uk/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-uk/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-ur/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-ur/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-uz/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-uz/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-ve/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-ve/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-vi/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-vi/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-wo/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-wo/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-xh/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-xh/10-preferences.xml     | 1 +
 AnkiDroid/src/main/res/values-yue/02-strings.xml        | 2 --
 AnkiDroid/src/main/res/values-yue/10-preferences.xml    | 1 +
 AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml     | 2 --
 AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml | 1 +
 AnkiDroid/src/main/res/values-zh-rTW/02-strings.xml     | 2 --
 AnkiDroid/src/main/res/values-zh-rTW/10-preferences.xml | 1 +
 AnkiDroid/src/main/res/values-zu/02-strings.xml         | 2 --
 AnkiDroid/src/main/res/values-zu/10-preferences.xml     | 1 +
 188 files changed, 94 insertions(+), 188 deletions(-)

diff --git a/AnkiDroid/src/main/res/values-af/02-strings.xml b/AnkiDroid/src/main/res/values-af/02-strings.xml
index 173e3fa907bf..00b1ee0167b9 100644
--- a/AnkiDroid/src/main/res/values-af/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-af/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">Die verwydering van hierdie kaarttipe sal sommige notas sonder enige kaarte laat.</string>
     <string name="voice_not_supported">Stem word nie ondersteun nie. Probeer \'n ander of installeer \'n stem-enjin</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Wys sleutelbordkortpaaie dialoog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Pak-Selektor</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Verwyder dek sonder bevestiging</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">NotaRedakteur</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Wysig stilering</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Kopieer sjabloon as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Wysig kaartblaaier voorkoms</string>
-    <string name="show_shortcuts_message">Druk Alt+K om sleutelbordkortpaaie te wys</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">Gebruikerhandeling %s is nie in hierdie notatipe gestel nie. Stel dit asseblief op</string>
     <string name="directory_inaccessible_info">Lees meer oor hoe om toegang hier te herstel %s of gaan na instellings om versameling vouer op te dateer.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-af/10-preferences.xml b/AnkiDroid/src/main/res/values-af/10-preferences.xml
index 9e46aa0e97f6..bc44eda2bc86 100644
--- a/AnkiDroid/src/main/res/values-af/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-af/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-am/02-strings.xml b/AnkiDroid/src/main/res/values-am/02-strings.xml
index e0c971192ee7..a86dedce299e 100644
--- a/AnkiDroid/src/main/res/values-am/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-am/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-am/10-preferences.xml b/AnkiDroid/src/main/res/values-am/10-preferences.xml
index 405cc5ef8676..e17a1240c9b2 100644
--- a/AnkiDroid/src/main/res/values-am/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-am/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-ar/02-strings.xml b/AnkiDroid/src/main/res/values-ar/02-strings.xml
index cae878827c69..9afef1f578c5 100644
--- a/AnkiDroid/src/main/res/values-ar/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ar/02-strings.xml
@@ -360,7 +360,6 @@
     <string name="orphan_note_message">حذف هذا النوع من البطاقات سيترك بعض الملحوظات بدون أي بطاقة.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -373,7 +372,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">اضغط Alt+K لإظهار اختصارات الكيبورد</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ar/10-preferences.xml b/AnkiDroid/src/main/res/values-ar/10-preferences.xml
index 8ebf298363a8..ff11a88db0a2 100644
--- a/AnkiDroid/src/main/res/values-ar/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ar/10-preferences.xml
@@ -101,6 +101,7 @@
     <string name="gestures_summ">تعيين إيماءات إلى إجراءات مثل إجابة البطاقات وتحريرها.</string>
     <string name="gestures_corner_touch" maxLength="41">لمس بحجم 9 نقاط</string>
     <string name="gestures_corner_touch_summary">السماح بإيماءات اللمس في حواف الشاشة</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">قائمة تجول ملء الشاشة</string>
     <string name="gestures_fullscreen_nav_drawer_summary">فتح قائمة التجول عند السحب لليمين من أي مكان في الشاشة</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">لا شَيْء</string>
diff --git a/AnkiDroid/src/main/res/values-az/02-strings.xml b/AnkiDroid/src/main/res/values-az/02-strings.xml
index e00a1e228734..8e2ca32d2de3 100644
--- a/AnkiDroid/src/main/res/values-az/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-az/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-az/10-preferences.xml b/AnkiDroid/src/main/res/values-az/10-preferences.xml
index e1b54b987803..8065f6b15c1d 100644
--- a/AnkiDroid/src/main/res/values-az/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-az/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-be/02-strings.xml b/AnkiDroid/src/main/res/values-be/02-strings.xml
index b1a5533ccd2b..8a8441957501 100644
--- a/AnkiDroid/src/main/res/values-be/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-be/02-strings.xml
@@ -344,7 +344,6 @@
     <string name="orphan_note_message">Выдаленне гэтага тыпу карткі пакіне некаторыя нататкі без ніводнай карткі.</string>
     <string name="voice_not_supported">Падтрымка голасу адсутнічае. Паспрабуйце іншы рухавік голасу або пераўсталюйце бягучы.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Паказаць дыялогавае акно з камбінацыямі клавіш</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Выбар калоды</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Выдаліць калоду без пацвярджэння</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Рэдактар запісу</string>
@@ -357,7 +356,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Рэдагаваць стыль</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Капіяваць стыль як разметку</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Рэдагаваць выгляд браўзера</string>
-    <string name="show_shortcuts_message">Націсніце Alt+K, каб убачыць спалучэнні клавіш</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-be/10-preferences.xml b/AnkiDroid/src/main/res/values-be/10-preferences.xml
index a102939335ae..2f26fbe1f595 100644
--- a/AnkiDroid/src/main/res/values-be/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-be/10-preferences.xml
@@ -99,6 +99,7 @@
     <string name="gestures_summ">Прызначыць жэсты для такіх дзеянняў, як адказ і рэдагаванне картак.</string>
     <string name="gestures_corner_touch" maxLength="41">9-пунктавы дотык</string>
     <string name="gestures_corner_touch_summary">Дазволіць сэнсарныя жэсты ў вуглах экрана</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Поўнаэкранная панэль навігацыі</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Адкрываць навігацыйную панэль пры правядзенні ўправа ў любым месцы экрана.</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Няма</string>
diff --git a/AnkiDroid/src/main/res/values-bg/02-strings.xml b/AnkiDroid/src/main/res/values-bg/02-strings.xml
index 446e29489d19..c98e752b53f4 100644
--- a/AnkiDroid/src/main/res/values-bg/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-bg/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-bg/10-preferences.xml b/AnkiDroid/src/main/res/values-bg/10-preferences.xml
index 00ea5a48922b..3bb5e020f5fe 100644
--- a/AnkiDroid/src/main/res/values-bg/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-bg/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Използване на жестове за такива действия като отговор и редактиране на карти.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-bn/02-strings.xml b/AnkiDroid/src/main/res/values-bn/02-strings.xml
index 6650e6b1d34f..b5ade427404c 100644
--- a/AnkiDroid/src/main/res/values-bn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-bn/02-strings.xml
@@ -330,7 +330,6 @@
     <string name="orphan_note_message">এই কার্ডের ধরন মুছে ফেলার ফলে কোনো কার্ড ছাড়াই কিছু নোট চলে যাবে।</string>
     <string name="voice_not_supported">ভয়েস সমর্থিত নয়। অন্য একটি চেষ্টা করুন বা একটি ভয়েস ইঞ্জিন ইনস্টল করুন৷</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">কীবোর্ড শর্টকাট ডায়ালগ দেখান</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">ডেক পিকার</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">নিশ্চিতকরণ ছাড়াই ডেক মুছুন</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">নোট সম্পাদক</string>
@@ -343,7 +342,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">স্টাইলিং সম্পাদনা করুন</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">টেমপ্লেটটিকে মার্কডাউন হিসাবে অনুলিপি করুন</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">ব্রাউজারের চেহারা সম্পাদনা করুন</string>
-    <string name="show_shortcuts_message">কীবোর্ড শর্টকাট দেখাতে Alt+K টিপুন</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">এই নোটের প্রকারে ব্যবহারকারীর ক্রিয়া %s সেট নেই। এটি কনফিগার করুন</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-bn/10-preferences.xml b/AnkiDroid/src/main/res/values-bn/10-preferences.xml
index 832389742366..61101dd5567f 100644
--- a/AnkiDroid/src/main/res/values-bn/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-bn/10-preferences.xml
@@ -98,6 +98,7 @@
     <string name="gestures_summ">উত্তর দেওয়া এবং কার্ড সম্পাদনা করার মতো কাজে অঙ্গভঙ্গি বরাদ্দ করুন।</string>
     <string name="gestures_corner_touch" maxLength="41">9-পয়েন্ট স্পর্শ</string>
     <string name="gestures_corner_touch_summary">স্ক্রিনের কোণে স্পর্শ অঙ্গভঙ্গির অনুমতি দিন</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">ফুল স্ক্রিন নেভিগেশন ড্রয়ার</string>
     <string name="gestures_fullscreen_nav_drawer_summary">স্ক্রিনের যেকোনো জায়গা থেকে ডানদিকে সোয়াইপ করলে নেভিগেশন ড্রয়ার খুলে যায়</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">তাদের কেউ না</string>
diff --git a/AnkiDroid/src/main/res/values-ca/02-strings.xml b/AnkiDroid/src/main/res/values-ca/02-strings.xml
index b0d860cb75cd..55f3b236ec60 100644
--- a/AnkiDroid/src/main/res/values-ca/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ca/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Editor de notes</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ca/10-preferences.xml b/AnkiDroid/src/main/res/values-ca/10-preferences.xml
index 20241ac8ee6a..783c83469af3 100644
--- a/AnkiDroid/src/main/res/values-ca/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ca/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Assignar gestos a accions com cartes de resposta i d\'edició.</string>
     <string name="gestures_corner_touch" maxLength="41">Tacte de 9 punts</string>
     <string name="gestures_corner_touch_summary">Permet gestos tàctils a les cantonades de la pantalla</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Carpeta de navegació a pantalla completa</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Obriu la carpeta de navegació quan llisqueu a la dreta des de qualsevol lloc de la pantalla</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Cap</string>
diff --git a/AnkiDroid/src/main/res/values-ckb/02-strings.xml b/AnkiDroid/src/main/res/values-ckb/02-strings.xml
index f5317f409b3c..bf0167b55ac7 100644
--- a/AnkiDroid/src/main/res/values-ckb/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ckb/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ckb/10-preferences.xml b/AnkiDroid/src/main/res/values-ckb/10-preferences.xml
index c3baeae1db45..03744990f8ef 100644
--- a/AnkiDroid/src/main/res/values-ckb/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ckb/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-cs/02-strings.xml b/AnkiDroid/src/main/res/values-cs/02-strings.xml
index ee38b2198bb6..63ce62178b7e 100644
--- a/AnkiDroid/src/main/res/values-cs/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-cs/02-strings.xml
@@ -348,7 +348,6 @@
     <string name="orphan_note_message">Smazání tohoto typu karty zanechá některé poznámky bez jakýchkoliv karet.</string>
     <string name="voice_not_supported">Hlas není podporován. Zkuste jiný nebo nainstalujte hlasový modul.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Výběr balíčků</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -361,7 +360,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">Akce uživatele %s není v tomto typu poznámky nastavena. Nakonfigurujte ji prosím</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-cs/10-preferences.xml b/AnkiDroid/src/main/res/values-cs/10-preferences.xml
index 4e64a9d8da8b..f305d8d1359e 100644
--- a/AnkiDroid/src/main/res/values-cs/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-cs/10-preferences.xml
@@ -99,6 +99,7 @@
     <string name="gestures_summ">Přiřazení gest akcím, jako je odpovídání a úprava karet</string>
     <string name="gestures_corner_touch" maxLength="41">Devítibodový dotyk</string>
     <string name="gestures_corner_touch_summary">Povolí dotyková gesta v rozích obrazovky</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Navigační menu v režimu celé obrazovky</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Otevřít navigační menu, když se táhne doprava kdekoliv na obrazovce</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Žádné</string>
diff --git a/AnkiDroid/src/main/res/values-da/02-strings.xml b/AnkiDroid/src/main/res/values-da/02-strings.xml
index 3b1587a83e89..9098e4dd1f79 100644
--- a/AnkiDroid/src/main/res/values-da/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-da/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-da/10-preferences.xml b/AnkiDroid/src/main/res/values-da/10-preferences.xml
index 87663f1f6c93..8acca7451601 100644
--- a/AnkiDroid/src/main/res/values-da/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-da/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-de/02-strings.xml b/AnkiDroid/src/main/res/values-de/02-strings.xml
index 6964cf49153d..e06bb0b7440b 100644
--- a/AnkiDroid/src/main/res/values-de/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-de/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">Das Löschen dieses Kartentyps wird einige Notizen ohne Karten hinterlassen.</string>
     <string name="voice_not_supported">Stimme nicht unterstützt. Versuchen Sie eine andere oder installieren Sie eine Sprach-Engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Tastenkombinationen-Dialog anzeigen</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Stapelauswähler</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Stapel ohne Bestätigung löschen</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Notizeditors</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Stil bearbeiten</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Template als markdown kopieren</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Browser-erscheinungsbild bearbeiten</string>
-    <string name="show_shortcuts_message">Drücken Sie Alt+K, um tastenkombinationen anzuzeigen</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">Benutzeraktion %s ist in diesem notiztyp nicht festgelegt. Bitte konfigurieren Sie es</string>
     <string name="directory_inaccessible_info">Erfahren Sie hier %s mehr darüber, wie Sie den Zugriff wiederherstellen können, oder gehen Sie zu den Einstellungen, um den Sammlungsordner zu aktualisieren.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-de/10-preferences.xml b/AnkiDroid/src/main/res/values-de/10-preferences.xml
index 113b05defdf9..ebca1adcae1a 100644
--- a/AnkiDroid/src/main/res/values-de/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-de/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Weise Aktionen, wie zum Beispiel Beantworten oder Bearbeiten der Karten, Gesten zu.</string>
     <string name="gestures_corner_touch" maxLength="41">9-Punkt-Berührung</string>
     <string name="gestures_corner_touch_summary">Berührungsgesten in Bildschirmecken erlauben</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Vollbild-Navigationsleiste</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Navigationsleiste öffnen, wenn rechts von überall auf dem Bildschirm gewischt wird</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Keine</string>
diff --git a/AnkiDroid/src/main/res/values-el/02-strings.xml b/AnkiDroid/src/main/res/values-el/02-strings.xml
index d2dfce556e2b..8b7ff2dfab9d 100644
--- a/AnkiDroid/src/main/res/values-el/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-el/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">Διαγράφοντας αυτόν τον τύπο κάρτας θα αφήσετε κάποιες σημειώσεις χωρίς κάρτες.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Εμφάνιση διαλόγου συντομεύσεων πληκτρολογίου</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Διαγραφή τράπουλας χωρίς επιβεβαίωση</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Επεξεργασία Σημείωσης</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Επεξεργασία μορφοποίησης</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Επεξεργασία εμφάνισης περιηγητή</string>
-    <string name="show_shortcuts_message">Πατήστε Alt+K για να εμφανίσετε συντομεύσεις πληκτρολογίου</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-el/10-preferences.xml b/AnkiDroid/src/main/res/values-el/10-preferences.xml
index ac6e0caa6f75..2dc449912605 100644
--- a/AnkiDroid/src/main/res/values-el/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-el/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">Αφή 9 σημείων</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-eo/02-strings.xml b/AnkiDroid/src/main/res/values-eo/02-strings.xml
index 1d88f9b09982..36320a96c307 100644
--- a/AnkiDroid/src/main/res/values-eo/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-eo/02-strings.xml
@@ -330,7 +330,6 @@
     <string name="orphan_note_message">Forigi tiun ĉi kart-tipon kaŭzos, ke kelkaj notoj havos neniun karton.</string>
     <string name="voice_not_supported">Voĉo ne estas subtenata. Elektu alian aŭ instalu parolsintezilon.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Montri la ekranon “ŝparklavoj”</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Kartar-elektilo</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Forigi kartaron senkonfirme</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Redaktilo de notoj</string>
@@ -343,7 +342,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Redakti stilon</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Kopii ŝablonon kiel Markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Redakti aspekton de kart-foliumilo</string>
-    <string name="show_shortcuts_message">Premu Alt+K por montri ŝparklavojn</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">La ago de uzanto “%s” ne estas agordita por tiu ĉi nototipo. Agordu ĝin.</string>
     <string name="directory_inaccessible_info">Sciiĝu pli pri kiel restarigi aliron ĉe %s aŭ malfermu agordojn kaj ŝanĝu la dosierujon por kolekto.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-eo/10-preferences.xml b/AnkiDroid/src/main/res/values-eo/10-preferences.xml
index 9eef089a5b50..18f975a55952 100644
--- a/AnkiDroid/src/main/res/values-eo/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-eo/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Asigni gestojn al agoj, kiel respondi aŭ redakti karton.</string>
     <string name="gestures_corner_touch" maxLength="41">9-punkta frapeto</string>
     <string name="gestures_corner_touch_summary">Ebligi gestojn en anguloj de la ekrano</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Naviga tirmenuo sur plenekrano</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Malfermi navigan tirmenuon per ŝovumi dekstren sur la plenekrano</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Neniu</string>
diff --git a/AnkiDroid/src/main/res/values-es-rAR/02-strings.xml b/AnkiDroid/src/main/res/values-es-rAR/02-strings.xml
index 173ff3d56a8d..0a6c45396b8a 100644
--- a/AnkiDroid/src/main/res/values-es-rAR/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-es-rAR/02-strings.xml
@@ -335,7 +335,6 @@
     <string name="orphan_note_message">Eliminar este tipo de tarjeta dejará algunas notas sin ninguna tarjeta.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Mostrar diálogo de atajos de teclado</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Selector de Mazos</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Eliminar mazo sin confirmación</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Editor de Notas</string>
@@ -348,7 +347,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Editar estilo</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copiar plantilla como markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Editar apariencia del navegador</string>
-    <string name="show_shortcuts_message">Presiona Alt+K para mostrar los atajos del teclado</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">La acción del usuario %s no está establecida en este tipo de notas. Por favor, configúrala</string>
     <string name="directory_inaccessible_info">Obtén más información sobre cómo restaurar el acceso aquí %s o ve a la configuración para actualizar la carpeta de colección.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-es-rAR/10-preferences.xml b/AnkiDroid/src/main/res/values-es-rAR/10-preferences.xml
index 0e70569e3799..1812f53607ca 100644
--- a/AnkiDroid/src/main/res/values-es-rAR/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-es-rAR/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Asignar gestos a acciones tales como contestar o editar tarjetas.</string>
     <string name="gestures_corner_touch" maxLength="41">Toque de 9 puntos</string>
     <string name="gestures_corner_touch_summary">Permitir gestos táctiles en las esquinas de pantalla</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Panel de navegación a pantalla completa</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Abrir el panel de navegación cuando se desliza a la derecha desde cualquier lugar de la pantalla</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Ninguno</string>
diff --git a/AnkiDroid/src/main/res/values-es-rES/02-strings.xml b/AnkiDroid/src/main/res/values-es-rES/02-strings.xml
index b96eb3f63a37..58b0c40c2df8 100644
--- a/AnkiDroid/src/main/res/values-es-rES/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-es-rES/02-strings.xml
@@ -335,7 +335,6 @@
     <string name="orphan_note_message">Eliminar este tipo de tarjeta dejará algunas notas sin ninguna tarjeta.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Mostrar diálogo de atajos de teclado</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Selector de Mazos</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Eliminar mazo sin confirmación</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Editor de Notas</string>
@@ -348,7 +347,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Editar estilo</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copiar plantilla como markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Editar apariencia del navegador</string>
-    <string name="show_shortcuts_message">Presiona Alt+K para mostrar los atajos del teclado</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">La acción del usuario %s no está establecida en este tipo de notas. Por favor, configúrala</string>
     <string name="directory_inaccessible_info">Obtén más información sobre cómo restaurar el acceso aquí %s o ve a la configuración para actualizar la carpeta de colección.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-es-rES/10-preferences.xml b/AnkiDroid/src/main/res/values-es-rES/10-preferences.xml
index 4dfd177470be..65d807bcc812 100644
--- a/AnkiDroid/src/main/res/values-es-rES/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-es-rES/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Asignar gestos a acciones tales como contestar o editar tarjetas.</string>
     <string name="gestures_corner_touch" maxLength="41">Toque de 9 puntos</string>
     <string name="gestures_corner_touch_summary">Permitir gestos táctiles en las esquinas de pantalla</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Panel de navegación a pantalla completa</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Abrir el cajón de navegación cuando se desliza a la derecha desde cualquier lugar de la pantalla</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Ninguno</string>
diff --git a/AnkiDroid/src/main/res/values-et/02-strings.xml b/AnkiDroid/src/main/res/values-et/02-strings.xml
index 520b474aa1f5..5015d5ce678d 100644
--- a/AnkiDroid/src/main/res/values-et/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-et/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-et/10-preferences.xml b/AnkiDroid/src/main/res/values-et/10-preferences.xml
index 0e0133db192c..c4459c409dc3 100644
--- a/AnkiDroid/src/main/res/values-et/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-et/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-eu/02-strings.xml b/AnkiDroid/src/main/res/values-eu/02-strings.xml
index ab4db461c9aa..9161b003e195 100644
--- a/AnkiDroid/src/main/res/values-eu/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-eu/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-eu/10-preferences.xml b/AnkiDroid/src/main/res/values-eu/10-preferences.xml
index c760c76799e4..7451f7b1bffd 100644
--- a/AnkiDroid/src/main/res/values-eu/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-eu/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-fa/02-strings.xml b/AnkiDroid/src/main/res/values-fa/02-strings.xml
index d4822003c447..a8a9f367f236 100644
--- a/AnkiDroid/src/main/res/values-fa/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fa/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">حذف این نوع کارت باعث بی کارت شدن بعضی یادداشت ها می شود</string>
     <string name="voice_not_supported">صدای انتخاب شده همایت شده نیست. یکی دیگر را انتخاب کنید یا یک موتور صدا نصب کنید.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">نمایش کادر محاوره‌ای میانبرهای کیبرد</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">انتخاب کننده دسته</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">دسته را بدون تایید حذف کن</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">ویرایشگر یادداشت</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">ویرایش طراحی</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">ویرایش قالب به عنوان مارک‌داون</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">ویرایش ظاهر مرورگر</string>
-    <string name="show_shortcuts_message">برای نمایش میانبر های کیبرد دکمه های Alt+K را  فشار دهید</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">عمل کاربر %s در این نوع کارت تنظیم نشده است. لطفاً آن را پیکربندی کنید.</string>
     <string name="directory_inaccessible_info">برای کسب اطلاعات بیشتر در مورد نحوه بازیابی دسترسی اینجا %s را ببینید یا به تنظیمات بروید تا پوشه مجموعه را به‌روزرسانی کنید.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-fa/10-preferences.xml b/AnkiDroid/src/main/res/values-fa/10-preferences.xml
index e4a20d14541b..56b7e06769c8 100644
--- a/AnkiDroid/src/main/res/values-fa/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-fa/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">استفاده از حرکات و ضربات لمسی برای انجام کارهایی مثل پاسخ دادن و ویرایش کارت‌ها.</string>
     <string name="gestures_corner_touch" maxLength="41">لمس صفحه 9 قسمت</string>
     <string name="gestures_corner_touch_summary">اجازه بده برای حرکات لمس در گوشه های صفحه</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">کشوی جهت‌یابی در کل صفحه</string>
     <string name="gestures_fullscreen_nav_drawer_summary">کشو ی جهت یابی را باز کن وقتی صفحه را به سمت راست می کشم</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">هیچ کدام</string>
diff --git a/AnkiDroid/src/main/res/values-fi/02-strings.xml b/AnkiDroid/src/main/res/values-fi/02-strings.xml
index a57db3934721..5eccc95f5100 100644
--- a/AnkiDroid/src/main/res/values-fi/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fi/02-strings.xml
@@ -333,7 +333,6 @@
     <string name="orphan_note_message">Tämän korttityypin poistaminen jättää joitakin muistiinpanoja ilman kortteja.</string>
     <string name="voice_not_supported">Ääntä ei tueta. Kokeile toista tai asenna äänimoottori.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Näytä näppäinoikoteiden valintaikkuna</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Pakan valitsija</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Poista pakka ilman vahvistusta</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Muistiinpanoeditori</string>
@@ -346,7 +345,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Muokkaa tyyliä</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Kopioi mallipohja Markdownina</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Muokkaa selaimen ulkoasua</string>
-    <string name="show_shortcuts_message">Paina Alt+K näyttääksesi näppäinoikotiet</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">Käyttäjän toimea %s ei ole määritetty tässä muistiinpanotyypissä. Määritä se</string>
     <string name="directory_inaccessible_info">Lue lisää siitä, miten palauttaa pääsy tänne (%s) tai siirry asetuksiin vaihtaaksesi kokoelmakansiota</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-fi/10-preferences.xml b/AnkiDroid/src/main/res/values-fi/10-preferences.xml
index 7ffae0db66d1..4b01fd930439 100644
--- a/AnkiDroid/src/main/res/values-fi/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-fi/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Liitä eleitä toimintoihin, kuten vastaamiseen ja korttien muokkaamiseen.</string>
     <string name="gestures_corner_touch" maxLength="41">9 pisteen kosketus</string>
     <string name="gestures_corner_touch_summary">Käytä kosketuseleitä näytön kulmissa</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Koko näytön navigointivalikko</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Avaa navigointivalikko pyyhkäisemällä oikealle mistä tahansa näytöllä</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Ei mitään</string>
diff --git a/AnkiDroid/src/main/res/values-fil/02-strings.xml b/AnkiDroid/src/main/res/values-fil/02-strings.xml
index c73e55c644b5..0055eff188af 100644
--- a/AnkiDroid/src/main/res/values-fil/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fil/02-strings.xml
@@ -335,7 +335,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Pagpipilian ng Deck</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -348,7 +347,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Baguhin ang anyo ng browser</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-fil/10-preferences.xml b/AnkiDroid/src/main/res/values-fil/10-preferences.xml
index 004092c92457..8c4ee628bddb 100644
--- a/AnkiDroid/src/main/res/values-fil/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-fil/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Magtalaga ng mga kilos sa mga pagkilos tulad ng pagsagot at pag-edit ng mga card.</string>
     <string name="gestures_corner_touch" maxLength="41">9 na puntong pagpindot</string>
     <string name="gestures_corner_touch_summary">Pahintulutan ang mga gestures sa kanto ng screen</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Buong screen na kahon pangnabigasyon</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Buksan ang kahon pangnabigasyon tuwing sumaswipe pakanan mula sa kahit saang parte ng screen.</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Wala</string>
diff --git a/AnkiDroid/src/main/res/values-fr/02-strings.xml b/AnkiDroid/src/main/res/values-fr/02-strings.xml
index 31d12afed02f..6e36218c733a 100644
--- a/AnkiDroid/src/main/res/values-fr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fr/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">Supprimer ce type de carte laissera certaines notes sans cartes.</string>
     <string name="voice_not_supported">Voix non prise en charge. Essayez une autre ou installez un moteur vocal.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Afficher la boîte de dialogue des raccourcis clavier</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Sélecteur de paquet</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Supprimer le paquet sans confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Éditeur de notes</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Modifier le style</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copier le modèle en markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Modifier l’apparence du navigateur</string>
-    <string name="show_shortcuts_message">Appuyez sur Alt+K pour afficher les raccourcis clavier</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">L’action utilisateur %s n’est pas définie dans ce type de note. Veuillez la configurer.</string>
     <string name="directory_inaccessible_info">En savoir plus sur la restauration de l’accès ici %s ou allez dans les paramètres pour mettre à jour le dossier de collection.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-fr/10-preferences.xml b/AnkiDroid/src/main/res/values-fr/10-preferences.xml
index 19ed82363592..75ff3051933d 100644
--- a/AnkiDroid/src/main/res/values-fr/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-fr/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Assigner des gestes à des actions comme répondre et éditer des cartes.</string>
     <string name="gestures_corner_touch" maxLength="41">Écran tactile à 9 points</string>
     <string name="gestures_corner_touch_summary">Autoriser les gestes dans les coins de l\'écran</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Panneau de navigation plein écran</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Ouvrir le panneau de navigation lors d\'un balayage vers la droite de n\'importe où sur l\'écran</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Aucun</string>
diff --git a/AnkiDroid/src/main/res/values-fy/02-strings.xml b/AnkiDroid/src/main/res/values-fy/02-strings.xml
index ef980f4c265c..0312c01494d1 100644
--- a/AnkiDroid/src/main/res/values-fy/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fy/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-fy/10-preferences.xml b/AnkiDroid/src/main/res/values-fy/10-preferences.xml
index c1c15ed30278..d5568cd30c8c 100644
--- a/AnkiDroid/src/main/res/values-fy/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-fy/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-ga/02-strings.xml b/AnkiDroid/src/main/res/values-ga/02-strings.xml
index 63b8aa576545..5865ca902e25 100644
--- a/AnkiDroid/src/main/res/values-ga/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ga/02-strings.xml
@@ -354,7 +354,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -367,7 +366,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ga/10-preferences.xml b/AnkiDroid/src/main/res/values-ga/10-preferences.xml
index c48bb5404292..c2b0edb43b43 100644
--- a/AnkiDroid/src/main/res/values-ga/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ga/10-preferences.xml
@@ -100,6 +100,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-gl/02-strings.xml b/AnkiDroid/src/main/res/values-gl/02-strings.xml
index 59d2fd5fbff7..4deb87a46bed 100644
--- a/AnkiDroid/src/main/res/values-gl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-gl/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-gl/10-preferences.xml b/AnkiDroid/src/main/res/values-gl/10-preferences.xml
index bd7555a99de2..1af8740e08f9 100644
--- a/AnkiDroid/src/main/res/values-gl/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-gl/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-got/02-strings.xml b/AnkiDroid/src/main/res/values-got/02-strings.xml
index 5edb2d48f426..57718e603778 100644
--- a/AnkiDroid/src/main/res/values-got/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-got/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-got/10-preferences.xml b/AnkiDroid/src/main/res/values-got/10-preferences.xml
index 034f3e57b0b1..ea74a38d8c9d 100644
--- a/AnkiDroid/src/main/res/values-got/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-got/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-gu/02-strings.xml b/AnkiDroid/src/main/res/values-gu/02-strings.xml
index db8aa08daabd..f53899ef298e 100644
--- a/AnkiDroid/src/main/res/values-gu/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-gu/02-strings.xml
@@ -335,7 +335,6 @@
     <string name="orphan_note_message">இந்த கார்டு வகையை நீக்கினால் சில குறிப்புகள் கார்டு இல்லாமல் இருக்கும்.</string>
     <string name="voice_not_supported">குரல் மெமோ ஆதரிக்கப்படுகிறது. மற்றொரு குரல் இயந்திரத்தை நிறுவ முயற்சிக்கவும்.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -348,7 +347,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-gu/10-preferences.xml b/AnkiDroid/src/main/res/values-gu/10-preferences.xml
index 07cdcdccf1a3..1fe408e723d2 100644
--- a/AnkiDroid/src/main/res/values-gu/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-gu/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">જવાબ આપવા અને કાર્ડ સંપાદિત કરવા જેવી ક્રિયાઓ માટે હાવભાવ સોંપો.</string>
     <string name="gestures_corner_touch" maxLength="41">9-પોઇન્ટ ટચ</string>
     <string name="gestures_corner_touch_summary">સ્ક્રીનના ખૂણામાં સ્પર્શ હાવભાવને મંજૂરી આપો</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">પૂર્ણ સ્ક્રીન નેવિગેશન ડ્રોઅર</string>
     <string name="gestures_fullscreen_nav_drawer_summary">સ્ક્રીન પર ગમે ત્યાંથી જમણે સ્વાઇપ કરવામાં આવે ત્યારે નેવિગેશન ડ્રોઅર ખોલો</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">કોઈ નથી</string>
diff --git a/AnkiDroid/src/main/res/values-heb/02-strings.xml b/AnkiDroid/src/main/res/values-heb/02-strings.xml
index 414a5a8e8bd4..051ffddf45c0 100644
--- a/AnkiDroid/src/main/res/values-heb/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-heb/02-strings.xml
@@ -342,7 +342,6 @@
     <string name="orphan_note_message">מחיקת סוג כרטיס זה תשאיר כמה הערות ללא כרטיס.</string>
     <string name="voice_not_supported">קול אינו נתמך. נסה אחר או התקן מנוע קול.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">הצג חלון קיצורי מקלדת</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">בוחר החפיסה</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">מחק את החפיסה ללא אישור</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">עורך הערות</string>
@@ -355,7 +354,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">ערוך סגנון</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">העתק תבנית כסימון</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">ערוך את מראה הדפדפן</string>
-    <string name="show_shortcuts_message">הקש Alt+K כדי להציג קיצורי מקשים</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">פעולת המשתמש %s לא מוגדרת בסוג הערה זה. אנא הגדר אותו</string>
     <string name="directory_inaccessible_info">למד עוד על איך לשחזר גישה כאן %s או עבור להגדרות כדי לעדכן את תיקיית האוסף.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-heb/10-preferences.xml b/AnkiDroid/src/main/res/values-heb/10-preferences.xml
index d18a271836f2..aa0da3be6486 100644
--- a/AnkiDroid/src/main/res/values-heb/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-heb/10-preferences.xml
@@ -99,6 +99,7 @@
     <string name="gestures_summ">שיוך מחוות לפעולות כגון מענה ועריכת קלפים.</string>
     <string name="gestures_corner_touch" maxLength="41">מגע 9 נקודות</string>
     <string name="gestures_corner_touch_summary">אפשר מחוות מגע בפינות המסך</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">מגירת היישומים במסך מלא</string>
     <string name="gestures_fullscreen_nav_drawer_summary">פתח את מגירת הניווט בעת החלקה ימינה מכל מקום על המסך</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">ללא</string>
diff --git a/AnkiDroid/src/main/res/values-hi/02-strings.xml b/AnkiDroid/src/main/res/values-hi/02-strings.xml
index 63bf440803ac..e5d2471cecf6 100644
--- a/AnkiDroid/src/main/res/values-hi/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-hi/02-strings.xml
@@ -333,7 +333,6 @@
     <string name="orphan_note_message">इस कार्ड प्रकार को हटाने से कुछ नोट बिना किसी कार्ड के रह जाएंगे।</string>
     <string name="voice_not_supported">आवाज़ समर्थित नहीं है. दूसरा प्रयास करें या ध्वनि इंजन स्थापित करें।</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">कुंजीपटल शॉर्टकट संवाद दिखाएँ</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">डेक पिकर</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">पुष्टि के बिना डेक हटाएँ</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">नोट संपादक</string>
@@ -346,7 +345,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">स्टाइल संपादित करें</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">टेम्पलेट को मार्कडाउन के रूप में कॉपी करें</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">ब्राउज़र स्वरूप संपादित करें</string>
-    <string name="show_shortcuts_message">कीबोर्ड शॉर्टकट दिखाने के लिए Alt+K दबाएँ</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">इस नोटटाइप में उपयोगकर्ता कार्रवाई %s सेट नहीं है. कृपया इसे कॉन्फ़िगर करें</string>
     <string name="directory_inaccessible_info">यहां %s तक पहुंच बहाल करने के तरीके के बारे में और जानें या संग्रह फ़ोल्डर को अपडेट करने के लिए सेटिंग्स पर जाएं।</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-hi/10-preferences.xml b/AnkiDroid/src/main/res/values-hi/10-preferences.xml
index 33388869a1e5..db414d0cb206 100644
--- a/AnkiDroid/src/main/res/values-hi/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-hi/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">ऐसे जवाब और संपादन कार्ड के रूप में कार्रवाई करने के लिए इशारों निरुपित ।</string>
     <string name="gestures_corner_touch" maxLength="41">९-बिंदु स्पर्श</string>
     <string name="gestures_corner_touch_summary">स्क्रीन कोनों में स्पर्श इशारों की अनुमति दें</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">फुल स्क्रीन नेविगेशन दराज</string>
     <string name="gestures_fullscreen_nav_drawer_summary">स्क्रीन पर कहीं से भी स्वाइप किए जाने पर नेविगेशन दराज खोलें</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">कोई नहीं </string>
diff --git a/AnkiDroid/src/main/res/values-hr/02-strings.xml b/AnkiDroid/src/main/res/values-hr/02-strings.xml
index c91b6a4b48f2..99db25db2e87 100644
--- a/AnkiDroid/src/main/res/values-hr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-hr/02-strings.xml
@@ -342,7 +342,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -355,7 +354,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-hr/10-preferences.xml b/AnkiDroid/src/main/res/values-hr/10-preferences.xml
index 906b39695b60..74c12bae5215 100644
--- a/AnkiDroid/src/main/res/values-hr/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-hr/10-preferences.xml
@@ -98,6 +98,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-hu/02-strings.xml b/AnkiDroid/src/main/res/values-hu/02-strings.xml
index 4c954970f68d..ac0a9f02cd5b 100644
--- a/AnkiDroid/src/main/res/values-hu/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-hu/02-strings.xml
@@ -331,7 +331,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -344,7 +343,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-hu/10-preferences.xml b/AnkiDroid/src/main/res/values-hu/10-preferences.xml
index 8afbfeca1b44..b71666398fc2 100644
--- a/AnkiDroid/src/main/res/values-hu/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-hu/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Gesztusok hozzárendelése olyan műveletekhez, mint a kártyák megválaszolása és szerkesztése.</string>
     <string name="gestures_corner_touch" maxLength="41">Érintési gesztusok beállítása</string>
     <string name="gestures_corner_touch_summary">Érintési gesztusok engedélyezése a képernyő sarkaiban</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Navigációs sáv bezárása</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Navigációs sáv megnyitása amikor a képernyő jobb oldalára csúsztat</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Nincs</string>
diff --git a/AnkiDroid/src/main/res/values-hy/02-strings.xml b/AnkiDroid/src/main/res/values-hy/02-strings.xml
index 43dd99ed9bb3..31c3bba3fc37 100644
--- a/AnkiDroid/src/main/res/values-hy/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-hy/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-hy/10-preferences.xml b/AnkiDroid/src/main/res/values-hy/10-preferences.xml
index 4d681703577e..8df9cb366d80 100644
--- a/AnkiDroid/src/main/res/values-hy/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-hy/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Գործառույթների համար, ինչպիսին են քարտերի պատասխանելը կամ խմբագրելը, օգտագործել ժեստեր</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Ոչ մի</string>
diff --git a/AnkiDroid/src/main/res/values-ind/02-strings.xml b/AnkiDroid/src/main/res/values-ind/02-strings.xml
index 9ea178739231..99ec0d473352 100644
--- a/AnkiDroid/src/main/res/values-ind/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ind/02-strings.xml
@@ -330,7 +330,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -343,7 +342,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ind/10-preferences.xml b/AnkiDroid/src/main/res/values-ind/10-preferences.xml
index 6de2ab552431..bf428a61c83f 100644
--- a/AnkiDroid/src/main/res/values-ind/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ind/10-preferences.xml
@@ -96,6 +96,7 @@
     <string name="gestures_summ">Menerapkan gestur sebagai tindakan untuk menjawab dan mengedit kartu.</string>
     <string name="gestures_corner_touch" maxLength="41">Mode sentuhan 9-poin</string>
     <string name="gestures_corner_touch_summary">Perbolehkan gestur sentuhan di bagian pojok layar</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Navigasi laci layar penuh</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Buka laci navigasi ketika menggeser kanan layar dari mana saja</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Tidak ada</string>
diff --git a/AnkiDroid/src/main/res/values-is/02-strings.xml b/AnkiDroid/src/main/res/values-is/02-strings.xml
index e0c971192ee7..a86dedce299e 100644
--- a/AnkiDroid/src/main/res/values-is/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-is/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-is/10-preferences.xml b/AnkiDroid/src/main/res/values-is/10-preferences.xml
index 034f3e57b0b1..ea74a38d8c9d 100644
--- a/AnkiDroid/src/main/res/values-is/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-is/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-it/02-strings.xml b/AnkiDroid/src/main/res/values-it/02-strings.xml
index 31fdff0bd6ca..338b0f2d46e2 100644
--- a/AnkiDroid/src/main/res/values-it/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-it/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">L\'eliminazione di questo tipo di carta lascerà alcune note senza alcuna carta.</string>
     <string name="voice_not_supported">Voce non supportata. Scegli un\'altra voce o installa un motore vocale.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-it/10-preferences.xml b/AnkiDroid/src/main/res/values-it/10-preferences.xml
index 57124d69a463..fa995f99e062 100644
--- a/AnkiDroid/src/main/res/values-it/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-it/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Assegna gesti alle azioni come rispondere e modificare carte.</string>
     <string name="gestures_corner_touch" maxLength="41">tocco a 9 punti</string>
     <string name="gestures_corner_touch_summary">Consenti i gesti touch negli angoli dello schermo</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Pannello di navigazione a schermo intero</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Apri il pannello di navigazione quando scorri a destra da qualsiasi punto dello schermo</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Nessuno</string>
diff --git a/AnkiDroid/src/main/res/values-iw/02-strings.xml b/AnkiDroid/src/main/res/values-iw/02-strings.xml
index 414a5a8e8bd4..051ffddf45c0 100644
--- a/AnkiDroid/src/main/res/values-iw/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-iw/02-strings.xml
@@ -342,7 +342,6 @@
     <string name="orphan_note_message">מחיקת סוג כרטיס זה תשאיר כמה הערות ללא כרטיס.</string>
     <string name="voice_not_supported">קול אינו נתמך. נסה אחר או התקן מנוע קול.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">הצג חלון קיצורי מקלדת</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">בוחר החפיסה</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">מחק את החפיסה ללא אישור</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">עורך הערות</string>
@@ -355,7 +354,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">ערוך סגנון</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">העתק תבנית כסימון</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">ערוך את מראה הדפדפן</string>
-    <string name="show_shortcuts_message">הקש Alt+K כדי להציג קיצורי מקשים</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">פעולת המשתמש %s לא מוגדרת בסוג הערה זה. אנא הגדר אותו</string>
     <string name="directory_inaccessible_info">למד עוד על איך לשחזר גישה כאן %s או עבור להגדרות כדי לעדכן את תיקיית האוסף.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-iw/10-preferences.xml b/AnkiDroid/src/main/res/values-iw/10-preferences.xml
index d18a271836f2..aa0da3be6486 100644
--- a/AnkiDroid/src/main/res/values-iw/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-iw/10-preferences.xml
@@ -99,6 +99,7 @@
     <string name="gestures_summ">שיוך מחוות לפעולות כגון מענה ועריכת קלפים.</string>
     <string name="gestures_corner_touch" maxLength="41">מגע 9 נקודות</string>
     <string name="gestures_corner_touch_summary">אפשר מחוות מגע בפינות המסך</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">מגירת היישומים במסך מלא</string>
     <string name="gestures_fullscreen_nav_drawer_summary">פתח את מגירת הניווט בעת החלקה ימינה מכל מקום על המסך</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">ללא</string>
diff --git a/AnkiDroid/src/main/res/values-ja/02-strings.xml b/AnkiDroid/src/main/res/values-ja/02-strings.xml
index 5311bcbfd988..d5dea8d5876e 100644
--- a/AnkiDroid/src/main/res/values-ja/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ja/02-strings.xml
@@ -330,7 +330,6 @@
     <string name="orphan_note_message">このカードタイプを削除すると、カードが無いノートが生じます。</string>
     <string name="voice_not_supported">読み上げ音声がサポートされていません。別の音声を試すか、音声エンジンをインストールしてください。</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">キーボードショートカットを表示</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">デッキリスト</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">デッキを削除（確認なし）</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">ノート編集画面</string>
@@ -343,7 +342,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">スタイルを編集</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">テンプレートをMarkdowin形式でコピー</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">カードブラウザ用の表示設定を編集</string>
-    <string name="show_shortcuts_message">キーボードショートカットを表示するには [Alt]+[K] を押してください</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">ユーザーアクション %s はこのノートタイプに設定されていません。設定してください</string>
     <string name="directory_inaccessible_info">アクセスを回復する方法の詳細を %s で確認するか、設定画面に移動してコレクションフォルダを更新してください。</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ja/10-preferences.xml b/AnkiDroid/src/main/res/values-ja/10-preferences.xml
index ecf13342ae8b..3b4b74818d36 100644
--- a/AnkiDroid/src/main/res/values-ja/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ja/10-preferences.xml
@@ -96,6 +96,7 @@
     <string name="gestures_summ">回答やカード編集などの操作にジェスチャーを割り当てます</string>
     <string name="gestures_corner_touch" maxLength="41">タップを９種類にする</string>
     <string name="gestures_corner_touch_summary">カード画面内を縦３ × 横３の９エリアに区別して各エリアにタップジェスチャーを割り当てられます</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">どこでもドロワー</string>
     <string name="gestures_fullscreen_nav_drawer_summary">アプリ画面上のどこからでも、右向きにスワイプするとナビゲーションドロワーが開きます</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">なし</string>
diff --git a/AnkiDroid/src/main/res/values-jv/02-strings.xml b/AnkiDroid/src/main/res/values-jv/02-strings.xml
index d012a0403ccd..9bfa12c2c1b2 100644
--- a/AnkiDroid/src/main/res/values-jv/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-jv/02-strings.xml
@@ -330,7 +330,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -343,7 +342,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-jv/10-preferences.xml b/AnkiDroid/src/main/res/values-jv/10-preferences.xml
index 8721a23a9991..127160523bfc 100644
--- a/AnkiDroid/src/main/res/values-jv/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-jv/10-preferences.xml
@@ -96,6 +96,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-ka/02-strings.xml b/AnkiDroid/src/main/res/values-ka/02-strings.xml
index 4cd0033d2607..13dcc628f222 100644
--- a/AnkiDroid/src/main/res/values-ka/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ka/02-strings.xml
@@ -335,7 +335,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">დასტის ამრჩეველი</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">შენიშვნების რედაქტორი</string>
@@ -348,7 +347,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">სტილის რედაქტირება</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">შაბლონის კოპირება markdown-ად</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ka/10-preferences.xml b/AnkiDroid/src/main/res/values-ka/10-preferences.xml
index 2b5f53cea2ef..1d1da860411c 100644
--- a/AnkiDroid/src/main/res/values-ka/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ka/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">ჟესტების მიბმა მოქმედებებთან, როგორებიცაა მაგალითად პასუხის გაცემა ან ბარათის რედაქტირება.</string>
     <string name="gestures_corner_touch" maxLength="41">9-წერტილიანი შეხება</string>
     <string name="gestures_corner_touch_summary">ეკრანის კუთხეებში შეხების ჟესტების დაშვება</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">სრულეკრანიანი რეჟიმის ნავიგაციის პანელი</string>
     <string name="gestures_fullscreen_nav_drawer_summary">ეკრანის ნებისმიერი წერტილიდან მარჯვნივ გასმისას ნავიგაციის პანელის გახსნა</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">არცერთი</string>
diff --git a/AnkiDroid/src/main/res/values-kk/02-strings.xml b/AnkiDroid/src/main/res/values-kk/02-strings.xml
index e0c971192ee7..a86dedce299e 100644
--- a/AnkiDroid/src/main/res/values-kk/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-kk/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-kk/10-preferences.xml b/AnkiDroid/src/main/res/values-kk/10-preferences.xml
index 034f3e57b0b1..ea74a38d8c9d 100644
--- a/AnkiDroid/src/main/res/values-kk/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-kk/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-km/02-strings.xml b/AnkiDroid/src/main/res/values-km/02-strings.xml
index 0e1df27053cf..0fa1dec50ef3 100644
--- a/AnkiDroid/src/main/res/values-km/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-km/02-strings.xml
@@ -330,7 +330,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -343,7 +342,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-km/10-preferences.xml b/AnkiDroid/src/main/res/values-km/10-preferences.xml
index 8721a23a9991..127160523bfc 100644
--- a/AnkiDroid/src/main/res/values-km/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-km/10-preferences.xml
@@ -96,6 +96,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-kn/02-strings.xml b/AnkiDroid/src/main/res/values-kn/02-strings.xml
index 9a2bd5a79bbc..6577e2da991b 100644
--- a/AnkiDroid/src/main/res/values-kn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-kn/02-strings.xml
@@ -330,7 +330,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -343,7 +342,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-kn/10-preferences.xml b/AnkiDroid/src/main/res/values-kn/10-preferences.xml
index 51207b7699e5..8369d868ed35 100644
--- a/AnkiDroid/src/main/res/values-kn/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-kn/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">ಪ್ರತ್ಯುತ್ತರ ಮತ್ತು ಕಾರ್ಡ್‌ಗಳನ್ನು ಸಂಪಾದಿಸುವಂತಹ ಕ್ರಿಯೆಗಳಿಗೆ ಗೆಸ್ಚರ್‌ಗಳನ್ನು ನಿಯೋಜಿಸಿ.</string>
     <string name="gestures_corner_touch" maxLength="41">9-ಪಾಯಿಂಟ್ ಸ್ಪರ್ಶ</string>
     <string name="gestures_corner_touch_summary">ಪರದೆಯ ಮೂಲೆಗಳಲ್ಲಿ ಸ್ಪರ್ಶ ಗೆಸ್ಚರ್‌ಗಳನ್ನು ಅನುಮತಿಸಿ</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">ಪೂರ್ಣ ಪರದೆಯ ನ್ಯಾವಿಗೇಷನ್ ಡ್ರಾಯರ್</string>
     <string name="gestures_fullscreen_nav_drawer_summary">ಪರದೆಯ ಮೇಲೆ ಎಲ್ಲಿಂದಲಾದರೂ ಬಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡುವಾಗ ನ್ಯಾವಿಗೇಷನ್ ಡ್ರಾಯರ್ ತೆರೆಯಿರಿ</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">ಯಾವುದೂ</string>
diff --git a/AnkiDroid/src/main/res/values-ko/02-strings.xml b/AnkiDroid/src/main/res/values-ko/02-strings.xml
index da0afb023a6f..144d09ca265b 100644
--- a/AnkiDroid/src/main/res/values-ko/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ko/02-strings.xml
@@ -333,7 +333,6 @@ Context | Request Context    [1]</string>
     <string name="orphan_note_message">이 카드 유형을 삭제하면 카드 없이 일부 메모만 남습니다</string>
     <string name="voice_not_supported">음성을 지원하지 않습니다. 다른 것으로 시도하거나 음성 엔진을 설치하세요.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">키보드 단축키 안내 보이기</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">덱 선택</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">확인 없이 덱 삭제</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">노트 편집기</string>
@@ -346,7 +345,6 @@ Context | Request Context    [1]</string>
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">스타일 편집</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">마크다운으로 템플릿 복사</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">브라우저 외관 편집</string>
-    <string name="show_shortcuts_message">키보드 단축키를 보려면 Alt + K를 누르세요.</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">이 노트 유형에는 사용자 행동 %s이(가) 설정되어 있지 않습니다. 설정을 확인해 주세요.</string>
     <string name="directory_inaccessible_info">여기에서 액세스를 복원하는 방법에 대해 자세히 알아보세요 %s 또는 설정으로 이동하여 컬렉션 폴더를 업데이트하세요.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ko/10-preferences.xml b/AnkiDroid/src/main/res/values-ko/10-preferences.xml
index 0379b13fcb70..bb078211b65b 100644
--- a/AnkiDroid/src/main/res/values-ko/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ko/10-preferences.xml
@@ -96,6 +96,7 @@
     <string name="gestures_summ">응답 및 카드 편집 등의 작업에 제스쳐 할당</string>
     <string name="gestures_corner_touch" maxLength="41">9점 터치</string>
     <string name="gestures_corner_touch_summary">화면 모서리의 터치 제스쳐 허용</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">전체화면 탐색 서랍</string>
     <string name="gestures_fullscreen_nav_drawer_summary">화면 어디에서나 오른쪽으로 스와이프하여 탐색 서랍 열기</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">없음</string>
diff --git a/AnkiDroid/src/main/res/values-ku/02-strings.xml b/AnkiDroid/src/main/res/values-ku/02-strings.xml
index 16009ac88239..df4dd3539c6c 100644
--- a/AnkiDroid/src/main/res/values-ku/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ku/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ku/10-preferences.xml b/AnkiDroid/src/main/res/values-ku/10-preferences.xml
index c3baeae1db45..03744990f8ef 100644
--- a/AnkiDroid/src/main/res/values-ku/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ku/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-ky/02-strings.xml b/AnkiDroid/src/main/res/values-ky/02-strings.xml
index e0c971192ee7..a86dedce299e 100644
--- a/AnkiDroid/src/main/res/values-ky/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ky/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ky/10-preferences.xml b/AnkiDroid/src/main/res/values-ky/10-preferences.xml
index 034f3e57b0b1..ea74a38d8c9d 100644
--- a/AnkiDroid/src/main/res/values-ky/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ky/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-lt/02-strings.xml b/AnkiDroid/src/main/res/values-lt/02-strings.xml
index 85acf41bbd57..b241c3c77c1f 100644
--- a/AnkiDroid/src/main/res/values-lt/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-lt/02-strings.xml
@@ -348,7 +348,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -361,7 +360,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-lt/10-preferences.xml b/AnkiDroid/src/main/res/values-lt/10-preferences.xml
index 69d132150cc3..45cdc74bfa7d 100644
--- a/AnkiDroid/src/main/res/values-lt/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-lt/10-preferences.xml
@@ -99,6 +99,7 @@
     <string name="gestures_summ">Nustatykite kokiais gestais atsakinėsite į klausimus ir redaguosite korteles.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-lv/02-strings.xml b/AnkiDroid/src/main/res/values-lv/02-strings.xml
index 9cb3e99b304c..29e69df70f23 100644
--- a/AnkiDroid/src/main/res/values-lv/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-lv/02-strings.xml
@@ -342,7 +342,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -355,7 +354,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-lv/10-preferences.xml b/AnkiDroid/src/main/res/values-lv/10-preferences.xml
index aef3cf01b7c7..6ade468a4a75 100644
--- a/AnkiDroid/src/main/res/values-lv/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-lv/10-preferences.xml
@@ -98,6 +98,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-mk/02-strings.xml b/AnkiDroid/src/main/res/values-mk/02-strings.xml
index aa9eba4740dc..27f7c017b935 100644
--- a/AnkiDroid/src/main/res/values-mk/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-mk/02-strings.xml
@@ -337,7 +337,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -350,7 +349,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-mk/10-preferences.xml b/AnkiDroid/src/main/res/values-mk/10-preferences.xml
index b094e675d7e8..fd5dfdeed414 100644
--- a/AnkiDroid/src/main/res/values-mk/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-mk/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-ml/02-strings.xml b/AnkiDroid/src/main/res/values-ml/02-strings.xml
index f56c6db72138..e090a556205b 100644
--- a/AnkiDroid/src/main/res/values-ml/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ml/02-strings.xml
@@ -330,7 +330,6 @@
     <string name="orphan_note_message">ഈ കാർഡ് തരം ഇല്ലാതാക്കുന്നത് ചില കുറിപ്പുകൾ കാർഡുകളില്ലാതെ അവശേഷിക്കും.</string>
     <string name="voice_not_supported">ശബ്ദം പിന്തുണയ്ക്കുന്നില്ല. മറ്റൊന്ന് പരീക്ഷിക്കുക അല്ലെങ്കിൽ ഒരു വോയ്‌സ് എഞ്ചിൻ ഇൻസ്റ്റാൾ ചെയ്യുക.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">ഡെക്ക് പിക്കർ</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">സ്ഥിരീകരണമില്ലാതെ ഡെക്ക് ഇല്ലാതാക്കുക</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">കുറിപ്പ് എഡിറ്റർ</string>
@@ -343,7 +342,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">ബ്രൗസർ രൂപം എഡിറ്റ് ചെയ്യുക</string>
-    <string name="show_shortcuts_message">കീബോർഡ് കുറുക്കുവഴികൾ കാണിക്കാൻ Alt+K അമർത്തുക</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">ഈ കുറിപ്പ് തരത്തിൽ ഉപയോക്തൃ പ്രവർത്തനം %s സജ്ജീകരിച്ചിട്ടില്ല. ദയവായി അത് കോൺഫിഗർ ചെയ്യുക</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ml/10-preferences.xml b/AnkiDroid/src/main/res/values-ml/10-preferences.xml
index ad4c856ad111..9fd634a28516 100644
--- a/AnkiDroid/src/main/res/values-ml/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ml/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">കാർഡുകൾക്ക് ഉത്തരം നൽകൽ, എഡിറ്റുചെയ്യൽ എന്നിവ പോലുള്ള പ്രവർത്തനങ്ങൾക്ക് ആംഗ്യങ്ങൾ നൽകുക.</string>
     <string name="gestures_corner_touch" maxLength="41">9-പോയിൻ്റ് ടച്ച്</string>
     <string name="gestures_corner_touch_summary">സ്‌ക്രീൻ കോണുകളിൽ ടച്ച് സവിശേഷതകൾ അനുവദിക്കുക</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">പൂർണ്ണ സ്‌ക്രീൻ നാവിഗേഷൻ ഡ്രോയർ</string>
     <string name="gestures_fullscreen_nav_drawer_summary">സ്ക്രീനിൽ എവിടെനിന്നും വലത്തേക്ക് സ്വൈപ്പ് ചെയ്യുമ്പോൾ നാവിഗേഷൻ ഡ്രോയർ തുറക്കുക</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">ഒന്നുമില്ല</string>
diff --git a/AnkiDroid/src/main/res/values-mn/02-strings.xml b/AnkiDroid/src/main/res/values-mn/02-strings.xml
index 89db021ce30d..78b869b6d850 100644
--- a/AnkiDroid/src/main/res/values-mn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-mn/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-mn/10-preferences.xml b/AnkiDroid/src/main/res/values-mn/10-preferences.xml
index a9d1237794ea..0ebe52c31011 100644
--- a/AnkiDroid/src/main/res/values-mn/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-mn/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-mr/02-strings.xml b/AnkiDroid/src/main/res/values-mr/02-strings.xml
index 99b8d629efa8..b7d1f4763c80 100644
--- a/AnkiDroid/src/main/res/values-mr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-mr/02-strings.xml
@@ -330,7 +330,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -343,7 +342,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-mr/10-preferences.xml b/AnkiDroid/src/main/res/values-mr/10-preferences.xml
index ed658fd6f389..0a7038eaa743 100644
--- a/AnkiDroid/src/main/res/values-mr/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-mr/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">उत्तर देणे आणि संपादन कार्ड यासारख्या क्रियांना जेश्चर नियुक्त करा.</string>
     <string name="gestures_corner_touch" maxLength="41">9-बिंदू स्पर्श</string>
     <string name="gestures_corner_touch_summary">स्क्रीन कोपर्यात स्पर्श जेश्चरला अनुमती द्या</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">पूर्ण स्क्रीन नेव्हिगेशन ड्रॉवर</string>
     <string name="gestures_fullscreen_nav_drawer_summary">स्क्रीनवर कुठूनही थेट स्वाइप करून नेव्हिगेशन ड्रॉवर उघडा</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">काहीही नाही</string>
diff --git a/AnkiDroid/src/main/res/values-ms/02-strings.xml b/AnkiDroid/src/main/res/values-ms/02-strings.xml
index 8872047a975f..a358c9b10b92 100644
--- a/AnkiDroid/src/main/res/values-ms/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ms/02-strings.xml
@@ -330,7 +330,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -343,7 +342,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ms/10-preferences.xml b/AnkiDroid/src/main/res/values-ms/10-preferences.xml
index 7629e8768566..3539d2808924 100644
--- a/AnkiDroid/src/main/res/values-ms/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ms/10-preferences.xml
@@ -96,6 +96,7 @@
     <string name="gestures_summ">Tetapkan gerak isyarat kepada tindakan seperti jawab dan sunting kad.</string>
     <string name="gestures_corner_touch" maxLength="41">Sentuhan 9 titik</string>
     <string name="gestures_corner_touch_summary">Benarkan gerak isyarat sentuh pada penghujung skrin</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Laci navigasi skrin penuh</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Buka laci navigasi apabila dileretkan ke kanan dari mana-mana pada skrin</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Tiada</string>
diff --git a/AnkiDroid/src/main/res/values-my/02-strings.xml b/AnkiDroid/src/main/res/values-my/02-strings.xml
index 9b976904fdf6..373f381178cc 100644
--- a/AnkiDroid/src/main/res/values-my/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-my/02-strings.xml
@@ -330,7 +330,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -343,7 +342,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-my/10-preferences.xml b/AnkiDroid/src/main/res/values-my/10-preferences.xml
index 8721a23a9991..127160523bfc 100644
--- a/AnkiDroid/src/main/res/values-my/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-my/10-preferences.xml
@@ -96,6 +96,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-nl/02-strings.xml b/AnkiDroid/src/main/res/values-nl/02-strings.xml
index 45eac2a26b32..8dbc0feb4669 100644
--- a/AnkiDroid/src/main/res/values-nl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-nl/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">Als je dit kaarttype verwijdert, zullen sommige notities geen kaarten meer hebben.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-nl/10-preferences.xml b/AnkiDroid/src/main/res/values-nl/10-preferences.xml
index 8dcf045a1da3..17c6ce557f43 100644
--- a/AnkiDroid/src/main/res/values-nl/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-nl/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Bewegingen toewijzen aan acties zoals het beantwoorden en bewerken van kaarten.</string>
     <string name="gestures_corner_touch" maxLength="41">9-punts aanraakscherm</string>
     <string name="gestures_corner_touch_summary">Aanraakgebaren in schermhoeken toestaan</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Volledig scherm navigatiebalk</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigatiescherm wanneer je overal en op het scherm naar rechts veegt</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Geen</string>
diff --git a/AnkiDroid/src/main/res/values-nn/02-strings.xml b/AnkiDroid/src/main/res/values-nn/02-strings.xml
index 6b95b1a339d2..6899661661cb 100644
--- a/AnkiDroid/src/main/res/values-nn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-nn/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-nn/10-preferences.xml b/AnkiDroid/src/main/res/values-nn/10-preferences.xml
index 55471a97e370..96f6c4be34e3 100644
--- a/AnkiDroid/src/main/res/values-nn/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-nn/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-punkts berøring</string>
     <string name="gestures_corner_touch_summary">Tillat berøringsbevegelser i skjermens hjørner</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Ingen</string>
diff --git a/AnkiDroid/src/main/res/values-no/02-strings.xml b/AnkiDroid/src/main/res/values-no/02-strings.xml
index 4db8e35c8de7..87866bad8192 100644
--- a/AnkiDroid/src/main/res/values-no/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-no/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-no/10-preferences.xml b/AnkiDroid/src/main/res/values-no/10-preferences.xml
index f298a3e242dd..33122a1a7bd8 100644
--- a/AnkiDroid/src/main/res/values-no/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-no/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-punkts berøring</string>
     <string name="gestures_corner_touch_summary">Tillat berøringsbevegelser i skjermens hjørner</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Ingen</string>
diff --git a/AnkiDroid/src/main/res/values-or/02-strings.xml b/AnkiDroid/src/main/res/values-or/02-strings.xml
index f7fb7715ceff..0d2efc0123b8 100644
--- a/AnkiDroid/src/main/res/values-or/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-or/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-or/10-preferences.xml b/AnkiDroid/src/main/res/values-or/10-preferences.xml
index 29e91bb6273c..070e7dbf97be 100644
--- a/AnkiDroid/src/main/res/values-or/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-or/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">ପତ୍ରଗୁଡ଼ିକର ଉତ୍ତର ଏବଂ ସମ୍ପାଦନ କରିବା ଭଳି କାର୍ଯ୍ୟରେ ଅଙ୍ଗଭଙ୍ଗୀ ନ୍ୟସ୍ତ କରନ୍ତୁ</string>
     <string name="gestures_corner_touch" maxLength="41">୯-ଅଙ୍କ ସ୍ପର୍ଶ</string>
     <string name="gestures_corner_touch_summary">ସ୍କ୍ରୀନ୍ କୋଣରେ ସ୍ପର୍ଶ ଅଙ୍ଗଭଙ୍ଗୀକୁ ଅନୁମତି ଦିଅନ୍ତୁ</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">ପୂର୍ଣ୍ଣ ସ୍କ୍ରୀନ୍ ଦିଗଚଳନ ଡ୍ରର୍</string>
     <string name="gestures_fullscreen_nav_drawer_summary">ସ୍କ୍ରୀନ୍‌ର ଯେକୌଣସି ସ୍ଥାନରୁ ଡାହାଣକୁ ସ୍ୱାଇପ୍ କରିବା ମାତ୍ରେ ଦିଗଚଳନ ଡ୍ରର୍ ଖୋଲିବା</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">କିଛି ନାହିଁ</string>
diff --git a/AnkiDroid/src/main/res/values-pa/02-strings.xml b/AnkiDroid/src/main/res/values-pa/02-strings.xml
index 1ce155b0b646..f0cfe3310f51 100644
--- a/AnkiDroid/src/main/res/values-pa/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-pa/02-strings.xml
@@ -330,7 +330,6 @@
     <string name="orphan_note_message">ਇਸ ਕਾਰਡ ਦੀ ਕਿਸਮ ਨੂੰ ਮਿਟਾਉਣ ਨਾਲ ਕੁਝ ਨੋਟ ਬਿਨਾਂ ਕਿਸੇ ਕਾਰਡ ਦੇ ਰਹਿ ਜਾਣਗੇ।</string>
     <string name="voice_not_supported">ਵੌਇਸ ਸਮਰਥਿਤ ਨਹੀਂ ਹੈ। ਕੋਈ ਹੋਰ ਅਜ਼ਮਾਓ ਜਾਂ ਇੱਕ ਵੌਇਸ ਇੰਜਣ ਸਥਾਪਤ ਕਰੋ।</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ ਡਾਇਲਾਗ ਦਿਖਾਓ</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">ਡੈੱਕ ਚੋਣਕਾਰ</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">ਅਪ੍ਰਮਾਣਿਤ ਡੇਕ ਮਿਟਾਓ</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">ਨੋਟ ਸੰਪਾਦਕ</string>
@@ -343,7 +342,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">ਸਟਾਈਲ ਦਾ ਸੰਪਾਦਨ ਕਰੋ</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">ਟੈਂਪਲੇਟ ਨੂੰ ਮਾਰਕਡਾਊਨ ਵਜੋਂ ਕਾਪੀ ਕਰੋ</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">ਬ੍ਰਾਊਜ਼ਰ ਦੀ ਦਿੱਖ ਨੂੰ ਸੰਪਾਦਿਤ ਕਰੋ</string>
-    <string name="show_shortcuts_message">ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ ਦਿਖਾਉਣ ਲਈ Alt+K ਦਬਾਓ</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">ਇਸ ਨੋਟ ਕਿਸਮ ਵਿੱਚ ਉਪਭੋਗਤਾ ਕਾਰਵਾਈ %s ਸੈੱਟ ਨਹੀਂ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਇਸਨੂੰ ਕੌਂਫਿਗਰ ਕਰੋ</string>
     <string name="directory_inaccessible_info">ਇੱਥੇ %s ਪਹੁੰਚ ਨੂੰ ਕਿਵੇਂ ਬਹਾਲ ਕਰਨਾ ਹੈ ਬਾਰੇ ਹੋਰ ਜਾਣੋ ਜਾਂ ਸੰਗ੍ਰਹਿ ਫੋਲਡਰ ਨੂੰ ਅੱਪਡੇਟ ਕਰਨ ਲਈ ਸੈਟਿੰਗਾਂ \'ਤੇ ਜਾਓ।</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-pa/10-preferences.xml b/AnkiDroid/src/main/res/values-pa/10-preferences.xml
index 57fff53e2bb7..83b13ccc29e4 100644
--- a/AnkiDroid/src/main/res/values-pa/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-pa/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">ਜਵਾਬ ਦੇਣ ਅਤੇ ਕਾਰਡਾਂ ਨੂੰ ਸੰਪਾਦਿਤ ਕਰਨ ਵਰਗੀਆਂ ਕਾਰਵਾਈਆਂ ਲਈ ਸੰਕੇਤ ਦਿਓ।</string>
     <string name="gestures_corner_touch" maxLength="41">9-ਪੁਆਇੰਟ ਟੱਚ</string>
     <string name="gestures_corner_touch_summary">ਸਕਰੀਨ ਕੋਨਿਆਂ ਵਿੱਚ ਛੋਹਣ ਦੇ ਇਸ਼ਾਰਿਆਂ ਦੀ ਆਗਿਆ ਦਿਓ</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">ਪੂਰੀ ਸਕ੍ਰੀਨ ਨੈਵੀਗੇਸ਼ਨ ਦਰਾਜ਼</string>
     <string name="gestures_fullscreen_nav_drawer_summary">ਸਕ੍ਰੀਨ \'ਤੇ ਕਿਤੇ ਵੀ ਸਵਾਈਪ ਕਰਨ \'ਤੇ ਨੈਵੀਗੇਸ਼ਨ ਦਰਾਜ਼ ਖੋਲ੍ਹੋ</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">ਕੋਈ ਨਹੀਂ</string>
diff --git a/AnkiDroid/src/main/res/values-pl/02-strings.xml b/AnkiDroid/src/main/res/values-pl/02-strings.xml
index d4463ca48461..e8710c414d0b 100644
--- a/AnkiDroid/src/main/res/values-pl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-pl/02-strings.xml
@@ -348,7 +348,6 @@
     <string name="orphan_note_message">Usunięcie tej karty spowoduje pozostawienie niektórych notatek bez żadnej karty.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Edytor notatek</string>
@@ -361,7 +360,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edytuj styl</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Kopiuj szablon jako Markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edytuj wygląd przeglądarki kart</string>
-    <string name="show_shortcuts_message">Naciśnij Alt+K, aby wyświetlić skróty klawiszowe</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-pl/10-preferences.xml b/AnkiDroid/src/main/res/values-pl/10-preferences.xml
index dd4787bb2095..eeb95cc99efd 100644
--- a/AnkiDroid/src/main/res/values-pl/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-pl/10-preferences.xml
@@ -99,6 +99,7 @@
     <string name="gestures_summ">Przydziel gesty do akcji takich jak odpowiedzi lub edycja kart.</string>
     <string name="gestures_corner_touch" maxLength="41">Dotyk 9-punktowy</string>
     <string name="gestures_corner_touch_summary">Zezwalaj na gesty dotykowe w rogach ekranu</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Panel nawigacyjny w pełnym ekranie</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Otwórz panel nawigacyjny po przesunięciu w prawo w dowolnym miejscu ekranu</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Brak</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml b/AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml
index 26bb6cc3d3e0..568390a8f950 100644
--- a/AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">Deletar essa categoria de cartão deixará algumas notas sem cartão</string>
     <string name="voice_not_supported">Voz não suportada. Tente outra ou instale um mecanismo de voz.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Mostrar diálogo de atalhos de teclado</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Selecionador de baralho</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Deletar baralho sem confirmação</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Editor de Notas</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Editar estilo</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copiar o modelo como markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Editar aparência do navegador</string>
-    <string name="show_shortcuts_message">Pressione Alt+K para mostrar atalhos de teclado</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">A ação do usuário %s não está definida neste tipo de nota. Por favor, configure-a</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-pt-rBR/10-preferences.xml b/AnkiDroid/src/main/res/values-pt-rBR/10-preferences.xml
index 654ffd8f6203..60fbf1794859 100644
--- a/AnkiDroid/src/main/res/values-pt-rBR/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-pt-rBR/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Atribuir gestos a ações tais como responder e editar cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9 Ações de Toque </string>
     <string name="gestures_corner_touch_summary">Permitir gestos de toque nos cantos da tela</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Painel de navegação em tela cheia</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Abrir painel de navegação ao ser deslizado de qualquer lugar da tela</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Nenhuma</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml b/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml
index 4b1710434de7..4e31814bd427 100644
--- a/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">Apagar este tipo de ficha implica deixar algumas notas sem fichas.</string>
     <string name="voice_not_supported">Voz não suportada. Tente outra ou instale um motor de voz.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Mostrar janela com os atalhos de teclado</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Ecrã de Selecção de Baralhos</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Eliminar baralho sem confirmação</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Editor de Notas</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Editar estilo do modelo</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copiar modelo no formato markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Editar a aparência do explorador</string>
-    <string name="show_shortcuts_message">Pressione Alt+K para ver os atalhos de teclado</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">A acção %s não foi definida para este tipo de nota. Por favor configure-o.</string>
     <string name="directory_inaccessible_info">Descubra mais sobre como restaurar o acesso aqui %s, ou vá às definições para actualizar a pasta das colecções.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-pt-rPT/10-preferences.xml b/AnkiDroid/src/main/res/values-pt-rPT/10-preferences.xml
index 26f68e583171..4d3b51d376a2 100644
--- a/AnkiDroid/src/main/res/values-pt-rPT/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-pt-rPT/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Atribuir gestos a ações tais como responder e editar fichas.</string>
     <string name="gestures_corner_touch" maxLength="41">Toque de 9 pontos</string>
     <string name="gestures_corner_touch_summary">Permitir gestos de toque nos cantos da tela</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Painel de navegação no ecrã completo</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Abrir painel de navegação quando desliza para a direita de qualquer ponto do ecrã</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Nenhum</string>
diff --git a/AnkiDroid/src/main/res/values-ro/02-strings.xml b/AnkiDroid/src/main/res/values-ro/02-strings.xml
index c9ba40ca3066..0f13b0dcafc3 100644
--- a/AnkiDroid/src/main/res/values-ro/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ro/02-strings.xml
@@ -342,7 +342,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -355,7 +354,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ro/10-preferences.xml b/AnkiDroid/src/main/res/values-ro/10-preferences.xml
index e99459567bce..17fc2c02636b 100644
--- a/AnkiDroid/src/main/res/values-ro/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ro/10-preferences.xml
@@ -98,6 +98,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-ru/02-strings.xml b/AnkiDroid/src/main/res/values-ru/02-strings.xml
index b6f552a9740c..35716683ead8 100644
--- a/AnkiDroid/src/main/res/values-ru/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ru/02-strings.xml
@@ -343,7 +343,6 @@
     <string name="orphan_note_message">Удаление этого типа карточек оставит некоторые записи без карточек.</string>
     <string name="voice_not_supported">Этот голос не поддерживается. Попробуйте другой или установите голосовой движок.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Показать диалог сочетаний клавиш</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Выбор колоды</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Удалить колоду без подтверждения</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Редактор записей</string>
@@ -356,7 +355,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Править стиль</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Копировать шаблон как markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Изменить вид браузера</string>
-    <string name="show_shortcuts_message">Нажмите Alt+K, чтобы показать сочетания клавиш</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">В этом блокноте не задано действие пользователя %s. Пожалуйста, настройте его</string>
     <string name="directory_inaccessible_info">Узнайте больше о том, как восстановить доступ здесь %s или перейдите к настройкам для обновления папки коллекции.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ru/10-preferences.xml b/AnkiDroid/src/main/res/values-ru/10-preferences.xml
index f0420dc1d759..81027c75c21a 100644
--- a/AnkiDroid/src/main/res/values-ru/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ru/10-preferences.xml
@@ -99,6 +99,7 @@
     <string name="gestures_summ">Назначает жесты действиям вроде ответа и правки</string>
     <string name="gestures_corner_touch" maxLength="41">9 зон касания</string>
     <string name="gestures_corner_touch_summary">Разрешить сенсорные жесты в углах экрана</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Панель навигации при полном экране</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Открывать панель навигации при смахивании вправо с любого места на экране</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Нет</string>
diff --git a/AnkiDroid/src/main/res/values-sat/02-strings.xml b/AnkiDroid/src/main/res/values-sat/02-strings.xml
index 401c6bcdfd06..17d3af8b0a64 100644
--- a/AnkiDroid/src/main/res/values-sat/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sat/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">ᱱᱚᱶᱟ ᱠᱟᱨᱰ ᱨᱮᱱᱟᱜ ᱛᱟᱹᱞᱠᱟᱹ ᱵᱚᱫᱚᱞ ᱞᱮᱠᱷᱟᱱ ᱠᱟᱨᱰ ᱵᱟᱹᱱᱩᱜ ᱟᱠᱟᱱ ᱟᱭᱢᱟ ᱱᱳᱴᱥ ᱠᱚ ᱵᱚᱫᱚᱞᱚᱜ-ᱟ᱾</string>
     <string name="voice_not_supported">ᱨᱚᱲ ᱵᱟᱭ ᱥᱚᱦᱚᱫ ᱟᱠᱟᱱᱟ ᱮᱴᱟᱜ ᱢᱤᱫᱴᱟᱹᱝ ᱥᱮ ᱟᱲᱟᱝ ᱮᱱᱮᱡ ᱥᱮᱞᱮᱫᱽ ᱢᱮ ᱾</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">ᱠᱤᱯᱤᱴᱚᱰ ᱥᱟᱠᱚᱨᱰ ᱠᱚᱰ ᱰᱟᱭᱞᱳᱜᱽ ᱵᱚᱫᱚᱞ</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">ᱰᱮᱠ ᱯᱤᱠᱥᱚᱨ</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">ᱥᱟᱹᱠᱷᱭᱟᱹᱛ ᱵᱟᱹᱱᱩᱜ ᱠᱷᱟᱱ ᱰᱮᱠ ᱵᱚᱫᱚᱞ ᱢᱮ</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">ᱱᱳᱴᱥ ᱮᱰᱤᱴᱚᱨ</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">ᱥᱟᱯᱲᱟᱣ ᱥᱟᱠᱟᱢ</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">ᱢᱟᱨᱠᱰᱟᱩᱱ ᱞᱮᱠᱟᱛᱮ ᱠᱳᱯᱤ ᱢᱮᱴᱟᱤᱞ</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">ᱵᱽᱨᱟᱩᱡᱚᱨ ᱨᱮᱱᱟᱜ ᱧᱮᱞ ᱥᱟᱯᱲᱟᱣ</string>
-    <string name="show_shortcuts_message">ᱠᱤᱵᱚᱨᱰ ᱥᱠᱚᱨᱴᱚᱠ ᱠᱚ ᱧᱮᱞ ᱞᱟᱹᱜᱤᱫ Alt+K ᱚᱞ ᱢᱮ</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">ᱱᱚᱶᱟ ᱱᱳᱴᱤᱯ ᱨᱮ ᱵᱮᱵᱷᱟᱨᱤᱭᱟᱹ ᱠᱟᱹᱢᱤ %s ᱫᱚ ᱵᱟᱝ ᱥᱮᱴᱮᱨ ᱟᱠᱟᱱᱟ. ᱱᱚᱶᱟ ᱞᱤᱱ ᱢᱮ</string>
     <string name="directory_inaccessible_info">%s ᱨᱮ ᱥᱮᱴᱮᱨᱚᱜ ᱨᱮᱱᱟᱜ ᱵᱟᱹᱲᱛᱤ ᱵᱟᱰᱟᱭ ᱞᱟᱹᱜᱤᱫ ᱥᱮᱴᱮᱨᱚᱜ ᱨᱮ ᱥᱮᱴᱮᱨᱚᱜ ᱢᱮ ᱟᱨ ᱥᱮᱞᱮᱫ ᱯᱟᱹᱴᱷᱩᱣᱟᱹ ᱠᱚᱢᱯᱩᱴᱚᱨ ᱨᱮ ᱵᱚᱫᱚᱞ ᱢᱮ</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-sat/10-preferences.xml b/AnkiDroid/src/main/res/values-sat/10-preferences.xml
index 27f13458ccd5..99ce44ceecd2 100644
--- a/AnkiDroid/src/main/res/values-sat/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sat/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">ᱛᱮᱞᱟ ᱮᱢ ᱟᱨ ᱠᱟᱰᱥ ᱥᱟᱯᱰᱟᱣ ᱞᱟᱹᱜᱤᱫ ᱜᱮᱥᱪᱚᱨ ᱠᱚ ᱴᱷᱤᱠ ᱢᱮ ᱾</string>
     <string name="gestures_corner_touch" maxLength="41">᱙ᱼᱤᱸᱪ ᱚᱛᱟ</string>
     <string name="gestures_corner_touch_summary">ᱥᱠᱨᱤᱱ ᱠᱩᱱᱟᱹ ᱠᱚᱨᱮ  ᱚᱛᱟ ᱜᱮᱥᱪᱚᱨᱠᱚ ᱮᱢ ᱪᱷᱚ</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">ᱯᱷᱩᱞᱥᱨᱤᱱ ᱱᱮᱵᱷᱤᱜᱮᱥᱚᱱ ᱰᱟᱨᱣᱮᱨ</string>
     <string name="gestures_fullscreen_nav_drawer_summary">ᱥᱠᱨᱤᱱ ᱨᱮᱭᱟᱜ ᱡᱟᱦᱟᱸᱥᱮᱫ ᱠᱷᱚᱱ ᱡᱚᱡᱚᱢ ᱯᱟᱦᱴᱟ ᱥᱣᱟᱭᱤᱯ ᱠᱟᱛᱮ ᱱᱟᱵᱷᱤᱜᱮᱥᱚᱱ ᱰᱨᱚᱣᱮᱨ ᱡᱷᱤᱡᱽ ᱯᱮ</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">ᱡᱟᱦᱟᱱ ᱵᱟᱝ</string>
diff --git a/AnkiDroid/src/main/res/values-sc/02-strings.xml b/AnkiDroid/src/main/res/values-sc/02-strings.xml
index a5dfb4464f0f..a3a3d953e0ec 100644
--- a/AnkiDroid/src/main/res/values-sc/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sc/02-strings.xml
@@ -338,7 +338,6 @@
     <string name="orphan_note_message">S\'iscantzelladura de custa casta de carta at a lassare unas cantas notas chene carta peruna.</string>
     <string name="voice_not_supported">Boghe non suportada. Proa·nde un\'àtera o installa unu motore vocale.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Mustra su diàlogu de incurtzadas de tecladu</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Seletzionadore de matzu</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Iscantzella su matzu chene cunfirma</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Editore de notas</string>
@@ -351,7 +350,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Modìfica s\'istile</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Còpia su modellu comente markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Modìfica s\'aparèntzia de su navigadore</string>
-    <string name="show_shortcuts_message">Incarca Alt+K pro mustrare sas incurtzadas de tecladu</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">S\'atzione de utente %s no est cunfigurada pro custa casta de nota. Cunfigura·la</string>
     <string name="directory_inaccessible_info">Impara de prus subra de comente ripristinare s\'atzessu inoghe %s o bae a sas impostatziones pro atualizare sa cartella de sas colletziones.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-sc/10-preferences.xml b/AnkiDroid/src/main/res/values-sc/10-preferences.xml
index fd898e461776..b3a41ada6f3a 100644
--- a/AnkiDroid/src/main/res/values-sc/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sc/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Assigna gestos a atziones che a sas rispostas e a sas modìficas de sas cartas.</string>
     <string name="gestures_corner_touch" maxLength="41">Tocu a 9 puntos</string>
     <string name="gestures_corner_touch_summary">Permiti sos gestos tàtiles in sos àngulos de s\'ischermu</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Pannellu de navigatzione a ischermu intreu</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Aberi su pannellu de navigatzione cando trìsinas cara a dereta dae cale si siat puntu de s\'ischermu</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Perunu</string>
diff --git a/AnkiDroid/src/main/res/values-sk/02-strings.xml b/AnkiDroid/src/main/res/values-sk/02-strings.xml
index bc0b29a31150..b9c861a93333 100644
--- a/AnkiDroid/src/main/res/values-sk/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sk/02-strings.xml
@@ -348,7 +348,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -361,7 +360,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-sk/10-preferences.xml b/AnkiDroid/src/main/res/values-sk/10-preferences.xml
index 713c3a907020..1a130d82421a 100644
--- a/AnkiDroid/src/main/res/values-sk/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sk/10-preferences.xml
@@ -99,6 +99,7 @@
     <string name="gestures_summ">Prideliť gestá k akciám ako sú odpoveď či editovanie kartičiek.</string>
     <string name="gestures_corner_touch" maxLength="41">9-bodový dotyk</string>
     <string name="gestures_corner_touch_summary">Povoliť dotykové gestá v rohoch obrazovky</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Navigačné menu v režime celej obrazovky</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Otvoriť navigačné menu, keď sa tiahne doprava kdekoľvek na obrazovke</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Žiadne</string>
diff --git a/AnkiDroid/src/main/res/values-sl/02-strings.xml b/AnkiDroid/src/main/res/values-sl/02-strings.xml
index 36a058121e77..0d4f13ff5758 100644
--- a/AnkiDroid/src/main/res/values-sl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sl/02-strings.xml
@@ -348,7 +348,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -361,7 +360,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-sl/10-preferences.xml b/AnkiDroid/src/main/res/values-sl/10-preferences.xml
index 49239a5b5912..36e124fe6764 100644
--- a/AnkiDroid/src/main/res/values-sl/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sl/10-preferences.xml
@@ -99,6 +99,7 @@
     <string name="gestures_summ">Dodeli poteze dejanjem, kot sta odgovarjanje in urejanje kartic.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-sq/02-strings.xml b/AnkiDroid/src/main/res/values-sq/02-strings.xml
index 5cc4d585ecd9..67afb1b07946 100644
--- a/AnkiDroid/src/main/res/values-sq/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sq/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-sq/10-preferences.xml b/AnkiDroid/src/main/res/values-sq/10-preferences.xml
index 034f3e57b0b1..ea74a38d8c9d 100644
--- a/AnkiDroid/src/main/res/values-sq/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sq/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-sr/02-strings.xml b/AnkiDroid/src/main/res/values-sr/02-strings.xml
index 1784f2698fa4..17f20f090979 100644
--- a/AnkiDroid/src/main/res/values-sr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sr/02-strings.xml
@@ -342,7 +342,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -355,7 +354,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-sr/10-preferences.xml b/AnkiDroid/src/main/res/values-sr/10-preferences.xml
index 1dbae4b14463..e430fd071d38 100644
--- a/AnkiDroid/src/main/res/values-sr/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sr/10-preferences.xml
@@ -98,6 +98,7 @@
     <string name="gestures_summ">Додели гестове за дејства као одговарње и уређивање картица.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-ss/02-strings.xml b/AnkiDroid/src/main/res/values-ss/02-strings.xml
index e0c971192ee7..a86dedce299e 100644
--- a/AnkiDroid/src/main/res/values-ss/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ss/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ss/10-preferences.xml b/AnkiDroid/src/main/res/values-ss/10-preferences.xml
index 034f3e57b0b1..ea74a38d8c9d 100644
--- a/AnkiDroid/src/main/res/values-ss/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ss/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-sv/02-strings.xml b/AnkiDroid/src/main/res/values-sv/02-strings.xml
index f658854f2fbf..2c90c73f3756 100644
--- a/AnkiDroid/src/main/res/values-sv/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sv/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">Om du tar bort denna kort typ så kommer det finnas noter utan kort.</string>
     <string name="voice_not_supported">Röstfunktionalitet är stöttas inte. Försök en annan eller installera en röst motor.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Visa dialogrutan tangentbords kortkommandon</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Kortleksväljare</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Ta bort kortlek utan konfirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Ändra stil</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Kopiera mallen som markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Tryck Alt+K för att visa tangentbords kortkommandon</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-sv/10-preferences.xml b/AnkiDroid/src/main/res/values-sv/10-preferences.xml
index 84b8a6cb46ea..a7fcfe5f041d 100644
--- a/AnkiDroid/src/main/res/values-sv/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sv/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Koppla gester till handlingar, som t ex att svara på eller redigera kort.</string>
     <string name="gestures_corner_touch" maxLength="41">9-punkters pekning</string>
     <string name="gestures_corner_touch_summary">Tillåt tryckgester i skärmhörnen</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Fullskärm navigationsmeny</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Öppna navigationsmeny när du swipar höger var som helst på skärmen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Ingen</string>
diff --git a/AnkiDroid/src/main/res/values-sw/02-strings.xml b/AnkiDroid/src/main/res/values-sw/02-strings.xml
index e0c971192ee7..a86dedce299e 100644
--- a/AnkiDroid/src/main/res/values-sw/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sw/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-sw/10-preferences.xml b/AnkiDroid/src/main/res/values-sw/10-preferences.xml
index 034f3e57b0b1..ea74a38d8c9d 100644
--- a/AnkiDroid/src/main/res/values-sw/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sw/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-ta/02-strings.xml b/AnkiDroid/src/main/res/values-ta/02-strings.xml
index abeb39cf4f81..b415489d009c 100644
--- a/AnkiDroid/src/main/res/values-ta/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ta/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">இந்தக் கார்டு வகையை நீக்கினால் சில குறிப்புகள் கார்டு இல்லாமல் இருக்கும்.</string>
     <string name="voice_not_supported">குரல் ஆதரிக்கப்படவில்லை. வேறொன்றை முயற்சிக்கவும் அல்லது குரல் இயந்திரத்தை நிறுவவும்.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">விசைப்பலகை குறுக்குவழிகள் உரையாடலைக் காட்டு</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">டெக் பிக்கர்</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">உறுதிப்படுத்தல் இல்லாமல் டெக்கை நீக்கு</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">குறிப்பு எடிட்டர்</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">ஸ்டைலிங் திருத்தவும்</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">டெம்ப்ளேட்டை மார்க் டவுனாக நகலெடுக்கவும்</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">உலாவியின் தோற்றத்தைத் திருத்தவும்</string>
-    <string name="show_shortcuts_message">விசைப்பலகை குறுக்குவழிகளைக் காட்ட Alt+K ஐ அழுத்தவும்</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">இந்த நோட்டிப்பில் பயனர் செயல் %s அமைக்கப்படவில்லை. தயவுசெய்து அதை உள்ளமைக்கவும்</string>
     <string name="directory_inaccessible_info">அணுகலை எவ்வாறு மீட்டெடுப்பது என்பது பற்றி இங்கே %s இல் மேலும் அறிக அல்லது சேகரிப்பு கோப்புறையைப் புதுப்பிக்க அமைப்புகளுக்குச் செல்லவும்.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ta/10-preferences.xml b/AnkiDroid/src/main/res/values-ta/10-preferences.xml
index b14a07260dfe..7add29ec4ef0 100644
--- a/AnkiDroid/src/main/res/values-ta/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ta/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">பதிலளிப்பது மற்றும் கார்டுகளைத் திருத்துவது போன்ற செயல்களுக்கு சைகைகளை ஒதுக்குங்கள்.பதிலளிப்பது மற்றும் கார்டுகளைத் திருத்துவது போன்ற செயல்களுக்கு சைகைகளை ஒதுக்குங்கள்.</string>
     <string name="gestures_corner_touch" maxLength="41">9-புள்ளி தொடுதல்</string>
     <string name="gestures_corner_touch_summary">திரை மூலைகளில் தொடு சைகைகளை அனுமதிக்கவும்</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">முழு திரை வழிசெலுத்தல் டிராயர்</string>
     <string name="gestures_fullscreen_nav_drawer_summary">திரையில் எங்கிருந்தும் வலதுபுறமாக ஸ்வைப் செய்யும் போது வழிசெலுத்தல் டிராயரைத் திறக்கவும்</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">இல்லை</string>
diff --git a/AnkiDroid/src/main/res/values-te/02-strings.xml b/AnkiDroid/src/main/res/values-te/02-strings.xml
index e2b71e5803db..e5ac886ca171 100644
--- a/AnkiDroid/src/main/res/values-te/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-te/02-strings.xml
@@ -330,7 +330,6 @@
     <string name="orphan_note_message">ఈ కార్డ్ రకాన్ని తొలగించడం వలన కొన్ని గమనికలు కార్డ్‌లు లేకుండా ఉంటాయి.</string>
     <string name="voice_not_supported">వాయిస్ మద్దతు లేదు. మరొకటి ప్రయత్నించండి లేదా వాయిస్ ఇంజిన్‌ని ఇన్‌స్టాల్ చేయండి.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">కీబోర్డ్ సత్వరమార్గాల డైలాగ్‌ని చూపించు</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">డెక్ పికర్</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">నిర్ధారణ లేకుండా డెక్‌ను తొలగించండి</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">గమనిక ఎడిటర్</string>
@@ -343,7 +342,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">స్టైలింగ్‌ని సవరించండి</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">టెంప్లేట్‌ను మార్క్‌డౌన్‌గా కాపీ చేయండి</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">బ్రౌజర్ రూపాన్ని సవరించండి</string>
-    <string name="show_shortcuts_message">కీబోర్డ్ సత్వరమార్గాలను చూపడానికి Alt+K నొక్కండి</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">ఈ నోట్‌టైప్‌లో వినియోగదారు చర్య %s సెట్ చేయబడలేదు. దయచేసి దీన్ని కాన్ఫిగర్ చేయండి</string>
     <string name="directory_inaccessible_info">ఇక్కడ యాక్సెస్‌ని ఎలా పునరుద్ధరించాలనే దాని గురించి మరింత తెలుసుకోండి %s లేదా సేకరణ ఫోల్డర్‌ని నవీకరించడానికి సెట్టింగ్‌లకు వెళ్లండి.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-te/10-preferences.xml b/AnkiDroid/src/main/res/values-te/10-preferences.xml
index a7dd2f3d6eac..3aebbf1dd2ad 100644
--- a/AnkiDroid/src/main/res/values-te/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-te/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">కార్డులకు సమాధానం ఇవ్వడం మరియు సవరించడం వంటి చర్యలకు సంజ్ఞలను కేటాయించండి.</string>
     <string name="gestures_corner_touch" maxLength="41">9-పాయింట్ టచ్</string>
     <string name="gestures_corner_touch_summary">స్క్రీన్ మూలల్లో టచ్ సంజ్ఞలను అనుమతించండి</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">పూర్తి స్క్రీన్ నావిగేషన్ డ్రాయర్</string>
     <string name="gestures_fullscreen_nav_drawer_summary">స్క్రీన్‌పై ఎక్కడి నుండైనా కుడివైపుకు స్వైప్ చేస్తున్నప్పుడు నావిగేషన్ డ్రాయర్‌ను తెరవండి</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">ఏదీ లేదు</string>
diff --git a/AnkiDroid/src/main/res/values-tg/02-strings.xml b/AnkiDroid/src/main/res/values-tg/02-strings.xml
index e0c971192ee7..a86dedce299e 100644
--- a/AnkiDroid/src/main/res/values-tg/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tg/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-tg/10-preferences.xml b/AnkiDroid/src/main/res/values-tg/10-preferences.xml
index 034f3e57b0b1..ea74a38d8c9d 100644
--- a/AnkiDroid/src/main/res/values-tg/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-tg/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-tgl/02-strings.xml b/AnkiDroid/src/main/res/values-tgl/02-strings.xml
index e1b9f5bd8205..78acb308ab37 100644
--- a/AnkiDroid/src/main/res/values-tgl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tgl/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-tgl/10-preferences.xml b/AnkiDroid/src/main/res/values-tgl/10-preferences.xml
index 23f092868b90..1b5bf2e4091d 100644
--- a/AnkiDroid/src/main/res/values-tgl/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-tgl/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Magtalaga ng mga kilos sa mga aksyon tulad ng pagsagot at pag-edit ng mga card.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-th/02-strings.xml b/AnkiDroid/src/main/res/values-th/02-strings.xml
index 3a1a6cfe0925..c3ba8bd5d01d 100644
--- a/AnkiDroid/src/main/res/values-th/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-th/02-strings.xml
@@ -330,7 +330,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -343,7 +342,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-th/10-preferences.xml b/AnkiDroid/src/main/res/values-th/10-preferences.xml
index 50af4b1539eb..0ae3b7c013c5 100644
--- a/AnkiDroid/src/main/res/values-th/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-th/10-preferences.xml
@@ -96,6 +96,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-ti/02-strings.xml b/AnkiDroid/src/main/res/values-ti/02-strings.xml
index e0c971192ee7..a86dedce299e 100644
--- a/AnkiDroid/src/main/res/values-ti/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ti/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ti/10-preferences.xml b/AnkiDroid/src/main/res/values-ti/10-preferences.xml
index 034f3e57b0b1..ea74a38d8c9d 100644
--- a/AnkiDroid/src/main/res/values-ti/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ti/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-tn/02-strings.xml b/AnkiDroid/src/main/res/values-tn/02-strings.xml
index e0c971192ee7..a86dedce299e 100644
--- a/AnkiDroid/src/main/res/values-tn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tn/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-tn/10-preferences.xml b/AnkiDroid/src/main/res/values-tn/10-preferences.xml
index 034f3e57b0b1..ea74a38d8c9d 100644
--- a/AnkiDroid/src/main/res/values-tn/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-tn/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-tr/02-strings.xml b/AnkiDroid/src/main/res/values-tr/02-strings.xml
index f9b966abc28f..5e92adbf3a35 100644
--- a/AnkiDroid/src/main/res/values-tr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tr/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">Bu kart türünü silmek bazı notları kartsız bırakacak.</string>
     <string name="voice_not_supported">Seslendirme desteklenmiyor. Başka bir seslendirme motoru deneyin ya da bir tane yükleyin.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Klavye kısayolları diyaloğunu göster</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deste Seçici</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Desteyi onay sormadan sil</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Not Düzenleyici</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Stili düzenle</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Şablonu markdown olarak kopyala</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Tarayıcı görünümünü düzenle</string>
-    <string name="show_shortcuts_message">Klavye kısayollarını göstermek için Alt+K\'ye basın</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">%s kullanıcı eylemi bu not türünde belirlenmemiş. Lütfen eylemi ayarlayın</string>
     <string name="directory_inaccessible_info">Erişimin nasıl yeniden sağlanıldığına dair daha fazlasını burda %s öğrenin ya da koleksiyon klasörünü değiştirmek için ayarlara gidin.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-tr/10-preferences.xml b/AnkiDroid/src/main/res/values-tr/10-preferences.xml
index eefd4127e15f..ab5b7816e919 100644
--- a/AnkiDroid/src/main/res/values-tr/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-tr/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Cevap verme ve kart düzenleme gibi eylemlere el hareketleri ata.</string>
     <string name="gestures_corner_touch" maxLength="41">9 noktadan dokunma</string>
     <string name="gestures_corner_touch_summary">Ekran köşelerinde dokunma hareketlerine izin ver</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Tam ekran gezinme çekmecesi</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Ekranın üzerindeki herhangi bir yerden sağa doğru parmağınızı kaydırdığınızda bütün dosyaların genel görünümü için bir önizleme açılacaktır</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Hiçbiri</string>
diff --git a/AnkiDroid/src/main/res/values-ts/02-strings.xml b/AnkiDroid/src/main/res/values-ts/02-strings.xml
index e0c971192ee7..a86dedce299e 100644
--- a/AnkiDroid/src/main/res/values-ts/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ts/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ts/10-preferences.xml b/AnkiDroid/src/main/res/values-ts/10-preferences.xml
index 034f3e57b0b1..ea74a38d8c9d 100644
--- a/AnkiDroid/src/main/res/values-ts/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ts/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-tt/02-strings.xml b/AnkiDroid/src/main/res/values-tt/02-strings.xml
index 75aee2e4e660..15619d3e12f6 100644
--- a/AnkiDroid/src/main/res/values-tt/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tt/02-strings.xml
@@ -331,7 +331,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -344,7 +343,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-tt/10-preferences.xml b/AnkiDroid/src/main/res/values-tt/10-preferences.xml
index 6e449c9a128a..70b7efb5fb43 100644
--- a/AnkiDroid/src/main/res/values-tt/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-tt/10-preferences.xml
@@ -96,6 +96,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-ug/02-strings.xml b/AnkiDroid/src/main/res/values-ug/02-strings.xml
index 368f98932847..957d64b793f7 100644
--- a/AnkiDroid/src/main/res/values-ug/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ug/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">بۇ كارتا تۈرى ئۆچۈرۈلسە بەزى كارتىسىز خاتىرە قېپقالىدۇ.</string>
     <string name="voice_not_supported">ئاۋازنى قوللىمايدۇ. باشقا بىرىنى سىناڭ ياكى ئاۋاز موتورىدىن بىرنى ئورنىتىڭ.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">ھەرپتاختا قىسقا يولىنى كۆرسەت</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">دەستە تاللىغۇچ</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">دەستىنى سورىمايلا ئۆچۈرىدۇ</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">خاتىرە تەھرىرلىگۈچ</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">ئۇسلۇب تەھرىر</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">قېلىپنى Markdown سۈپىتىدە كۆچۈر</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">كارتا كۆرگۈچ كۆرۈنۈشىنى تەھرىرلەيدۇ</string>
-    <string name="show_shortcuts_message">Alt+K بېسىلسا ھەرپتاختا تېزلەتمىسىنى كۆرسىتىدۇ</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">%s  ئىشلەتكۈچى مەشغۇلاتى خاتىرە تۈرىدە تەڭشەلمىگەن. سەپلەڭ</string>
     <string name="directory_inaccessible_info">بۇ جاي %s دىكى زىيارەتنى قانداق ئەسلىگە كەلتۈرۈش ياكى تەڭشەككە يۆتكىلىپ توپلام قىسقۇچىنى يېڭىلاش ھەققىدىكى تەپسىلاتنى كۆرۈڭ.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ug/10-preferences.xml b/AnkiDroid/src/main/res/values-ug/10-preferences.xml
index 7c721ad76dc8..a44bf7c07923 100644
--- a/AnkiDroid/src/main/res/values-ug/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ug/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">جاۋاب ۋە كارتا تەھرىرلەشكە ئوخشاش مەشغۇلاتقا قول ئىشارىتى بەلگىلەيدۇ.</string>
     <string name="gestures_corner_touch" maxLength="41">9 نۇقتا سەزگۈچ</string>
     <string name="gestures_corner_touch_summary">ئېكران بۇلۇڭلىرى تېگىشىش قول ئىشارىتىگە يول قويىدۇ</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">پۈتۈن ئېكران يولباشچى تارتمىسى</string>
     <string name="gestures_fullscreen_nav_drawer_summary">ئېكراننىڭ خالىغان يېرىدىن ئوڭغا سۈرۈلسە يولباشچى تارتمىسىنى ئاچىدۇ</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">يوق</string>
diff --git a/AnkiDroid/src/main/res/values-uk/02-strings.xml b/AnkiDroid/src/main/res/values-uk/02-strings.xml
index 459059a585a2..76a3c9c2cb4c 100644
--- a/AnkiDroid/src/main/res/values-uk/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-uk/02-strings.xml
@@ -347,7 +347,6 @@
     <string name="orphan_note_message">Якщо видалити цей тип картки, деякі записи залишаться без карток.</string>
     <string name="voice_not_supported">Голос не підтримується. Спробуйте інший або встановіть голосовий рушій.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Показати діалогове вікно комбінацій клавіш</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Вибір колод</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Видалити колоду без підтвердження</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Редактор записів</string>
@@ -360,7 +359,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Редагувати стиль</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Копіювати шаблон як розмітку</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Редагувати вигляд переглядача карток</string>
-    <string name="show_shortcuts_message">Натисніть Alt+K, щоб показати комбінації клавіш</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">Дію користувача %s не встановлено в цьому типі запису. Будь ласка, налаштуйте її</string>
     <string name="directory_inaccessible_info">Дізнайтесь більше про те, як відновити доступ тут – %s, або перейдіть в налаштування, щоб оновити теку колекцій.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-uk/10-preferences.xml b/AnkiDroid/src/main/res/values-uk/10-preferences.xml
index c44d89f3f6b6..1b40a9762b94 100644
--- a/AnkiDroid/src/main/res/values-uk/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-uk/10-preferences.xml
@@ -99,6 +99,7 @@
     <string name="gestures_summ">Використовувати жести для таких дій, як відповідь і редагування карток.</string>
     <string name="gestures_corner_touch" maxLength="41">9-точковий дотик</string>
     <string name="gestures_corner_touch_summary">Дозволити сенсорні жести в кутах екрану</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Повноекранна панель навігації</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Відкривати панель навігації при проведенні вправо з будь-якого місця на екрані</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Немає</string>
diff --git a/AnkiDroid/src/main/res/values-ur/02-strings.xml b/AnkiDroid/src/main/res/values-ur/02-strings.xml
index 8f7146514ff7..956cf91ce34f 100644
--- a/AnkiDroid/src/main/res/values-ur/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ur/02-strings.xml
@@ -337,7 +337,6 @@
     <string name="orphan_note_message">اس کارڈ کی قسم کو حذف کرنے سے کچھ نوٹ بغیر کسی کارڈ کے رہ جائیں گے۔</string>
     <string name="voice_not_supported">آواز تعاون یافتہ نہیں ہے۔ دوسرا آزمائیں یا صوتی انجن انسٹال کریں۔</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">کی بورڈ شارٹ کٹ ڈائیلاگ دکھائیں۔</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">ڈیک چننے والا</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">تصدیق کے بغیر ڈیک کو حذف کریں۔</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">نوٹ ایڈیٹر</string>
@@ -350,7 +349,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">اسٹائل میں ترمیم کریں</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">ٹیمپلیٹ کو بطور مارک ڈاؤن کاپی کریں</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">براؤزر کی ظاہری شکل میں ترمیم کریں</string>
-    <string name="show_shortcuts_message">کی بورڈ شارٹ کٹ دکھانے کے لیے Alt+K دبائیں</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">صارف کی کارروائی %s اس نوٹ ٹائپ میں سیٹ نہیں ہے۔ براہ کرم اسے ترتیب دیں</string>
     <string name="directory_inaccessible_info">یہاں %s تک رسائی کو بحال کرنے کے بارے میں مزید جانیں یا کلیکشن فولڈر کو اپ ڈیٹ کرنے کے لیے سیٹنگز پر جائیں۔</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ur/10-preferences.xml b/AnkiDroid/src/main/res/values-ur/10-preferences.xml
index 4bb0f702de3c..680a1cd5002c 100644
--- a/AnkiDroid/src/main/res/values-ur/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ur/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">جواب دینے اور کارڈز میں ترمیم کرنے جیسے اعمال کے لیے اشاروں کو تفویض کریں۔</string>
     <string name="gestures_corner_touch" maxLength="41">9 پوائنٹ ٹچ</string>
     <string name="gestures_corner_touch_summary">اسکرین کونوں میں ٹچ اشاروں کی اجازت دیں</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">فل سکرین نیویگیشن دراز</string>
     <string name="gestures_fullscreen_nav_drawer_summary">اسکرین پر کسی بھی جگہ سے سیدھے سوائپ کرنے پر نیویگیشن دراز کھولیں</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">کوئی نہیں</string>
diff --git a/AnkiDroid/src/main/res/values-uz/02-strings.xml b/AnkiDroid/src/main/res/values-uz/02-strings.xml
index 3e335565b0bd..51e2f56007f2 100644
--- a/AnkiDroid/src/main/res/values-uz/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-uz/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-uz/10-preferences.xml b/AnkiDroid/src/main/res/values-uz/10-preferences.xml
index 034f3e57b0b1..ea74a38d8c9d 100644
--- a/AnkiDroid/src/main/res/values-uz/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-uz/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-ve/02-strings.xml b/AnkiDroid/src/main/res/values-ve/02-strings.xml
index e0c971192ee7..a86dedce299e 100644
--- a/AnkiDroid/src/main/res/values-ve/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ve/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ve/10-preferences.xml b/AnkiDroid/src/main/res/values-ve/10-preferences.xml
index 034f3e57b0b1..ea74a38d8c9d 100644
--- a/AnkiDroid/src/main/res/values-ve/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ve/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-vi/02-strings.xml b/AnkiDroid/src/main/res/values-vi/02-strings.xml
index ee1511f5c158..6d2554db629f 100644
--- a/AnkiDroid/src/main/res/values-vi/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-vi/02-strings.xml
@@ -330,7 +330,6 @@
     <string name="orphan_note_message">Việc xóa loại thẻ này sẽ để lại một số ghi chú không có thẻ nào liên kết.</string>
     <string name="voice_not_supported">Giọng nói không được hỗ trợ. Hãy thử cái khác hoặc cài đặt một công cụ giọng nói.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Hiển thị cửa sổ phím tắt</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Trình chọn bộ thẻ</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Trình ghi chú</string>
@@ -343,7 +342,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Sao chép mẫu dưới dạng markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Chỉnh sửa giao diện trình duyệt</string>
-    <string name="show_shortcuts_message">Nhấn Alt+K để hiển thị lối tắt bàn phím</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-vi/10-preferences.xml b/AnkiDroid/src/main/res/values-vi/10-preferences.xml
index 7f3e11362864..17569a4ac286 100644
--- a/AnkiDroid/src/main/res/values-vi/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-vi/10-preferences.xml
@@ -96,6 +96,7 @@
     <string name="gestures_summ">Chỉ định các cử chỉ để hành động như trả lời và chỉnh sửa thẻ.</string>
     <string name="gestures_corner_touch" maxLength="41">Chạm 9 điểm</string>
     <string name="gestures_corner_touch_summary">Cho phép cử chỉ chạm ở các góc màn hình</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Không</string>
diff --git a/AnkiDroid/src/main/res/values-wo/02-strings.xml b/AnkiDroid/src/main/res/values-wo/02-strings.xml
index 9b976904fdf6..373f381178cc 100644
--- a/AnkiDroid/src/main/res/values-wo/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-wo/02-strings.xml
@@ -330,7 +330,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -343,7 +342,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-wo/10-preferences.xml b/AnkiDroid/src/main/res/values-wo/10-preferences.xml
index 8721a23a9991..127160523bfc 100644
--- a/AnkiDroid/src/main/res/values-wo/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-wo/10-preferences.xml
@@ -96,6 +96,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-xh/02-strings.xml b/AnkiDroid/src/main/res/values-xh/02-strings.xml
index e0c971192ee7..a86dedce299e 100644
--- a/AnkiDroid/src/main/res/values-xh/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-xh/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-xh/10-preferences.xml b/AnkiDroid/src/main/res/values-xh/10-preferences.xml
index 034f3e57b0b1..ea74a38d8c9d 100644
--- a/AnkiDroid/src/main/res/values-xh/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-xh/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-yue/02-strings.xml b/AnkiDroid/src/main/res/values-yue/02-strings.xml
index c8b9e8c5f5da..a0ead5fa8a1e 100644
--- a/AnkiDroid/src/main/res/values-yue/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-yue/02-strings.xml
@@ -330,7 +330,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -343,7 +342,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-yue/10-preferences.xml b/AnkiDroid/src/main/res/values-yue/10-preferences.xml
index 8721a23a9991..127160523bfc 100644
--- a/AnkiDroid/src/main/res/values-yue/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-yue/10-preferences.xml
@@ -96,6 +96,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
diff --git a/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml b/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml
index 29ded3f222d5..eae24efd5e4a 100644
--- a/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml
@@ -330,7 +330,6 @@
     <string name="orphan_note_message">删除此卡片类型将留使一些附注没有任何卡片。</string>
     <string name="voice_not_supported">语音不支持。请尝试另一个或安装一个语音引擎。</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">显示键盘快捷键对话框</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">牌组选择器</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">不经确认删除牌组</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">笔记编辑器</string>
@@ -343,7 +342,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">编辑样式</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">将模板复制为Markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">编辑浏览器外观</string>
-    <string name="show_shortcuts_message">按 Alt+K 显示键盘快捷键</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">此笔记类型中未设置用户操作 %s。请配置它</string>
     <string name="directory_inaccessible_info">在此 %s 了解如何恢复访问的更多信息或转到设置更新牌组集文件夹</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml b/AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml
index ddf9b475b4a5..be77351ac564 100644
--- a/AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml
@@ -96,6 +96,7 @@
     <string name="gestures_summ">为回答或编辑卡片等动作指定手势。</string>
     <string name="gestures_corner_touch" maxLength="41">9 点触摸</string>
     <string name="gestures_corner_touch_summary">允许屏幕边缘的触摸手势</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">全屏导航抽屉</string>
     <string name="gestures_fullscreen_nav_drawer_summary">从屏幕上的任何地方向右滑动时打开导航抽屉</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">无</string>
diff --git a/AnkiDroid/src/main/res/values-zh-rTW/02-strings.xml b/AnkiDroid/src/main/res/values-zh-rTW/02-strings.xml
index 5d5c72414cee..2abb1392bb3f 100644
--- a/AnkiDroid/src/main/res/values-zh-rTW/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-zh-rTW/02-strings.xml
@@ -329,7 +329,6 @@
     <string name="orphan_note_message">刪除此卡類型會使某些筆記本沒有任何卡片。</string>
     <string name="voice_not_supported">不支援語音。請嘗試另一個或安裝語音引擎。</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -342,7 +341,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-zh-rTW/10-preferences.xml b/AnkiDroid/src/main/res/values-zh-rTW/10-preferences.xml
index 68facc7d1936..c7948a52a73b 100644
--- a/AnkiDroid/src/main/res/values-zh-rTW/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-zh-rTW/10-preferences.xml
@@ -96,6 +96,7 @@
     <string name="gestures_summ">替動作設定手勢，像是回答問題和編輯卡片。</string>
     <string name="gestures_corner_touch" maxLength="41">九點邊角觸控</string>
     <string name="gestures_corner_touch_summary">允許在螢幕角落進行觸控</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">全屏的導航抽屜</string>
     <string name="gestures_fullscreen_nav_drawer_summary">從屏幕上任何地方向右劃，可以打開導航的抽屜。</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">無</string>
diff --git a/AnkiDroid/src/main/res/values-zu/02-strings.xml b/AnkiDroid/src/main/res/values-zu/02-strings.xml
index e0c971192ee7..a86dedce299e 100644
--- a/AnkiDroid/src/main/res/values-zu/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-zu/02-strings.xml
@@ -336,7 +336,6 @@
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="show_keyboard_shortcuts_dialog" comment="Description of the shortcut that shows the keyboard shortcuts dialog">Show keyboard shortcuts dialog</string>
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
@@ -349,7 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
-    <string name="show_shortcuts_message">Press Alt+K to show keyboard shortcuts</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-zu/10-preferences.xml b/AnkiDroid/src/main/res/values-zu/10-preferences.xml
index 034f3e57b0b1..ea74a38d8c9d 100644
--- a/AnkiDroid/src/main/res/values-zu/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-zu/10-preferences.xml
@@ -97,6 +97,7 @@
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">None</string>

From f9ee824bf9fdc39a8c6e23d1bba73ee650bf6ff6 Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Fri, 7 Feb 2025 07:21:38 -0300
Subject: [PATCH 028/200] refactor: add `Destination` interface

it can be used to something like a `Destination` flow
---
 .../com/ichi2/anki/NoteEditorIntentTest.kt    |  2 +-
 .../java/com/ichi2/anki/NoteEditorTest.kt     |  2 +-
 .../com/ichi2/anki/AbstractFlashcardViewer.kt |  2 +-
 .../main/java/com/ichi2/anki/CardBrowser.kt   |  4 ++--
 .../main/java/com/ichi2/anki/DeckPicker.kt    |  2 +-
 .../ichi2/anki/ImageOcclusionIntentBuilder.kt |  2 +-
 .../java/com/ichi2/anki/IntentHandler2.kt     |  4 ++--
 .../main/java/com/ichi2/anki/NoteEditor.kt    |  2 +-
 .../src/main/java/com/ichi2/anki/Reviewer.kt  |  2 +-
 .../InstantNoteEditorActivity.kt              |  2 +-
 .../anki/noteeditor/NoteEditorLauncher.kt     |  7 ++++--
 .../ichi2/anki/pages/CardInfoDestination.kt   |  5 ++--
 .../java/com/ichi2/anki/pages/CongratsPage.kt |  7 +++---
 .../ichi2/anki/previewer/PreviewerFragment.kt |  2 +-
 .../ui/windows/reviewer/ReviewerFragment.kt   |  6 ++---
 .../java/com/ichi2/anki/utils/Destination.kt  | 23 +++++++++++++++++++
 .../java/com/ichi2/widget/AddNoteWidget.kt    |  2 +-
 .../java/com/ichi2/anki/NoteEditorTest.kt     |  6 ++---
 18 files changed, 55 insertions(+), 27 deletions(-)
 create mode 100644 AnkiDroid/src/main/java/com/ichi2/anki/utils/Destination.kt

diff --git a/AnkiDroid/src/androidTest/java/com/ichi2/anki/NoteEditorIntentTest.kt b/AnkiDroid/src/androidTest/java/com/ichi2/anki/NoteEditorIntentTest.kt
index 7bf82bc5c452..9aef86abc8aa 100644
--- a/AnkiDroid/src/androidTest/java/com/ichi2/anki/NoteEditorIntentTest.kt
+++ b/AnkiDroid/src/androidTest/java/com/ichi2/anki/NoteEditorIntentTest.kt
@@ -75,6 +75,6 @@ class NoteEditorIntentTest : InstrumentedTest() {
     private val noteEditorTextIntent: Intent
         get() {
             val bundle = bundleOf(Intent.EXTRA_TEXT to "sample text")
-            return NoteEditorLauncher.PassArguments(bundle).getIntent(testContext, Intent.ACTION_SEND)
+            return NoteEditorLauncher.PassArguments(bundle).toIntent(testContext, Intent.ACTION_SEND)
         }
 }
diff --git a/AnkiDroid/src/androidTest/java/com/ichi2/anki/NoteEditorTest.kt b/AnkiDroid/src/androidTest/java/com/ichi2/anki/NoteEditorTest.kt
index 9e690f58c0b0..7fa0194541c8 100644
--- a/AnkiDroid/src/androidTest/java/com/ichi2/anki/NoteEditorTest.kt
+++ b/AnkiDroid/src/androidTest/java/com/ichi2/anki/NoteEditorTest.kt
@@ -52,7 +52,7 @@ abstract class NoteEditorTest protected constructor() {
 
     private val noteEditorIntent: Intent
         get() {
-            return NoteEditorLauncher.AddNote().getIntent(targetContext)
+            return NoteEditorLauncher.AddNote().toIntent(targetContext)
         }
 
     @Before
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.kt b/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.kt
index ff2fef31bd42..496c7ab6da67 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.kt
@@ -803,7 +803,7 @@ abstract class AbstractFlashcardViewer :
             return
         }
         val animation = fromGesture.toAnimationTransition().invert()
-        val editCardIntent = NoteEditorLauncher.EditCard(currentCard!!.id, animation).getIntent(this)
+        val editCardIntent = NoteEditorLauncher.EditCard(currentCard!!.id, animation).toIntent(this)
         editCurrentCardLauncher.launch(editCardIntent)
     }
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt b/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt
index 16c82dc468a5..bc1f66ad7fd3 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt
@@ -813,7 +813,7 @@ open class CardBrowser :
     @NeedsTest("I/O edits are saved")
     private fun openNoteEditorForCard(cardId: CardId) {
         currentCardId = cardId
-        val intent = NoteEditorLauncher.EditCard(currentCardId, Direction.DEFAULT).getIntent(this)
+        val intent = NoteEditorLauncher.EditCard(currentCardId, Direction.DEFAULT).toIntent(this)
         onEditCardActivityResult.launch(intent)
         // #6432 - FIXME - onCreateOptionsMenu crashes if receiving an activity result from edit card when in multiselect
         viewModel.endMultiSelectMode()
@@ -1865,7 +1865,7 @@ open class CardBrowser :
         fun createAddNoteIntent(
             context: Context,
             viewModel: CardBrowserViewModel,
-        ): Intent = NoteEditorLauncher.AddNoteFromCardBrowser(viewModel).getIntent(context)
+        ): Intent = NoteEditorLauncher.AddNoteFromCardBrowser(viewModel).toIntent(context)
     }
 
     private fun calculateTopOffset(cardPosition: Int): Int {
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt b/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
index 6bc56c6205e5..d13c7ce4b6a3 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
@@ -1604,7 +1604,7 @@ open class DeckPicker :
     }
 
     fun addNote() {
-        val intent = NoteEditorLauncher.AddNote().getIntent(this)
+        val intent = NoteEditorLauncher.AddNote().toIntent(this)
         startActivity(intent)
     }
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ImageOcclusionIntentBuilder.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ImageOcclusionIntentBuilder.kt
index 154a408358a1..fa19ed7f4993 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ImageOcclusionIntentBuilder.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ImageOcclusionIntentBuilder.kt
@@ -27,5 +27,5 @@ import com.ichi2.anki.noteeditor.NoteEditorLauncher
 class ImageOcclusionIntentBuilder(
     private val context: Context,
 ) {
-    fun buildIntent(imageUri: Uri?): Intent = NoteEditorLauncher.ImageOcclusion(imageUri).getIntent(context)
+    fun buildIntent(imageUri: Uri?): Intent = NoteEditorLauncher.ImageOcclusion(imageUri).toIntent(context)
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/IntentHandler2.kt b/AnkiDroid/src/main/java/com/ichi2/anki/IntentHandler2.kt
index 7f943ac46629..5581ce3ea874 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/IntentHandler2.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/IntentHandler2.kt
@@ -39,11 +39,11 @@ class IntentHandler2 : AbstractIntentHandler() {
         if (intent.extras == null) {
             Timber.w("Intent unexpectedly has no extras. Notifying user, defaulting to add note.")
             showThemedToast(this, getString(R.string.something_wrong), false)
-            startActivity(NoteEditorLauncher.AddNote().getIntent(this))
+            startActivity(NoteEditorLauncher.AddNote().toIntent(this))
             finish()
         } else {
             val noteEditorIntent =
-                NoteEditorLauncher.PassArguments(intent.extras!!).getIntent(this, intent.action)
+                NoteEditorLauncher.PassArguments(intent.extras!!).toIntent(this, intent.action)
             noteEditorIntent.setDataAndType(intent.data, intent.type)
             startActivity(noteEditorIntent)
             finish()
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt b/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt
index 9ab8a77ddfe5..836a5cf91f2d 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt
@@ -1494,7 +1494,7 @@ class NoteEditor :
         arguments: NoteEditorLauncher,
         intentEnricher: Consumer<Bundle>,
     ) {
-        val intent = arguments.getIntent(requireContext())
+        val intent = arguments.toIntent(requireContext())
         val bundle = arguments.toBundle()
         // Mutate event with additional properties
         intentEnricher.accept(bundle)
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.kt b/AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.kt
index 656a4b9ba759..e802da862551 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.kt
@@ -699,7 +699,7 @@ open class Reviewer :
     fun addNote(fromGesture: Gesture? = null) {
         val animation = getAnimationTransitionFromGesture(fromGesture)
         val inverseAnimation = getInverseTransition(animation)
-        val intent = NoteEditorLauncher.AddNoteFromReviewer(inverseAnimation).getIntent(this)
+        val intent = NoteEditorLauncher.AddNoteFromReviewer(inverseAnimation).toIntent(this)
         addNoteLauncher.launch(intent)
     }
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/instantnoteeditor/InstantNoteEditorActivity.kt b/AnkiDroid/src/main/java/com/ichi2/anki/instantnoteeditor/InstantNoteEditorActivity.kt
index 59a5ccc1adaf..10dd6c15d09a 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/instantnoteeditor/InstantNoteEditorActivity.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/instantnoteeditor/InstantNoteEditorActivity.kt
@@ -189,7 +189,7 @@ class InstantNoteEditorActivity :
 
     private fun openNoteEditor() {
         val sharedText = clozeEditTextField.text.toString()
-        val noteEditorIntent = NoteEditorLauncher.AddInstantNote(sharedText).getIntent(this)
+        val noteEditorIntent = NoteEditorLauncher.AddInstantNote(sharedText).toIntent(this)
         startActivity(noteEditorIntent)
         finish()
     }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/NoteEditorLauncher.kt b/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/NoteEditorLauncher.kt
index ed850686c36d..fb0f4dbb5bec 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/NoteEditorLauncher.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/NoteEditorLauncher.kt
@@ -28,13 +28,16 @@ import com.ichi2.anki.NoteEditor
 import com.ichi2.anki.NoteEditor.Companion.NoteEditorCaller
 import com.ichi2.anki.SingleFragmentActivity
 import com.ichi2.anki.browser.CardBrowserViewModel
+import com.ichi2.anki.utils.Destination
 import com.ichi2.libanki.CardId
 import com.ichi2.libanki.DeckId
 
 /**
  * Defines various configurations for opening the NoteEditor fragment with specific data or actions.
  */
-sealed interface NoteEditorLauncher {
+sealed interface NoteEditorLauncher : Destination {
+    override fun toIntent(context: Context): Intent = toIntent(context, action = null)
+
     /**
      * Generates an intent to open the NoteEditor fragment with the configured parameters.
      *
@@ -42,7 +45,7 @@ sealed interface NoteEditorLauncher {
      * @param action Optional action string for the intent.
      * @return Intent configured to launch the NoteEditor fragment.
      */
-    fun getIntent(
+    fun toIntent(
         context: Context,
         action: String? = null,
     ) = SingleFragmentActivity.getIntent(context, NoteEditor::class, toBundle(), action)
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/pages/CardInfoDestination.kt b/AnkiDroid/src/main/java/com/ichi2/anki/pages/CardInfoDestination.kt
index 356ce5c82b49..cdf3510c9601 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/pages/CardInfoDestination.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/pages/CardInfoDestination.kt
@@ -18,12 +18,13 @@ package com.ichi2.anki.pages
 import android.content.Context
 import android.content.Intent
 import com.ichi2.anki.R
+import com.ichi2.anki.utils.Destination
 import com.ichi2.libanki.CardId
 
 data class CardInfoDestination(
     val cardId: CardId,
-) {
-    fun toIntent(context: Context): Intent {
+) : Destination {
+    override fun toIntent(context: Context): Intent {
         val title = context.getString(R.string.card_info_title)
         return PageFragment.getIntent(context, "card-info/$cardId", title)
     }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/pages/CongratsPage.kt b/AnkiDroid/src/main/java/com/ichi2/anki/pages/CongratsPage.kt
index 02d0764d1123..17b2dd02ba46 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/pages/CongratsPage.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/pages/CongratsPage.kt
@@ -42,6 +42,7 @@ import com.ichi2.anki.launchCatchingTask
 import com.ichi2.anki.preferences.sharedPrefs
 import com.ichi2.anki.showThemedToast
 import com.ichi2.anki.snackbar.showSnackbar
+import com.ichi2.anki.utils.Destination
 import com.ichi2.anki.utils.SECONDS_PER_DAY
 import com.ichi2.anki.utils.TIME_HOUR
 import com.ichi2.anki.utils.TIME_MINUTE
@@ -97,7 +98,7 @@ class CongratsPage :
         viewModel.deckOptionsDestination
             .flowWithLifecycle(lifecycle)
             .onEach { destination ->
-                val intent = destination.getIntent(requireContext())
+                val intent = destination.toIntent(requireContext())
                 startActivity(intent, null)
             }.launchIn(lifecycleScope)
 
@@ -233,8 +234,8 @@ class CongratsViewModel :
 class DeckOptionsDestination(
     private val deckId: DeckId,
     private val isFiltered: Boolean,
-) {
-    fun getIntent(context: Context): Intent =
+) : Destination {
+    override fun toIntent(context: Context): Intent =
         if (isFiltered) {
             Intent(context, FilteredDeckOptions::class.java)
         } else {
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/previewer/PreviewerFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/previewer/PreviewerFragment.kt
index b16e093b4b12..955800a7bc36 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/previewer/PreviewerFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/previewer/PreviewerFragment.kt
@@ -233,7 +233,7 @@ class PreviewerFragment :
 
     private fun editCard() {
         lifecycleScope.launch {
-            val intent = viewModel.getNoteEditorDestination().getIntent(requireContext())
+            val intent = viewModel.getNoteEditorDestination().toIntent(requireContext())
             editCardLauncher.launch(intent)
         }
     }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt
index 786a4a7e0931..4477e7cdf162 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt
@@ -511,13 +511,13 @@ class ReviewerFragment :
 
     private fun launchEditNote() {
         lifecycleScope.launch {
-            val intent = viewModel.getEditNoteDestination().getIntent(requireContext())
+            val intent = viewModel.getEditNoteDestination().toIntent(requireContext())
             noteEditorLauncher.launch(intent)
         }
     }
 
     private fun launchAddNote() {
-        val intent = NoteEditorLauncher.AddNoteFromReviewer().getIntent(requireContext())
+        val intent = NoteEditorLauncher.AddNoteFromReviewer().toIntent(requireContext())
         noteEditorLauncher.launch(intent)
     }
 
@@ -535,7 +535,7 @@ class ReviewerFragment :
 
     private fun launchDeckOptions() {
         lifecycleScope.launch {
-            val intent = viewModel.getDeckOptionsDestination().getIntent(requireContext())
+            val intent = viewModel.getDeckOptionsDestination().toIntent(requireContext())
             deckOptionsLauncher.launch(intent)
         }
     }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/utils/Destination.kt b/AnkiDroid/src/main/java/com/ichi2/anki/utils/Destination.kt
new file mode 100644
index 000000000000..20becd6b939f
--- /dev/null
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/utils/Destination.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2025 Brayan Oliveira <brayandso.dev@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.ichi2.anki.utils
+
+import android.content.Context
+import android.content.Intent
+
+interface Destination {
+    fun toIntent(context: Context): Intent
+}
diff --git a/AnkiDroid/src/main/java/com/ichi2/widget/AddNoteWidget.kt b/AnkiDroid/src/main/java/com/ichi2/widget/AddNoteWidget.kt
index e758352244de..a4953588b0d9 100644
--- a/AnkiDroid/src/main/java/com/ichi2/widget/AddNoteWidget.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/widget/AddNoteWidget.kt
@@ -47,7 +47,7 @@ class AddNoteWidget : AnalyticsWidgetProvider() {
             appWidgetIds: IntArray,
         ) {
             val remoteViews = RemoteViews(context.packageName, R.layout.widget_add_note)
-            val intent = NoteEditorLauncher.AddNote().getIntent(context)
+            val intent = NoteEditorLauncher.AddNote().toIntent(context)
             val pendingIntent = PendingIntentCompat.getActivity(context, 0, intent, 0, false)
             remoteViews.setOnClickPendingIntent(R.id.widget_add_note_button, pendingIntent)
             appWidgetManager.updateAppWidget(appWidgetIds, remoteViews)
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/NoteEditorTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/NoteEditorTest.kt
index 82e49685aa4d..28dec1cab85c 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/NoteEditorTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/NoteEditorTest.kt
@@ -207,7 +207,7 @@ class NoteEditorTest : RobolectricTest() {
     @Test
     fun verifyStartupAndCloseWithNoCollectionDoesNotCrash() {
         enableNullCollection()
-        val intent = NoteEditorLauncher.AddNote().getIntent(targetContext)
+        val intent = NoteEditorLauncher.AddNote().toIntent(targetContext)
         ActivityScenario.launchActivityForResult<SingleFragmentActivity>(intent).use { scenario ->
             scenario.onNoteEditor { noteEditor ->
                 noteEditor.requireActivity().onBackPressedDispatcher.onBackPressed()
@@ -220,7 +220,7 @@ class NoteEditorTest : RobolectricTest() {
 
     @Test
     fun testHandleMultimediaActionsDisplaysBottomSheet() {
-        val intent = NoteEditorLauncher.AddNote().getIntent(targetContext)
+        val intent = NoteEditorLauncher.AddNote().toIntent(targetContext)
         ActivityScenario.launchActivityForResult<SingleFragmentActivity>(intent).use { scenario ->
             scenario.onNoteEditor { noteEditor ->
                 noteEditor.showMultimediaBottomSheet()
@@ -576,7 +576,7 @@ class NoteEditorTest : RobolectricTest() {
         val activity =
             startActivityNormallyOpenCollectionWithIntent(
                 SingleFragmentActivity::class.java,
-                NoteEditorLauncher.PassArguments(arguments).getIntent(targetContext, action),
+                NoteEditorLauncher.PassArguments(arguments).toIntent(targetContext, action),
             )
         return activity.getEditor()
     }

From 3b74b3d2477d8e7f25188d502b7c4057772c1d28 Mon Sep 17 00:00:00 2001
From: Ashish Yadav <48384865+criticalAY@users.noreply.github.com>
Date: Sat, 8 Feb 2025 02:13:34 +0530
Subject: [PATCH 029/200] fix: instant note editor to restore text when
 orientation changes

---
 .../InstantNoteEditorActivity.kt              | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/instantnoteeditor/InstantNoteEditorActivity.kt b/AnkiDroid/src/main/java/com/ichi2/anki/instantnoteeditor/InstantNoteEditorActivity.kt
index 10dd6c15d09a..e601ae73b047 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/instantnoteeditor/InstantNoteEditorActivity.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/instantnoteeditor/InstantNoteEditorActivity.kt
@@ -87,6 +87,8 @@ class InstantNoteEditorActivity :
     private val editMode: EditMode
         get() = viewModel.editorMode.value
 
+    private val updatedTextKey = "updatedText"
+
     private lateinit var editModeButton: MaterialButton
 
     private var editFieldsLayout: LinearLayout? = null
@@ -128,7 +130,10 @@ class InstantNoteEditorActivity :
             return
         }
 
-        handleSharedText(intent)
+        viewModel.setClozeFieldText(
+            savedInstanceState?.getString(updatedTextKey) ?: getSharedIntentText(intent),
+        )
+
         setupErrorListeners()
         prepareEditorDialog()
     }
@@ -180,12 +185,8 @@ class InstantNoteEditorActivity :
             }
     }
 
-    /** Handles the shared text received through an Intent. **/
-    private fun handleSharedText(receivedIntent: Intent) {
-        val sharedText = receivedIntent.getStringExtra(Intent.EXTRA_TEXT) ?: return
-        Timber.d("Setting cloze field text to $sharedText")
-        viewModel.setClozeFieldText(sharedText)
-    }
+    /** Gets the shared text received through an Intent. **/
+    private fun getSharedIntentText(receivedIntent: Intent): String? = receivedIntent.getStringExtra(Intent.EXTRA_TEXT)
 
     private fun openNoteEditor() {
         val sharedText = clozeEditTextField.text.toString()
@@ -251,6 +252,11 @@ class InstantNoteEditorActivity :
         )
     }
 
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        if (intentTextChanged()) outState.putString(updatedTextKey, clozeFieldText)
+    }
+
     @KotlinCleanup("notetypeJson -> non-null")
     private fun createEditFields(
         context: Context,

From 185f346df09dee3b5a1b3c7ed8d13372ba480cf2 Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Sun, 9 Feb 2025 17:22:05 -0300
Subject: [PATCH 030/200] fix(new reviewer): suspend/bury submenus

see 17950 for the issue description
---
 AnkiDroid/proguard-rules.pro | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AnkiDroid/proguard-rules.pro b/AnkiDroid/proguard-rules.pro
index 4c3fa9bcccc3..d5012e76b2f8 100644
--- a/AnkiDroid/proguard-rules.pro
+++ b/AnkiDroid/proguard-rules.pro
@@ -28,6 +28,7 @@
 -keep class * extends com.google.protobuf.GeneratedMessageLite { *; }
 -keep class androidx.core.app.ActivityCompat$* { *; }
 -keep class androidx.concurrent.futures.** { *; }
+-keep class androidx.appcompat.view.menu.MenuItemImpl { *; } # .utils.ext.MenuItemImpl
 
 # Ignore unused packages
 -dontwarn javax.naming.**

From 9fd27babfdb19dc4c5c8dc9e649d207d0a1ca8f6 Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Sun, 9 Feb 2025 13:48:11 -0300
Subject: [PATCH 031/200] test(new reviewer): sw600dp layout is initialized

---
 .../windows/reviewer/ReviewerBigScreenTest.kt | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/reviewer/ReviewerBigScreenTest.kt

diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/reviewer/ReviewerBigScreenTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/reviewer/ReviewerBigScreenTest.kt
new file mode 100644
index 000000000000..1be2f48760e1
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/reviewer/ReviewerBigScreenTest.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2025 Brayan Oliveira <brayandso.dev@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.ichi2.anki.ui.windows.reviewer
+
+import androidx.test.core.app.ActivityScenario
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.previewer.CardViewerActivity
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.annotation.Config
+
+@RunWith(AndroidJUnit4::class)
+class ReviewerBigScreenTest : RobolectricTest() {
+    @Test
+    @Config(qualifiers = "w1000dp-h1000dp-480dpi")
+    fun `sw600dp layout is initialized`() {
+        val intent = ReviewerFragment.getIntent(targetContext)
+        ActivityScenario.launch<CardViewerActivity>(intent)
+    }
+}

From 919de02492c90ba7ff5798b466ae23b19fcfc72e Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Sat, 8 Feb 2025 12:19:09 -0300
Subject: [PATCH 032/200] feat(new reviewer): tablet style

---
 .../preferences/reviewer/ReviewerMenuView.kt  |   3 +
 .../ui/windows/reviewer/ReviewerFragment.kt   |  44 +--
 .../src/main/res/layout-sw600dp/reviewer2.xml | 230 +++++++++++++++
 AnkiDroid/src/main/res/layout/reviewer2.xml   | 276 +++++++++---------
 .../main/res/layout/reviewer_menu_view.xml    |  12 +-
 .../src/main/res/values-sw600dp/dimens.xml    |   3 +
 AnkiDroid/src/main/res/values/dimens.xml      |   1 +
 AnkiDroid/src/main/res/values/styles.xml      |   1 +
 8 files changed, 415 insertions(+), 155 deletions(-)
 create mode 100644 AnkiDroid/src/main/res/layout-sw600dp/reviewer2.xml

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ReviewerMenuView.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ReviewerMenuView.kt
index d0c2d698fd8d..1012a07817d1 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ReviewerMenuView.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ReviewerMenuView.kt
@@ -26,6 +26,7 @@ import android.widget.LinearLayout
 import androidx.appcompat.view.menu.MenuBuilder
 import androidx.appcompat.view.menu.MenuItemImpl
 import androidx.appcompat.widget.ActionMenuView
+import androidx.core.view.size
 import androidx.lifecycle.findViewTreeLifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import com.ichi2.anki.Flag
@@ -69,6 +70,8 @@ class ReviewerMenuView
             overflowMenu.clear()
         }
 
+        fun isEmpty() = frontMenu.size == 0 && overflowMenu.size == 0
+
         fun findItem(id: Int): MenuItemImpl? = (frontMenu.findItem(id) ?: overflowMenu.findItem(id)) as? MenuItemImpl
 
         fun setOnMenuItemClickListener(listener: ActionMenuView.OnMenuItemClickListener) {
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt
index 4477e7cdf162..a8feeef1db31 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt
@@ -27,12 +27,13 @@ import android.view.ViewGroup.MarginLayoutParams
 import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputMethodManager
 import android.webkit.WebView
-import android.widget.FrameLayout
 import android.widget.LinearLayout
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.StringRes
 import androidx.appcompat.view.menu.SubMenuBuilder
 import androidx.appcompat.widget.ActionMenuView
+import androidx.appcompat.widget.AppCompatImageButton
+import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.getSystemService
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
@@ -43,7 +44,6 @@ import androidx.core.view.updatePadding
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
-import com.google.android.material.appbar.MaterialToolbar
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.card.MaterialCardView
 import com.google.android.material.shape.ShapeAppearanceModel
@@ -125,7 +125,7 @@ class ReviewerFragment :
             if (typeAnswerContainer?.isVisible == true) {
                 typeAnswerContainer
             } else {
-                this@ReviewerFragment.view?.findViewById(R.id.buttons_area)
+                this@ReviewerFragment.view?.findViewById(R.id.answer_buttons)
             }
     }
 
@@ -142,8 +142,8 @@ class ReviewerFragment :
     ) {
         super.onViewCreated(view, savedInstanceState)
 
-        view.findViewById<MaterialToolbar>(R.id.toolbar).apply {
-            setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() }
+        view.findViewById<AppCompatImageButton>(R.id.back_button).setOnClickListener {
+            requireActivity().finish()
         }
 
         setupImmersiveMode(view)
@@ -173,6 +173,10 @@ class ReviewerFragment :
                 viewModel.onStateMutationCallback()
             }
         }
+
+        viewModel.showingAnswer.collectIn(lifecycleScope) {
+            resetZoom()
+        }
     }
 
     // TODO
@@ -265,10 +269,13 @@ class ReviewerFragment :
 
     private fun setupAnswerButtons(view: View) {
         val prefs = sharedPrefs()
-        val hideAnswerButtons = prefs.getBoolean(getString(R.string.hide_answer_buttons_key), false)
-        val buttonsAreaLayout = view.findViewById<FrameLayout>(R.id.buttons_area)
-        if (hideAnswerButtons) {
-            buttonsAreaLayout.isVisible = false
+        val answerButtonsLayout = view.findViewById<LinearLayout>(R.id.answer_buttons)
+        if (prefs.getBoolean(getString(R.string.hide_answer_buttons_key), false)) {
+            // Expand the menu if there is no answer buttons in big screens
+            view.findViewById<ReviewerMenuView>(R.id.reviewer_menu_view).updateLayoutParams<ConstraintLayout.LayoutParams> {
+                matchConstraintMaxWidth = 0
+            }
+            answerButtonsLayout.isVisible = false
             return
         }
 
@@ -314,19 +321,15 @@ class ReviewerFragment :
                     viewModel.onShowAnswer(typedAnswer = typedAnswer)
                 }
             }
-        val answerButtonsLayout = view.findViewById<LinearLayout>(R.id.answer_buttons)
 
-        // TODO add some kind of feedback/animation after tapping show answer or the answer buttons
-        viewModel.showingAnswer.collectLatestIn(lifecycleScope) { shouldShowAnswer ->
-            // use INVISIBLE instead of GONE to keep the same button height
-            if (shouldShowAnswer) {
+        viewModel.showingAnswer.collectLatestIn(lifecycleScope) { isAnswerShown ->
+            if (isAnswerShown) {
                 showAnswerButton.visibility = View.INVISIBLE
                 answerButtonsLayout.visibility = View.VISIBLE
             } else {
                 showAnswerButton.visibility = View.VISIBLE
                 answerButtonsLayout.visibility = View.INVISIBLE
             }
-            resetZoom()
         }
 
         if (prefs.getBoolean(getString(R.string.hide_hard_and_easy_key), false)) {
@@ -336,9 +339,9 @@ class ReviewerFragment :
 
         val buttonsHeight = Prefs.answerButtonsSize
         if (buttonsHeight != 100) {
-            buttonsAreaLayout.post {
-                buttonsAreaLayout.updateLayoutParams {
-                    height = buttonsAreaLayout.measuredHeight * buttonsHeight / 100
+            answerButtonsLayout.post {
+                answerButtonsLayout.updateLayoutParams {
+                    height = answerButtonsLayout.measuredHeight * buttonsHeight / 100
                 }
             }
         }
@@ -410,6 +413,10 @@ class ReviewerFragment :
 
     private fun setupMenu(view: View) {
         val menu = view.findViewById<ReviewerMenuView>(R.id.reviewer_menu_view)
+        if (menu.isEmpty()) {
+            menu.isVisible = false
+            return
+        }
         menu.setOnMenuItemClickListener(this)
 
         viewModel.flagFlow
@@ -491,6 +498,7 @@ class ReviewerFragment :
         if (Prefs.frameStyle == FrameStyle.BOX) {
             view.findViewById<MaterialCardView>(R.id.webview_container).apply {
                 updateLayoutParams<MarginLayoutParams> {
+                    topMargin = 0
                     leftMargin = 0
                     rightMargin = 0
                 }
diff --git a/AnkiDroid/src/main/res/layout-sw600dp/reviewer2.xml b/AnkiDroid/src/main/res/layout-sw600dp/reviewer2.xml
new file mode 100644
index 000000000000..2950f1e0cbb1
--- /dev/null
+++ b/AnkiDroid/src/main/res/layout-sw600dp/reviewer2.xml
@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<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:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/alternativeBackgroundColor"
+    android:fitsSystemWindows="true"
+    tools:context=".ui.windows.reviewer.ReviewerFragment">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginBottom="6dp"
+        >
+
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/webview_container"
+            style="@style/CardView.ViewerStyle"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginBottom="6dp"
+            android:layout_marginHorizontal="@dimen/reviewer_side_margin"
+            app:layout_constraintBottom_toTopOf="@id/type_answer_container"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <WebView
+                android:id="@+id/webview"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                tools:backgroundTint="@color/white" />
+        </com.google.android.material.card.MaterialCardView>
+
+        <!-- Use the same card style of the WebView -->
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/type_answer_container"
+            style="@style/CardView.ViewerStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="6dp"
+            android:layout_marginHorizontal="@dimen/reviewer_side_margin"
+            app:layout_constraintTop_toBottomOf="@id/webview_container"
+            app:layout_constraintBottom_toTopOf="@id/bottom_bar"
+            android:visibility="gone"
+            tools:visibility="visible">
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/type_answer_hint"
+                app:boxBackgroundMode="filled"
+                app:boxStrokeWidth="0dp"
+                app:endIconMode="clear_text">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/type_answer_edit_text"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:imeOptions="actionDone"
+                    android:inputType="text|textNoSuggestions"
+                    />
+            </com.google.android.material.textfield.TextInputLayout>
+        </com.google.android.material.card.MaterialCardView>
+
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/guideline_answer_buttons_start"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_constraintGuide_begin="156dp" />
+
+
+        <androidx.constraintlayout.widget.Barrier
+            android:id="@+id/bottom_bar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:barrierDirection="top"
+            app:constraint_referenced_ids="answer_buttons, back_button, reviewer_menu_view"
+            />
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/back_button"
+            style="?actionButtonStyle"
+            android:layout_width="?minTouchTargetSize"
+            android:layout_height="?minTouchTargetSize"
+            android:src="?attr/homeAsUpIndicator"
+            android:layout_marginStart="@dimen/reviewer_side_margin"
+            app:layout_constraintStart_toStartOf="parent"
+            android:contentDescription="@string/abc_action_bar_up_description"
+            android:tooltipText="@string/abc_action_bar_up_description"
+            app:layout_constraintTop_toBottomOf="@id/bottom_bar"
+            app:layout_constraintBottom_toBottomOf="parent"
+            />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/new_count"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="?attr/newCountColor"
+            android:paddingEnd="4dp"
+            android:textSize="16sp"
+            app:layout_constraintTop_toTopOf="@id/back_button"
+            app:layout_constraintBottom_toBottomOf="@id/back_button"
+            app:layout_constraintStart_toEndOf="@id/back_button"
+            app:layout_constraintEnd_toStartOf="@id/lrn_count"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            tools:text="127"
+            />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/lrn_count"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="?attr/learnCountColor"
+            android:paddingHorizontal="4dp"
+            android:textSize="16sp"
+            app:layout_constraintTop_toTopOf="@id/back_button"
+            app:layout_constraintBottom_toBottomOf="@id/back_button"
+            app:layout_constraintStart_toEndOf="@id/new_count"
+            app:layout_constraintEnd_toStartOf="@id/rev_count"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            tools:text="381"
+            />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/rev_count"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="?attr/reviewCountColor"
+            android:paddingStart="4dp"
+            android:textSize="16sp"
+            app:layout_constraintTop_toTopOf="@id/back_button"
+            app:layout_constraintBottom_toBottomOf="@id/back_button"
+            app:layout_constraintStart_toEndOf="@id/lrn_count"
+            app:layout_constraintEnd_toStartOf="@id/guideline_answer_buttons_start"
+            tools:text="954"
+            />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/show_answer"
+            style="@style/Widget.Material3.Button.TextButton"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:minHeight="?actionBarSize"
+            android:text="@string/show_answer"
+            android:textSize="@dimen/reviewer_answer_button_textSize"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="@id/answer_buttons"
+            app:layout_constraintStart_toStartOf="@id/answer_buttons"
+            app:layout_constraintTop_toTopOf="@id/answer_buttons"
+            tools:visibility="invisible"
+            />
+
+        <LinearLayout
+            android:id="@+id/answer_buttons"
+            android:layout_height="wrap_content"
+            android:layout_width="0dp"
+            android:visibility="invisible"
+            android:minHeight="?minTouchTargetSize"
+            android:layout_marginHorizontal="@dimen/reviewer_side_margin"
+            app:layout_constraintStart_toStartOf="@id/guideline_answer_buttons_start"
+            app:layout_constraintEnd_toStartOf="@id/reviewer_menu_view"
+            app:layout_constraintTop_toBottomOf="@id/bottom_bar"
+            app:layout_constraintBottom_toBottomOf="parent"
+            tools:visibility="visible"
+            >
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/again_button"
+                style="@style/AnswerButton"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:backgroundTint="@color/again_button_bg"
+                android:text="@string/ease_button_again"
+                android:textColor="@color/again_button_text"
+                android:layout_weight="1"
+                />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/hard_button"
+                style="@style/AnswerButton"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_marginStart="@dimen/answer_button_margin_horizontal"
+                android:backgroundTint="@color/hard_button_bg"
+                android:text="@string/ease_button_hard"
+                android:textColor="@color/hard_button_text"
+                android:layout_weight="1"
+                />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/good_button"
+                style="@style/AnswerButton"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_marginStart="@dimen/answer_button_margin_horizontal"
+                android:backgroundTint="@color/good_button_bg"
+                android:text="@string/ease_button_good"
+                android:textColor="@color/good_button_text"
+                android:layout_weight="1"
+                />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/easy_button"
+                style="@style/AnswerButton"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_marginStart="@dimen/answer_button_margin_horizontal"
+                android:backgroundTint="@color/easy_button_bg"
+                android:text="@string/ease_button_easy"
+                android:textColor="@color/easy_button_text"
+                android:layout_weight="1"
+                />
+        </LinearLayout>
+
+        <com.ichi2.anki.preferences.reviewer.ReviewerMenuView
+            android:id="@+id/reviewer_menu_view"
+            android:layout_width="wrap_content"
+            android:layout_height="?minTouchTargetSize"
+            app:layout_constraintWidth_max="144dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/bottom_bar"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:layout_marginEnd="@dimen/reviewer_side_margin"
+            />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/AnkiDroid/src/main/res/layout/reviewer2.xml b/AnkiDroid/src/main/res/layout/reviewer2.xml
index 901646567196..4da490a77f7c 100644
--- a/AnkiDroid/src/main/res/layout/reviewer2.xml
+++ b/AnkiDroid/src/main/res/layout/reviewer2.xml
@@ -9,90 +9,94 @@
     android:fitsSystemWindows="true"
     tools:context=".ui.windows.reviewer.ReviewerFragment">
 
-    <LinearLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginBottom="4dp"
-        android:orientation="vertical">
-
-        <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/appbar"
-            android:layout_width="match_parent"
+        >
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/back_button"
+            style="?actionButtonStyle"
+            android:layout_width="?minTouchTargetSize"
+            android:layout_height="?actionBarSize"
+            android:src="?attr/homeAsUpIndicator"
+            android:layout_marginStart="4dp"
+            android:contentDescription="@string/abc_action_bar_up_description"
+            android:tooltipText="@string/abc_action_bar_up_description"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toTopOf="@id/webview_container"
+            />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/new_count"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            >
-
-            <com.google.android.material.appbar.MaterialToolbar
-                android:id="@+id/toolbar"
-                app:navigationIcon="?attr/homeAsUpIndicator"
-                app:navigationContentDescription="@string/abc_action_bar_up_description"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                android:background="?attr/alternativeBackgroundColor"
-                >
-
-                <com.google.android.material.textview.MaterialTextView
-                    android:id="@+id/new_count"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="?attr/newCountColor"
-                    android:paddingEnd="6dp"
-                    tools:text="27"
-                    />
-
-                <com.google.android.material.textview.MaterialTextView
-                    android:id="@+id/lrn_count"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="?attr/learnCountColor"
-                    android:paddingEnd="6dp"
-                    tools:text="81"
-                    />
-
-                <com.google.android.material.textview.MaterialTextView
-                    android:id="@+id/rev_count"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="?attr/reviewCountColor"
-                    tools:text="54"
-                    android:paddingEnd="10dp"
-                    />
-
-                <com.ichi2.anki.preferences.reviewer.ReviewerMenuView
-                    android:id="@+id/reviewer_menu_view"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:layout_gravity="end"
-                    />
-            </com.google.android.material.appbar.MaterialToolbar>
-        </com.google.android.material.appbar.AppBarLayout>
+            android:textColor="?attr/newCountColor"
+            android:paddingEnd="4dp"
+            app:layout_constraintTop_toTopOf="@id/back_button"
+            app:layout_constraintBottom_toBottomOf="@id/back_button"
+            app:layout_constraintStart_toEndOf="@id/back_button"
+            app:layout_constraintEnd_toStartOf="@id/lrn_count"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            tools:text="127"
+            />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/lrn_count"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="?attr/learnCountColor"
+            android:paddingHorizontal="4dp"
+            app:layout_constraintTop_toTopOf="@id/back_button"
+            app:layout_constraintBottom_toBottomOf="@id/back_button"
+            app:layout_constraintStart_toEndOf="@id/new_count"
+            app:layout_constraintEnd_toStartOf="@id/rev_count"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            tools:text="381"
+            />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/rev_count"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="?attr/reviewCountColor"
+            android:paddingStart="4dp"
+            app:layout_constraintTop_toTopOf="@id/back_button"
+            app:layout_constraintBottom_toBottomOf="@id/back_button"
+            app:layout_constraintStart_toEndOf="@id/lrn_count"
+            tools:text="954"
+            />
 
         <com.google.android.material.card.MaterialCardView
             android:id="@+id/webview_container"
-            android:layout_width="match_parent"
+            style="@style/CardView.ViewerStyle"
+            android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_marginHorizontal="@dimen/reviewer_side_margin"
             android:layout_marginBottom="4dp"
-            style="@style/CardView.ViewerStyle"
-            android:layout_weight="1">
+            android:layout_marginHorizontal="@dimen/reviewer_side_margin"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/back_button"
+            app:layout_constraintBottom_toTopOf="@id/type_answer_container">
 
             <WebView
                 android:id="@+id/webview"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                tools:backgroundTint="@color/white"/>
-
+                tools:backgroundTint="@color/white" />
         </com.google.android.material.card.MaterialCardView>
 
         <!-- Use the same card style of the WebView -->
         <com.google.android.material.card.MaterialCardView
             android:id="@+id/type_answer_container"
+            style="@style/CardView.ViewerStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginHorizontal="8dp"
-            style="@style/CardView.ViewerStyle"
-            android:layout_marginTop="4dp"
-            android:layout_marginBottom="8dp"
+            android:layout_marginBottom="4dp"
+            app:layout_constraintTop_toBottomOf="@id/webview_container"
+            app:layout_constraintBottom_toTopOf="@id/answer_buttons"
+            android:layout_marginHorizontal="@dimen/reviewer_side_margin"
             android:visibility="gone"
             tools:visibility="visible">
 
@@ -100,10 +104,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/type_answer_hint"
-                app:endIconMode="clear_text"
                 app:boxBackgroundMode="filled"
                 app:boxStrokeWidth="0dp"
-                >
+                app:endIconMode="clear_text">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/type_answer_edit_text"
@@ -113,84 +116,95 @@
                     android:inputType="text|textNoSuggestions"
                     />
             </com.google.android.material.textfield.TextInputLayout>
-
         </com.google.android.material.card.MaterialCardView>
 
-        <FrameLayout
-            android:id="@+id/buttons_area"
-            android:layout_width="match_parent"
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/show_answer"
+            style="@style/Widget.Material3.Button.TextButton"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:text="@string/show_answer"
+            android:textSize="@dimen/reviewer_answer_button_textSize"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="@id/answer_buttons"
+            app:layout_constraintStart_toStartOf="@id/answer_buttons"
+            app:layout_constraintTop_toTopOf="@id/answer_buttons"
+            tools:visibility="gone"
+            />
+
+        <LinearLayout
+            android:id="@+id/answer_buttons"
             android:layout_height="wrap_content"
+            android:layout_width="0dp"
             android:minHeight="?minTouchTargetSize"
+            android:visibility="invisible"
             android:layout_marginHorizontal="@dimen/reviewer_side_margin"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/type_answer_container"
+            app:layout_constraintBottom_toBottomOf="parent"
+            tools:visibility="visible"
             >
 
             <com.google.android.material.button.MaterialButton
-                android:id="@+id/show_answer"
-                android:text="@string/show_answer"
-                android:layout_width="match_parent"
+                android:id="@+id/again_button"
+                style="@style/AnswerButton"
+                android:layout_width="0dp"
                 android:layout_height="match_parent"
-                style="@style/Widget.Material3.Button.TextButton"
-                android:visibility="visible"
-                tools:visibility="invisible"
+                android:layout_marginHorizontal="@dimen/answer_button_margin_horizontal"
+                android:backgroundTint="@color/again_button_bg"
+                android:text="@string/ease_button_again"
+                android:textColor="@color/again_button_text"
+                android:layout_weight="1"
                 />
 
-            <LinearLayout
-                android:id="@+id/answer_buttons"
-                android:layout_width="match_parent"
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/hard_button"
+                style="@style/AnswerButton"
+                android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:visibility="invisible"
-                tools:visibility="visible"
-                >
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/again_button"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:text="@string/ease_button_again"
-                    android:backgroundTint="@color/again_button_bg"
-                    android:textColor="@color/again_button_text"
-                    android:layout_marginEnd="@dimen/answer_button_margin_horizontal"
-                    style="@style/AnswerButton"
-                    android:layout_weight="1"
-                    />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/hard_button"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:text="@string/ease_button_hard"
-                    android:backgroundTint="@color/hard_button_bg"
-                    android:textColor="@color/hard_button_text"
-                    android:layout_marginHorizontal="@dimen/answer_button_margin_horizontal"
-                    style="@style/AnswerButton"
-                    android:layout_weight="1"
-                    />
+                android:layout_marginHorizontal="@dimen/answer_button_margin_horizontal"
+                android:backgroundTint="@color/hard_button_bg"
+                android:text="@string/ease_button_hard"
+                android:textColor="@color/hard_button_text"
+                android:layout_weight="1"
+                />
 
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/good_button"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:text="@string/ease_button_good"
-                    android:backgroundTint="@color/good_button_bg"
-                    android:textColor="@color/good_button_text"
-                    android:layout_marginHorizontal="@dimen/answer_button_margin_horizontal"
-                    style="@style/AnswerButton"
-                    android:layout_weight="1"
-                    />
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/good_button"
+                style="@style/AnswerButton"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_marginHorizontal="@dimen/answer_button_margin_horizontal"
+                android:backgroundTint="@color/good_button_bg"
+                android:text="@string/ease_button_good"
+                android:textColor="@color/good_button_text"
+                android:layout_weight="1"
+                />
 
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/easy_button"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:padding="0dp"
-                    android:text="@string/ease_button_easy"
-                    android:backgroundTint="@color/easy_button_bg"
-                    android:textColor="@color/easy_button_text"
-                    android:layout_marginStart="@dimen/answer_button_margin_horizontal"
-                    style="@style/AnswerButton"
-                    android:layout_weight="1"
-                    />
-            </LinearLayout>
-        </FrameLayout>
-    </LinearLayout>
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/easy_button"
+                style="@style/AnswerButton"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_marginHorizontal="@dimen/answer_button_margin_horizontal"
+                android:backgroundTint="@color/easy_button_bg"
+                android:text="@string/ease_button_easy"
+                android:textColor="@color/easy_button_text"
+                android:layout_weight="1"
+                />
+        </LinearLayout>
+
+        <com.ichi2.anki.preferences.reviewer.ReviewerMenuView
+            android:id="@+id/reviewer_menu_view"
+            android:layout_width="0dp"
+            android:layout_height="?actionBarSize"
+            app:layout_constraintStart_toEndOf="@id/rev_count"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@id/back_button"
+            app:layout_constraintBottom_toBottomOf="@id/back_button"
+            android:layout_marginStart="12dp"
+            />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/AnkiDroid/src/main/res/layout/reviewer_menu_view.xml b/AnkiDroid/src/main/res/layout/reviewer_menu_view.xml
index 2b3fd4ed8daf..46f80a6935c6 100644
--- a/AnkiDroid/src/main/res/layout/reviewer_menu_view.xml
+++ b/AnkiDroid/src/main/res/layout/reviewer_menu_view.xml
@@ -4,8 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:minHeight="?attr/actionBarSize"
     tools:context=".preferences.reviewer.ReviewerMenuView"
+    android:layout_gravity="center_vertical|end"
     >
 
     <HorizontalScrollView
@@ -21,17 +21,17 @@
         <androidx.appcompat.widget.ActionMenuView
             android:id="@+id/front_menu_view"
             android:layout_width="wrap_content"
-            android:layout_height="?attr/actionBarSize"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end"
+            tools:layout_height="?actionBarSize"
             />
     </HorizontalScrollView>
 
     <androidx.appcompat.widget.ActionMenuView
         android:id="@+id/overflow_menu_view"
         android:layout_width="wrap_content"
-        android:layout_height="?attr/actionBarSize"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_height="wrap_content"
+        tools:layout_height="?actionBarSize"
         tools:layout_width="64dp"
         />
 </LinearLayout>
\ No newline at end of file
diff --git a/AnkiDroid/src/main/res/values-sw600dp/dimens.xml b/AnkiDroid/src/main/res/values-sw600dp/dimens.xml
index cfbaff1a6e51..68ed6afe5ed1 100644
--- a/AnkiDroid/src/main/res/values-sw600dp/dimens.xml
+++ b/AnkiDroid/src/main/res/values-sw600dp/dimens.xml
@@ -5,4 +5,7 @@
     <dimen name="deck_picker_left_padding_small">16dp</dimen>
     <dimen name="deck_picker_left_padding">24dp</dimen>
     <dimen name="deck_picker_right_padding">12dp</dimen>
+    <dimen name="reviewer_side_margin">12dp</dimen>
+    <dimen name="reviewer_answer_button_textSize">18sp</dimen>
+    <dimen name="answer_button_margin_horizontal">6dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/AnkiDroid/src/main/res/values/dimens.xml b/AnkiDroid/src/main/res/values/dimens.xml
index e458b35ddbf6..4dbdd610003f 100644
--- a/AnkiDroid/src/main/res/values/dimens.xml
+++ b/AnkiDroid/src/main/res/values/dimens.xml
@@ -35,4 +35,5 @@
 
     <dimen name="reviewer_side_margin">8dp</dimen>
     <dimen name="answer_button_margin_horizontal">3dp</dimen>
+    <dimen name="reviewer_answer_button_textSize">14sp</dimen>
 </resources>
\ No newline at end of file
diff --git a/AnkiDroid/src/main/res/values/styles.xml b/AnkiDroid/src/main/res/values/styles.xml
index 90da5e9601a9..950ea4955238 100644
--- a/AnkiDroid/src/main/res/values/styles.xml
+++ b/AnkiDroid/src/main/res/values/styles.xml
@@ -32,6 +32,7 @@
     <style name="AnswerButton" parent="Widget.Material3.Button">
         <item name="android:padding">0dp</item>
         <item name="cornerRadius">12dp</item>
+        <item name="android:textSize">@dimen/reviewer_answer_button_textSize</item>
     </style>
 
     <!--  Material Design-style persistent footer button -->

From 36e3631988f4d6b980e16377b271da7a9f684cee Mon Sep 17 00:00:00 2001
From: Arthur Milchior <arthur@milchior.fr>
Date: Mon, 10 Feb 2025 03:53:39 +0100
Subject: [PATCH 033/200] Correct matchesJsonValue

`expectedMap` used to associated the keys of the `expectedValue` to the
values of `actualValue`.

As `differtKeys` also looked at the values in `actualValue`, it means
the values of `expectedValues` were always ignored.

I hope that this new writting, checking for the equality of the set of
keys, and then for the equalities of value, will be more readable and
hence improve the test suite.

Luckily enough we only had one failing test. I corrected the expected
value in the test. As we use the default filtered deck provided by the
back-end I don't expect the implementation to be buggy here.
---
 .../anki/dialogs/CustomStudyDialogTest.kt     | 10 +++++-----
 .../java/com/ichi2/testutils/JsonUtils.kt     | 20 ++++++++++---------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/CustomStudyDialogTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/CustomStudyDialogTest.kt
index 020827baf8f1..394fa9602b59 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/CustomStudyDialogTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/CustomStudyDialogTest.kt
@@ -81,22 +81,22 @@ class CustomStudyDialogTest : RobolectricTest() {
             val expected =
                 """
                 {
-                    "browserCollapsed": false,
-                    "collapsed": false,
+                    "browserCollapsed": true,
+                    "collapsed": true,
                     "delays": null,
                     "desc": "",
                     "dyn": 1,
                     "lrnToday": [0, 0],
                     "newToday": [0, 0],
-                    "previewDelay": 0,
+                    "previewDelay": 10,
                     "previewAgainSecs": 60,
                     "previewHardSecs": 600,
                     "previewGoodSecs": 0,
-                    "resched": true,
+                    "resched": false,
                     "revToday": [0, 0],
                     "separate": true,
                     "terms": [
-                        ["deck:\"Default\" prop:due<=1", 99999, 6]
+                        ["is:new added:1 deck:Default", 99999, 5]
                     ],
                     "timeToday": [0, 0],
                     "usn": -1
diff --git a/AnkiDroid/src/test/java/com/ichi2/testutils/JsonUtils.kt b/AnkiDroid/src/test/java/com/ichi2/testutils/JsonUtils.kt
index 2b8095516d22..fcdefddf720c 100644
--- a/AnkiDroid/src/test/java/com/ichi2/testutils/JsonUtils.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/testutils/JsonUtils.kt
@@ -29,15 +29,17 @@ private fun matchesJsonValue(
     expectedValue: JSONObject,
     actualValue: JSONObject,
 ): Boolean {
-    val expectedMap = expectedValue.keys().asSequence().associateWith { actualValue[it] }
-
-    val itemKeys = actualValue.keys().asSequence().toList()
-    val differentKeys =
-        itemKeys
-            .associateWith { actualValue[it] }
-            .filter { expectedMap[it.key].toString() != it.value.toString() }
-
-    return differentKeys.isEmpty() && expectedMap.size == itemKeys.size
+    // Checks the objects have the same keys
+    if (expectedValue.keys().asSequence().toSet() != actualValue.keys().asSequence().toSet()) {
+        return false
+    }
+    // And that each key have the same associated values in both object.
+    for (key in expectedValue.keys()) {
+        if (expectedValue[key] != actualValue[key]) {
+            return false
+        }
+    }
+    return true
 }
 
 // TODO: This doesn't describe the inputs in the correct order

From eb6fe12705b65004357eee65010548922a821440 Mon Sep 17 00:00:00 2001
From: Ashish Yadav <48384865+criticalAY@users.noreply.github.com>
Date: Mon, 10 Feb 2025 19:16:00 +0530
Subject: [PATCH 034/200] feat: Improve Check Media dialog (#17842)

* feat: add missing media notes to the MediaCheckResult

* feat: implement media check option in the dialog
- allow tagging option in media check dialog
- split report generation methods

* feat: implement the media tagging in Deckpicker
---
 .../main/java/com/ichi2/anki/DeckPicker.kt    |  11 +
 .../ichi2/anki/dialogs/MediaCheckDialog.kt    | 188 +++++++++++++-----
 .../src/main/java/com/ichi2/libanki/Media.kt  |   3 +-
 .../res/layout/media_check_dialog_body.xml    |   4 +-
 AnkiDroid/src/main/res/values/03-dialogs.xml  |   4 -
 .../src/main/res/values/sentence-case.xml     |   1 +
 6 files changed, 148 insertions(+), 63 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt b/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
index d13c7ce4b6a3..0520ea2c1312 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
@@ -1923,6 +1923,17 @@ open class DeckPicker :
         }
     }
 
+    override fun tagMissing(missingMediaNotes: List<Long>?) {
+        if (missingMediaNotes == null) return
+
+        Timber.d("DeckPicker:: Adding missing media tag")
+        launchCatchingTask {
+            withCol {
+                tags.bulkAdd(missingMediaNotes, TR.mediaCheckMissingMediaTag())
+            }
+        }
+    }
+
     open fun handleDbError() {
         Timber.i("Displaying Database Error")
         showDatabaseErrorDialog(DatabaseErrorDialogType.DIALOG_LOAD_FAILED)
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/MediaCheckDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/MediaCheckDialog.kt
index de2d4ebabe1c..b3635a1b33e4 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/MediaCheckDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/MediaCheckDialog.kt
@@ -6,6 +6,7 @@ import android.app.Dialog
 import android.os.Bundle
 import android.os.Message
 import android.text.method.ScrollingMovementMethod
+import android.view.LayoutInflater
 import android.view.View
 import android.widget.LinearLayout
 import android.widget.TextView
@@ -13,12 +14,15 @@ import androidx.annotation.CheckResult
 import androidx.appcompat.app.AlertDialog
 import androidx.core.os.bundleOf
 import com.ichi2.anki.AnkiActivity
+import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.DeckPicker
 import com.ichi2.anki.R
 import com.ichi2.anki.dialogs.MediaCheckDialog.Type.DIALOG_CONFIRM_MEDIA_CHECK
 import com.ichi2.anki.dialogs.MediaCheckDialog.Type.DIALOG_MEDIA_CHECK_RESULTS
 import com.ichi2.anki.showError
+import com.ichi2.anki.ui.internationalization.toSentenceCase
 import com.ichi2.anki.utils.ext.dismissAllDialogFragments
+import com.ichi2.compat.CompatHelper.Companion.getSerializableCompat
 import com.ichi2.libanki.MediaCheckResult
 
 class MediaCheckDialog : AsyncDialogFragment() {
@@ -33,6 +37,8 @@ class MediaCheckDialog : AsyncDialogFragment() {
         fun mediaCheck()
 
         fun deleteUnused(unused: List<String>)
+
+        fun tagMissing(missingMediaNotes: List<Long>?)
     }
 
     private val dialogType: Type
@@ -47,6 +53,9 @@ class MediaCheckDialog : AsyncDialogFragment() {
     private val invalid: List<String>?
         get() = requireArguments().getStringArrayList(INVALID)
 
+    private val missingMediaNotes: List<Long>?
+        get() = requireArguments().getSerializableCompat<ArrayList<Long>>(MISSING_MEDIA_NOTES)
+
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         super.onCreate(savedInstanceState)
         val dialog =
@@ -69,61 +78,114 @@ class MediaCheckDialog : AsyncDialogFragment() {
                 val unused = unused!!
                 val invalid = invalid!!
                 // Generate report
-                val report = StringBuilder()
-                if (invalid.isNotEmpty()) {
-                    report.append(String.format(res().getString(R.string.check_media_invalid), invalid.size))
-                }
-                if (unused.isNotEmpty()) {
-                    if (report.isNotEmpty()) {
-                        report.append("\n")
-                    }
-                    report.append(String.format(res().getString(R.string.check_media_unused), unused.size))
-                }
-                if (noHave.isNotEmpty()) {
-                    if (report.isNotEmpty()) {
-                        report.append("\n")
-                    }
-                    report.append(String.format(res().getString(R.string.check_media_nohave), noHave.size))
-                }
-                if (report.isEmpty()) {
-                    report.append(res().getString(R.string.check_media_no_unused_missing))
-                }
+                val report = generateReport(unused, noHave, invalid)
+
+                val dialogBody = setupDialogBody(layoutInflater, report, noHave, unused)
 
-                // We also prefix the report with a message about the media db being rebuilt, since
-                // we do a full media scan and update the db on each media check on AnkiDroid.
-                val reportStr =
-                    """
-                    |${res().getString(R.string.check_media_db_updated)}
-                    
-                    |$report
-                    """.trimMargin().trimIndent()
-                val dialogBody = layoutInflater.inflate(R.layout.media_check_dialog_body, null) as LinearLayout
-                val reportTextView = dialogBody.findViewById<TextView>(R.id.reportTextView)
-                val fileListTextView = dialogBody.findViewById<TextView>(R.id.fileListTextView)
-                reportTextView.text = reportStr
-                if (unused.isNotEmpty()) {
-                    reportTextView.append(getString(R.string.unused_strings))
-                    fileListTextView.append(unused.joinToString("\n"))
-                    fileListTextView.isScrollbarFadingEnabled = unused.size <= fileListTextView.maxLines
-                    fileListTextView.movementMethod = ScrollingMovementMethod.getInstance()
-                    fileListTextView.setTextIsSelectable(true)
-                    dialog
-                        .setPositiveButton(R.string.check_media_delete_unused) { _, _ ->
-                            (activity as MediaCheckDialogListener?)?.deleteUnused(unused)
-                            activity?.dismissAllDialogFragments()
-                        }.setNegativeButton(R.string.dialog_cancel) { _, _ ->
-                            activity?.dismissAllDialogFragments()
-                        }
-                } else {
-                    fileListTextView.visibility = View.GONE
-                    dialog.setNegativeButton(R.string.dialog_ok) { _, _ ->
-                        activity?.dismissAllDialogFragments()
-                    }
-                }
                 dialog
                     .setView(dialogBody)
                     .setCancelable(false)
-                    .create()
+                    .apply {
+                        if (unused.isEmpty() && noHave.isEmpty()) {
+                            setNegativeButton(R.string.dialog_ok) { _, _ -> activity?.dismissAllDialogFragments() }
+                            return@apply
+                        }
+
+                        setPositiveButton(
+                            TR.mediaCheckDeleteUnused().toSentenceCase(requireContext(), R.string.check_media_delete_unused),
+                        ) { _, _ ->
+                            (activity as MediaCheckDialogListener?)?.deleteUnused(unused)
+                            activity?.dismissAllDialogFragments()
+                        }
+                        setNeutralButton(R.string.dialog_cancel) { _, _ -> activity?.dismissAllDialogFragments() }
+
+                        if (noHave.isNotEmpty()) {
+                            setNegativeButton(TR.mediaCheckAddTag().toSentenceCase(requireContext(), R.string.tag_missing)) { _, _ ->
+                                (activity as MediaCheckDialogListener?)?.tagMissing(missingMediaNotes)
+                                activity?.dismissAllDialogFragments()
+                            }
+                        }
+                    }.create()
+            }
+        }
+    }
+
+    private fun generateReport(
+        unused: List<String>,
+        noHave: List<String>,
+        invalid: List<String>,
+    ): String {
+        val report = StringBuilder()
+        if (invalid.isNotEmpty()) {
+            report.append(String.format(res().getString(R.string.check_media_invalid), invalid.size))
+        }
+
+        if (noHave.isNotEmpty()) {
+            if (report.isNotEmpty()) {
+                report.append("\n")
+            }
+            report.append(TR.mediaCheckMissingCount(noHave.size))
+        }
+
+        if (unused.isNotEmpty()) {
+            if (report.isNotEmpty()) {
+                report.append("\n")
+            }
+            report.append(TR.mediaCheckUnusedCount(unused.size))
+        }
+        if (report.isEmpty()) {
+            report.append(res().getString(R.string.check_media_no_unused_missing))
+        }
+        return report.toString()
+    }
+
+    private fun setupDialogBody(
+        inflater: LayoutInflater,
+        report: String,
+        noHave: List<String>,
+        unused: List<String>,
+    ): LinearLayout {
+        val dialogBody = inflater.inflate(R.layout.media_check_dialog_body, null) as LinearLayout
+        val reportTextView = dialogBody.findViewById<TextView>(R.id.reportTextView)
+        val fileListTextView = dialogBody.findViewById<TextView>(R.id.fileListTextView)
+
+        reportTextView.text = createReportString(report)
+
+        if (unused.isNotEmpty() || noHave.isNotEmpty()) {
+            fileListTextView.text = formatMissingAndUnusedFiles(noHave, unused)
+            fileListTextView.isScrollbarFadingEnabled = unused.size + noHave.size <= fileListTextView.maxLines
+            fileListTextView.movementMethod = ScrollingMovementMethod.getInstance()
+            fileListTextView.setTextIsSelectable(true)
+        } else {
+            fileListTextView.visibility = View.GONE
+        }
+
+        return dialogBody
+    }
+
+    private fun createReportString(report: String): String =
+        """
+        |$report
+        """.trimMargin().trimIndent()
+
+    private fun formatMissingAndUnusedFiles(
+        noHave: List<String>,
+        unused: List<String>,
+    ): String {
+        val noHaveFormatted = noHave.joinToString("\n") { missingMedia -> TR.mediaCheckMissingFile(missingMedia) }
+        val unusedFormatted = unused.joinToString("\n") { unusedMedia -> TR.mediaCheckUnusedFile(unusedMedia) }
+
+        return buildString {
+            if (noHaveFormatted.isNotEmpty()) {
+                append(TR.mediaCheckMissingHeader())
+                append("\n")
+                append(noHaveFormatted)
+                append("\n\n")
+            }
+            if (unusedFormatted.isNotEmpty()) {
+                append(TR.mediaCheckUnusedHeader())
+                append("\n")
+                append(unusedFormatted)
             }
         }
     }
@@ -139,12 +201,12 @@ class MediaCheckDialog : AsyncDialogFragment() {
         get() =
             when (dialogType) {
                 DIALOG_CONFIRM_MEDIA_CHECK -> res().getString(R.string.check_media_title)
-                DIALOG_MEDIA_CHECK_RESULTS -> res().getString(R.string.app_name)
+                DIALOG_MEDIA_CHECK_RESULTS -> TR.mediaCheckCheckMediaAction()
             }
 
     override val dialogHandlerMessage: MediaCheckCompleteDialog
         get() {
-            return MediaCheckCompleteDialog(dialogType, noHave, unused, invalid)
+            return MediaCheckCompleteDialog(dialogType, noHave, unused, invalid, missingMediaNotes)
         }
 
     enum class Type(
@@ -180,6 +242,11 @@ class MediaCheckDialog : AsyncDialogFragment() {
          */
         const val INVALID = "invalid"
 
+        /**
+         * Key for a list of notes with missing media
+         */
+        const val MISSING_MEDIA_NOTES = "missingMediaNotes"
+
         @CheckResult
         fun newInstance(dialogType: Type) =
             MediaCheckDialog().apply { arguments = bundleOf(MEDIA_CHECK_DIALOG_TYPE_KEY to dialogType.code) }
@@ -196,6 +263,7 @@ class MediaCheckDialog : AsyncDialogFragment() {
                     UNUSED to ArrayList(checkList.unusedFileNames),
                     INVALID to ArrayList(checkList.invalidFileNames),
                     MEDIA_CHECK_DIALOG_TYPE_KEY to dialogType.code,
+                    MISSING_MEDIA_NOTES to ArrayList(checkList.missingMediaNotes).toList(),
                 )
         }
     }
@@ -205,6 +273,7 @@ class MediaCheckDialog : AsyncDialogFragment() {
         private val noHave: List<String>?,
         private val unused: List<String>?,
         private val invalid: List<String>?,
+        private val missingMediaNotes: List<Long>?,
     ) : DialogHandlerMessage(WhichDialogHandler.MSG_SHOW_MEDIA_CHECK_COMPLETE_DIALOG, "MediaCheckCompleteDialog") {
         override fun handleAsyncMessage(activity: AnkiActivity) {
             // Media check results
@@ -220,7 +289,13 @@ class MediaCheckDialog : AsyncDialogFragment() {
                         )
                         return
                     }
-                    val checkList = MediaCheckResult(noHave ?: arrayListOf(), unused ?: arrayListOf(), invalid ?: arrayListOf())
+                    val checkList =
+                        MediaCheckResult(
+                            noHave ?: arrayListOf(),
+                            unused ?: arrayListOf(),
+                            invalid ?: arrayListOf(),
+                            missingMediaNotes ?: arrayListOf(),
+                        )
                     activity.showMediaCheckDialog(dialogType, checkList)
                 }
                 DIALOG_CONFIRM_MEDIA_CHECK -> { }
@@ -236,6 +311,7 @@ class MediaCheckDialog : AsyncDialogFragment() {
                         UNUSED to unused,
                         INVALID to invalid,
                         MEDIA_CHECK_DIALOG_TYPE_KEY to dialogType,
+                        MISSING_MEDIA_NOTES to missingMediaNotes,
                     )
             }
 
@@ -245,7 +321,9 @@ class MediaCheckDialog : AsyncDialogFragment() {
                 val noHave = message.data.getStringArrayList(NO_HAVE)
                 val unused = message.data.getStringArrayList(UNUSED)
                 val invalid = message.data.getStringArrayList(INVALID)
-                return MediaCheckCompleteDialog(dialogType, noHave, unused, invalid)
+                val missingMediaNotes = message.data.getLongArray(MISSING_MEDIA_NOTES)?.toList()
+
+                return MediaCheckCompleteDialog(dialogType, noHave, unused, invalid, missingMediaNotes)
             }
         }
     }
diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/Media.kt b/AnkiDroid/src/main/java/com/ichi2/libanki/Media.kt
index 1afad80ca0f1..9be36d02e000 100644
--- a/AnkiDroid/src/main/java/com/ichi2/libanki/Media.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/libanki/Media.kt
@@ -100,7 +100,7 @@ open class Media(
     // FIXME: this also provides trash count, but UI can not handle it yet
     fun check(): MediaCheckResult {
         val out = col.backend.checkMedia()
-        return MediaCheckResult(out.missingList, out.unusedList, listOf())
+        return MediaCheckResult(out.missingList, out.unusedList, listOf(), out.missingMediaNotesList)
     }
 
     /**
@@ -144,4 +144,5 @@ data class MediaCheckResult(
     val missingFileNames: List<String>,
     val unusedFileNames: List<String>,
     val invalidFileNames: List<String>,
+    val missingMediaNotes: List<Long>,
 )
diff --git a/AnkiDroid/src/main/res/layout/media_check_dialog_body.xml b/AnkiDroid/src/main/res/layout/media_check_dialog_body.xml
index ec58d9c025d1..e27a35455b1e 100644
--- a/AnkiDroid/src/main/res/layout/media_check_dialog_body.xml
+++ b/AnkiDroid/src/main/res/layout/media_check_dialog_body.xml
@@ -16,7 +16,7 @@
   -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
+    android:layout_height="match_parent"
     android:orientation="vertical"
     android:paddingEnd="25dp"
     android:paddingStart="25dp">
@@ -35,8 +35,6 @@
         android:layout_height="match_parent"
         android:layout_gravity="center"
         android:background="?attr/checkMediaListBackground"
-        android:gravity="center"
-        android:maxLines="7"
         android:minHeight="48dp"
         android:minWidth="48dp"
         android:paddingBottom="5dp"
diff --git a/AnkiDroid/src/main/res/values/03-dialogs.xml b/AnkiDroid/src/main/res/values/03-dialogs.xml
index 91d59156c62e..aa70ba3bab57 100644
--- a/AnkiDroid/src/main/res/values/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values/03-dialogs.xml
@@ -29,7 +29,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="unused_strings">\n\nUnused files:\n</string>
 
     <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
@@ -94,10 +93,7 @@
     <string name="check_media_message">Checking media…</string>
     <string name="check_media_acknowledge">Media checked</string>
     <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_unused">Files in media folder but not used by any cards: %d</string>
-    <string name="check_media_nohave">Files used on cards but not in media folder: %d</string>
     <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_db_updated">Media database rebuilt</string>
     <string name="check_media_delete_unused">Delete unused</string>
 
     <string name="delete_media_message">Deleting media…</string>
diff --git a/AnkiDroid/src/main/res/values/sentence-case.xml b/AnkiDroid/src/main/res/values/sentence-case.xml
index 0e511eb783be..63653a540e91 100644
--- a/AnkiDroid/src/main/res/values/sentence-case.xml
+++ b/AnkiDroid/src/main/res/values/sentence-case.xml
@@ -42,5 +42,6 @@ undoActionUndone()
     <string name="sentence_gesture_toggle_whiteboard">Toggle whiteboard</string>
     <string name="sentence_custom_study">Custom study</string>
     <string name="sentence_empty_cards">Empty cards</string>
+    <string name="tag_missing">Tag missing</string>
 
 </resources>
\ No newline at end of file

From 555201c17f13f57c00689ab7a1dfc528992e0dea Mon Sep 17 00:00:00 2001
From: Mike Hardy <github@mikehardy.net>
Date: Mon, 10 Feb 2025 08:46:54 -0500
Subject: [PATCH 035/200] Dependency updates 20250210 (#17958)

* build(deps): bump kotlin from 2.1.0 to 2.1.10

Bumps `kotlin` from 2.1.0 to 2.1.10.

Updates `org.jetbrains.kotlin:kotlin-stdlib` from 2.1.0 to 2.1.10
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v2.1.10/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v2.1.0...v2.1.10)

Updates `org.jetbrains.kotlin:kotlin-reflect` from 2.1.0 to 2.1.10
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v2.1.10/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v2.1.0...v2.1.10)

Updates `org.jetbrains.kotlin:kotlin-test` from 2.1.0 to 2.1.10
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v2.1.10/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v2.1.0...v2.1.10)

Updates `org.jetbrains.kotlin:kotlin-test-junit` from 2.1.0 to 2.1.10
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v2.1.10/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v2.1.0...v2.1.10)

Updates `org.jetbrains.kotlin:kotlin-test-junit5` from 2.1.0 to 2.1.10
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v2.1.10/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v2.1.0...v2.1.10)

Updates `org.jetbrains.kotlin.android` from 2.1.0 to 2.1.10
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v2.1.10/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v2.1.0...v2.1.10)

Updates `org.jetbrains.kotlin.plugin.parcelize` from 2.1.0 to 2.1.10
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v2.1.10/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v2.1.0...v2.1.10)

Updates `org.jetbrains.kotlin.jvm` from 2.1.0 to 2.1.10
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v2.1.10/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v2.1.0...v2.1.10)

Updates `org.jetbrains.kotlin.plugin.serialization` from 2.1.0 to 2.1.10
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v2.1.10/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v2.1.0...v2.1.10)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin:kotlin-stdlib
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlin:kotlin-reflect
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlin:kotlin-test
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlin:kotlin-test-junit
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlin:kotlin-test-junit5
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlin.android
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlin.plugin.parcelize
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlin.jvm
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlin.plugin.serialization
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* build(deps): bump the non-breaking group

Bumps the non-breaking group in /tools/localization with 6 updates:

| Package | From | To |
| --- | --- | --- |
| [@crowdin/crowdin-api-client](https://github.com/crowdin/crowdin-api-client-js) | `1.41.0` | `1.41.1` |
| [@eslint/js](https://github.com/eslint/eslint/tree/HEAD/packages/js) | `9.18.0` | `9.19.0` |
| [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) | `22.10.7` | `22.10.10` |
| [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) | `8.20.0` | `8.21.0` |
| [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) | `8.20.0` | `8.21.0` |
| [eslint](https://github.com/eslint/eslint) | `9.18.0` | `9.19.0` |


Updates `@crowdin/crowdin-api-client` from 1.41.0 to 1.41.1
- [Release notes](https://github.com/crowdin/crowdin-api-client-js/releases)
- [Changelog](https://github.com/crowdin/crowdin-api-client-js/blob/master/.release-it.json)
- [Commits](https://github.com/crowdin/crowdin-api-client-js/compare/1.41.0...1.41.1)

Updates `@eslint/js` from 9.18.0 to 9.19.0
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/commits/v9.19.0/packages/js)

Updates `@types/node` from 22.10.7 to 22.10.10
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

Updates `@typescript-eslint/eslint-plugin` from 8.20.0 to 8.21.0
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.21.0/packages/eslint-plugin)

Updates `@typescript-eslint/parser` from 8.20.0 to 8.21.0
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.21.0/packages/parser)

Updates `eslint` from 9.18.0 to 9.19.0
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v9.18.0...v9.19.0)

---
updated-dependencies:
- dependency-name: "@crowdin/crowdin-api-client"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: non-breaking
- dependency-name: "@eslint/js"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: non-breaking
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: non-breaking
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: non-breaking
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: non-breaking
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: non-breaking
...

Signed-off-by: dependabot[bot] <support@github.com>

* build(deps-dev): bump the non-breaking group

Bumps the non-breaking group in /tools/localization with 3 updates: [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node), [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) and [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser).


Updates `@types/node` from 22.10.10 to 22.13.0
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

Updates `@typescript-eslint/eslint-plugin` from 8.21.0 to 8.22.0
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.22.0/packages/eslint-plugin)

Updates `@typescript-eslint/parser` from 8.21.0 to 8.22.0
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.22.0/packages/parser)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: non-breaking
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: non-breaking
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: non-breaking
...

Signed-off-by: dependabot[bot] <support@github.com>

* build(deps-dev): bump the non-breaking group

Bumps the non-breaking group in /tools/localization with 6 updates:

| Package | From | To |
| --- | --- | --- |
| [@eslint/js](https://github.com/eslint/eslint/tree/HEAD/packages/js) | `9.19.0` | `9.20.0` |
| [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) | `22.13.0` | `22.13.1` |
| [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) | `8.22.0` | `8.23.0` |
| [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) | `8.22.0` | `8.23.0` |
| [eslint](https://github.com/eslint/eslint) | `9.19.0` | `9.20.0` |
| [prettier](https://github.com/prettier/prettier) | `3.4.2` | `3.5.0` |


Updates `@eslint/js` from 9.19.0 to 9.20.0
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/commits/v9.20.0/packages/js)

Updates `@types/node` from 22.13.0 to 22.13.1
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

Updates `@typescript-eslint/eslint-plugin` from 8.22.0 to 8.23.0
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.23.0/packages/eslint-plugin)

Updates `@typescript-eslint/parser` from 8.22.0 to 8.23.0
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.23.0/packages/parser)

Updates `eslint` from 9.19.0 to 9.20.0
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v9.19.0...v9.20.0)

Updates `prettier` from 3.4.2 to 3.5.0
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/3.4.2...3.5.0)

---
updated-dependencies:
- dependency-name: "@eslint/js"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: non-breaking
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: non-breaking
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: non-breaking
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: non-breaking
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: non-breaking
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: non-breaking
...

Signed-off-by: dependabot[bot] <support@github.com>

* build(deps): bump com.github.ByteHamster:SearchPreference

Bumps [com.github.ByteHamster:SearchPreference](https://github.com/ByteHamster/SearchPreference) from 2.5.1 to 2.6.2.
- [Release notes](https://github.com/ByteHamster/SearchPreference/releases)
- [Commits](https://github.com/ByteHamster/SearchPreference/compare/v2.5.1...v2.6.2)

---
updated-dependencies:
- dependency-name: com.github.ByteHamster:SearchPreference
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml       |   4 +-
 tools/localization/package.json |  14 +--
 tools/localization/yarn.lock    | 181 +++++++++++++++++---------------
 3 files changed, 104 insertions(+), 95 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1168353905a4..9044d316534a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -86,7 +86,7 @@ androidTestJunit = "1.2.1"
 junitJupiter = "5.11.4"
 junitPlatformLauncher = "1.11.4"
 # https://github.com/JetBrains/kotlin/releases/
-kotlin = '2.1.0'
+kotlin = '2.1.10'
 kotlinxSerializationJson = "1.8.0"
 ktlintGradlePlugin = "12.1.2"
 leakcanaryAndroid = "2.14"
@@ -102,7 +102,7 @@ okhttp = "4.12.0"
 protobufKotlinLite = "4.29.3"
 # ../AnkiDroid/robolectricDownload.gradle may need changes - read instructions in that file
 robolectric = "4.14.1"
-searchpreference = "2.5.1"
+searchpreference = "2.6.2"
 seismic = "1.0.3"
 sharedPreferencesMock = "1.2.4"
 slackKeeper = "0.16.1"
diff --git a/tools/localization/package.json b/tools/localization/package.json
index bfcf71943fb1..25427fbe52a2 100644
--- a/tools/localization/package.json
+++ b/tools/localization/package.json
@@ -17,7 +17,7 @@
     "author": "AnkiDroid Open Source Team",
     "license": "GPL-3.0",
     "dependencies": {
-        "@crowdin/crowdin-api-client": "^1.41.0",
+        "@crowdin/crowdin-api-client": "^1.41.1",
         "axios": "^1.7.9",
         "dotenv": "^16.4.7",
         "extract-zip": "^2.0.1",
@@ -25,12 +25,12 @@
     },
     "devDependencies": {
         "@eslint/eslintrc": "^3.2.0",
-        "@eslint/js": "^9.18.0",
+        "@eslint/js": "^9.20.0",
         "@types/jest": "^29.5.14",
-        "@types/node": "^22.10.7",
-        "@typescript-eslint/eslint-plugin": "^8.20.0",
-        "@typescript-eslint/parser": "^8.20.0",
-        "eslint": "^9.18.0",
+        "@types/node": "^22.13.1",
+        "@typescript-eslint/eslint-plugin": "^8.23.0",
+        "@typescript-eslint/parser": "^8.23.0",
+        "eslint": "^9.20.0",
         "eslint-config-prettier": "^10.0.1",
         "eslint-config-standard": "^17.1.0",
         "eslint-plugin-import": "^2.31.0",
@@ -38,7 +38,7 @@
         "eslint-plugin-promise": "^7.2.1",
         "globals": "^15.14.0",
         "jest": "^29.7.0",
-        "prettier": "^3.4.2",
+        "prettier": "^3.5.0",
         "ts-jest": "^29.2.5",
         "ts-node": "^10.9.2"
     },
diff --git a/tools/localization/yarn.lock b/tools/localization/yarn.lock
index 934838107c9c..32c7418b9a1c 100644
--- a/tools/localization/yarn.lock
+++ b/tools/localization/yarn.lock
@@ -384,12 +384,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@crowdin/crowdin-api-client@npm:^1.41.0":
-  version: 1.41.0
-  resolution: "@crowdin/crowdin-api-client@npm:1.41.0"
+"@crowdin/crowdin-api-client@npm:^1.41.1":
+  version: 1.41.1
+  resolution: "@crowdin/crowdin-api-client@npm:1.41.1"
   dependencies:
     axios: "npm:^1"
-  checksum: 10c0/c5ac2b704bcd1beaf2e7465cb78386f6b4a0f89a50b588226f1c48afa3255e8237bd5498bfededd686984bdd79f10469666d336a5814aff6df5d7846f9b48e12
+  checksum: 10c0/cfea120da1daffd6a3963864d00ced528323683db8c480b22c875027fb78067cfb2f50f51035c356e7b9639945aa4f3b547da2a22bcd9c69f8826bf09cde5a79
   languageName: node
   linkType: hard
 
@@ -440,6 +440,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@eslint/core@npm:^0.11.0":
+  version: 0.11.0
+  resolution: "@eslint/core@npm:0.11.0"
+  dependencies:
+    "@types/json-schema": "npm:^7.0.15"
+  checksum: 10c0/1e0671d035c908175f445864a7864cf6c6a8b67a5dfba8c47b2ac91e2d3ed36e8c1f2fd81d98a73264f8677055559699d4adb0f97d86588e616fc0dc9a4b86c9
+  languageName: node
+  linkType: hard
+
 "@eslint/eslintrc@npm:^3.2.0":
   version: 3.2.0
   resolution: "@eslint/eslintrc@npm:3.2.0"
@@ -457,10 +466,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/js@npm:9.18.0, @eslint/js@npm:^9.18.0":
-  version: 9.18.0
-  resolution: "@eslint/js@npm:9.18.0"
-  checksum: 10c0/3938344c5ac7feef4b73fcb30f3c3e753570cea74c24904bb5d07e9c42fcd34fcbc40f545b081356a299e11f360c9c274b348c05fb0113fc3d492e5175eee140
+"@eslint/js@npm:9.20.0, @eslint/js@npm:^9.20.0":
+  version: 9.20.0
+  resolution: "@eslint/js@npm:9.20.0"
+  checksum: 10c0/10e7b5b9e628b5192e8fc6b0ecd27cf48322947e83e999ff60f9f9e44ac8d499138bcb9383cbfa6e51e780d53b4e76ccc2d1753b108b7173b8404fd484d37328
   languageName: node
   linkType: hard
 
@@ -1066,12 +1075,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:^22.10.7":
-  version: 22.10.7
-  resolution: "@types/node@npm:22.10.7"
+"@types/node@npm:^22.13.1":
+  version: 22.13.1
+  resolution: "@types/node@npm:22.13.1"
   dependencies:
     undici-types: "npm:~6.20.0"
-  checksum: 10c0/c941b4689dfc4044b64a5f601306cbcb0c7210be853ba378a5dd44137898c45accedd796ee002ad9407024cac7ecaf5049304951cb1d80ce3d7cebbbae56f20e
+  checksum: 10c0/d4e56d41d8bd53de93da2651c0a0234e330bd7b1b6d071b1a94bd3b5ee2d9f387519e739c52a15c1faa4fb9d97e825b848421af4b2e50e6518011e7adb4a34b7
   languageName: node
   linkType: hard
 
@@ -1107,115 +1116,115 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/eslint-plugin@npm:^8.20.0":
-  version: 8.20.0
-  resolution: "@typescript-eslint/eslint-plugin@npm:8.20.0"
+"@typescript-eslint/eslint-plugin@npm:^8.23.0":
+  version: 8.23.0
+  resolution: "@typescript-eslint/eslint-plugin@npm:8.23.0"
   dependencies:
     "@eslint-community/regexpp": "npm:^4.10.0"
-    "@typescript-eslint/scope-manager": "npm:8.20.0"
-    "@typescript-eslint/type-utils": "npm:8.20.0"
-    "@typescript-eslint/utils": "npm:8.20.0"
-    "@typescript-eslint/visitor-keys": "npm:8.20.0"
+    "@typescript-eslint/scope-manager": "npm:8.23.0"
+    "@typescript-eslint/type-utils": "npm:8.23.0"
+    "@typescript-eslint/utils": "npm:8.23.0"
+    "@typescript-eslint/visitor-keys": "npm:8.23.0"
     graphemer: "npm:^1.4.0"
     ignore: "npm:^5.3.1"
     natural-compare: "npm:^1.4.0"
-    ts-api-utils: "npm:^2.0.0"
+    ts-api-utils: "npm:^2.0.1"
   peerDependencies:
     "@typescript-eslint/parser": ^8.0.0 || ^8.0.0-alpha.0
     eslint: ^8.57.0 || ^9.0.0
     typescript: ">=4.8.4 <5.8.0"
-  checksum: 10c0/c68d0dc5419db93c38eea8adecac19e27f8b023d015a944ffded112d584e87fa7fe512070a6a1085899cab2e12e1c8db276e10412b74bf639ca6b04052bbfedc
+  checksum: 10c0/6c760a5f90748774f79a1b701f85fe6d99e89f289bc33993009987b0ffe2d13b3960ce595d452a937f3413af3918c76830659317242c05e49db40ceaca593033
   languageName: node
   linkType: hard
 
-"@typescript-eslint/parser@npm:^8.20.0":
-  version: 8.20.0
-  resolution: "@typescript-eslint/parser@npm:8.20.0"
+"@typescript-eslint/parser@npm:^8.23.0":
+  version: 8.23.0
+  resolution: "@typescript-eslint/parser@npm:8.23.0"
   dependencies:
-    "@typescript-eslint/scope-manager": "npm:8.20.0"
-    "@typescript-eslint/types": "npm:8.20.0"
-    "@typescript-eslint/typescript-estree": "npm:8.20.0"
-    "@typescript-eslint/visitor-keys": "npm:8.20.0"
+    "@typescript-eslint/scope-manager": "npm:8.23.0"
+    "@typescript-eslint/types": "npm:8.23.0"
+    "@typescript-eslint/typescript-estree": "npm:8.23.0"
+    "@typescript-eslint/visitor-keys": "npm:8.23.0"
     debug: "npm:^4.3.4"
   peerDependencies:
     eslint: ^8.57.0 || ^9.0.0
     typescript: ">=4.8.4 <5.8.0"
-  checksum: 10c0/fff4a86be27f603ad8d6f7dd9758c46b04a254828f0c6d8a34869c1cf30b5828b60a1dc088f72680a7b65cc5fc696848df4605de19e59a18467306d7ca56c11d
+  checksum: 10c0/f9e0f83a6dd97a9049d4ce23d660a1d4d5f3c57be8efc68e2258e6b2d5b823086d188b534f791a3412ef10d211fe4916b378254728150094c4f8b0ab44aae2a7
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:8.20.0":
-  version: 8.20.0
-  resolution: "@typescript-eslint/scope-manager@npm:8.20.0"
+"@typescript-eslint/scope-manager@npm:8.23.0":
+  version: 8.23.0
+  resolution: "@typescript-eslint/scope-manager@npm:8.23.0"
   dependencies:
-    "@typescript-eslint/types": "npm:8.20.0"
-    "@typescript-eslint/visitor-keys": "npm:8.20.0"
-  checksum: 10c0/a8074768d06c863169294116624a45c19377ff0b8635ad5fa4ae673b43cf704d1b9b79384ceef0ff0abb78b107d345cd90fe5572354daf6ad773fe462ee71e6a
+    "@typescript-eslint/types": "npm:8.23.0"
+    "@typescript-eslint/visitor-keys": "npm:8.23.0"
+  checksum: 10c0/625b524a4fc25667b20f3541da84674af9c2abfac6596e30f7a40085513172bf1aac125488b32885894e3ef6596a0d06dec9a65ed4562884e0bca87a758600fa
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:8.20.0":
-  version: 8.20.0
-  resolution: "@typescript-eslint/type-utils@npm:8.20.0"
+"@typescript-eslint/type-utils@npm:8.23.0":
+  version: 8.23.0
+  resolution: "@typescript-eslint/type-utils@npm:8.23.0"
   dependencies:
-    "@typescript-eslint/typescript-estree": "npm:8.20.0"
-    "@typescript-eslint/utils": "npm:8.20.0"
+    "@typescript-eslint/typescript-estree": "npm:8.23.0"
+    "@typescript-eslint/utils": "npm:8.23.0"
     debug: "npm:^4.3.4"
-    ts-api-utils: "npm:^2.0.0"
+    ts-api-utils: "npm:^2.0.1"
   peerDependencies:
     eslint: ^8.57.0 || ^9.0.0
     typescript: ">=4.8.4 <5.8.0"
-  checksum: 10c0/7d46143f26ec606b71d20f0f5535b16abba2ba7a5a2daecd2584ddb61d1284dd8404f34265cc1fdfd541068b24b0211f7ad94801c94e4c60869d9f26bf3c0b9b
+  checksum: 10c0/a98dc2f2f75ec2132176428011ba620ad5b641a04e9e18471a7b9f979f6966a76aeaf6e51072c5364de68f83832a3a77b04518ec65c3092dadbd033d03fb5e35
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:8.20.0":
-  version: 8.20.0
-  resolution: "@typescript-eslint/types@npm:8.20.0"
-  checksum: 10c0/21292d4ca089897015d2bf5ab99909a7b362902f63f4ba10696676823b50d00c7b4cd093b4b43fba01d12bc3feca3852d2c28528c06d8e45446b7477887dbee7
+"@typescript-eslint/types@npm:8.23.0":
+  version: 8.23.0
+  resolution: "@typescript-eslint/types@npm:8.23.0"
+  checksum: 10c0/78737a14e8469e33212d9bbc26d6880bca3f8e47764273eb4c662f5ed38d0b35c626d646d4a8e9a6ee64a0e352b18dd36422e59ce217362b5af473b79d058b35
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:8.20.0":
-  version: 8.20.0
-  resolution: "@typescript-eslint/typescript-estree@npm:8.20.0"
+"@typescript-eslint/typescript-estree@npm:8.23.0":
+  version: 8.23.0
+  resolution: "@typescript-eslint/typescript-estree@npm:8.23.0"
   dependencies:
-    "@typescript-eslint/types": "npm:8.20.0"
-    "@typescript-eslint/visitor-keys": "npm:8.20.0"
+    "@typescript-eslint/types": "npm:8.23.0"
+    "@typescript-eslint/visitor-keys": "npm:8.23.0"
     debug: "npm:^4.3.4"
     fast-glob: "npm:^3.3.2"
     is-glob: "npm:^4.0.3"
     minimatch: "npm:^9.0.4"
     semver: "npm:^7.6.0"
-    ts-api-utils: "npm:^2.0.0"
+    ts-api-utils: "npm:^2.0.1"
   peerDependencies:
     typescript: ">=4.8.4 <5.8.0"
-  checksum: 10c0/54a2c1da7d1c5f7e865b941e8a3c98eb4b5f56ed8741664a84065173bde9602cdb8866b0984b26816d6af885c1528311c11e7286e869ed424483b74366514cbd
+  checksum: 10c0/2cc8defb3d9b25b899a62c6b6ca26c442433bf95f626f6275935e2754d9a74abb0015c737de27038b0f378273e67e61120d9cf2941c44848e4bffbbc297fdf74
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:8.20.0":
-  version: 8.20.0
-  resolution: "@typescript-eslint/utils@npm:8.20.0"
+"@typescript-eslint/utils@npm:8.23.0":
+  version: 8.23.0
+  resolution: "@typescript-eslint/utils@npm:8.23.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.4.0"
-    "@typescript-eslint/scope-manager": "npm:8.20.0"
-    "@typescript-eslint/types": "npm:8.20.0"
-    "@typescript-eslint/typescript-estree": "npm:8.20.0"
+    "@typescript-eslint/scope-manager": "npm:8.23.0"
+    "@typescript-eslint/types": "npm:8.23.0"
+    "@typescript-eslint/typescript-estree": "npm:8.23.0"
   peerDependencies:
     eslint: ^8.57.0 || ^9.0.0
     typescript: ">=4.8.4 <5.8.0"
-  checksum: 10c0/dd36c3b22a2adde1e1462aed0c8b4720f61859b4ebb0c3ef935a786a6b1cb0ec21eb0689f5a8debe8db26d97ebb979bab68d6f8fe7b0098e6200a485cfe2991b
+  checksum: 10c0/8967cf6543b1df2fb8d29086a0d35f5f7623e935706ad7c5bfcc6123e6fb08a767be1770601d481d815022bec43422730c6c8035892f23cd11cdadb16176b418
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:8.20.0":
-  version: 8.20.0
-  resolution: "@typescript-eslint/visitor-keys@npm:8.20.0"
+"@typescript-eslint/visitor-keys@npm:8.23.0":
+  version: 8.23.0
+  resolution: "@typescript-eslint/visitor-keys@npm:8.23.0"
   dependencies:
-    "@typescript-eslint/types": "npm:8.20.0"
+    "@typescript-eslint/types": "npm:8.23.0"
     eslint-visitor-keys: "npm:^4.2.0"
-  checksum: 10c0/e95d8b2685e8beb6637bf2e9d06e4177a400d3a2b142ba749944690f969ee3186b750082fd9bf34ada82acf1c5dd5970201dfd97619029c8ecca85fb4b50dbd8
+  checksum: 10c0/a406f78aa18b4efb2adf26e3a6ca48c9a6f2cc9545e083b50efaaf90f0a80d2bea79ceda51da1f109706d4138756b0978a323b9176c9a6a519e87168851e7e16
   languageName: node
   linkType: hard
 
@@ -1288,16 +1297,16 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "ankidroid-localization@workspace:."
   dependencies:
-    "@crowdin/crowdin-api-client": "npm:^1.41.0"
+    "@crowdin/crowdin-api-client": "npm:^1.41.1"
     "@eslint/eslintrc": "npm:^3.2.0"
-    "@eslint/js": "npm:^9.18.0"
+    "@eslint/js": "npm:^9.20.0"
     "@types/jest": "npm:^29.5.14"
-    "@types/node": "npm:^22.10.7"
-    "@typescript-eslint/eslint-plugin": "npm:^8.20.0"
-    "@typescript-eslint/parser": "npm:^8.20.0"
+    "@types/node": "npm:^22.13.1"
+    "@typescript-eslint/eslint-plugin": "npm:^8.23.0"
+    "@typescript-eslint/parser": "npm:^8.23.0"
     axios: "npm:^1.7.9"
     dotenv: "npm:^16.4.7"
-    eslint: "npm:^9.18.0"
+    eslint: "npm:^9.20.0"
     eslint-config-prettier: "npm:^10.0.1"
     eslint-config-standard: "npm:^17.1.0"
     eslint-plugin-import: "npm:^2.31.0"
@@ -1306,7 +1315,7 @@ __metadata:
     extract-zip: "npm:^2.0.1"
     globals: "npm:^15.14.0"
     jest: "npm:^29.7.0"
-    prettier: "npm:^3.4.2"
+    prettier: "npm:^3.5.0"
     ts-jest: "npm:^29.2.5"
     ts-node: "npm:^10.9.2"
     typescript: "npm:^5.7.3"
@@ -2406,16 +2415,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint@npm:^9.18.0":
-  version: 9.18.0
-  resolution: "eslint@npm:9.18.0"
+"eslint@npm:^9.20.0":
+  version: 9.20.0
+  resolution: "eslint@npm:9.20.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.2.0"
     "@eslint-community/regexpp": "npm:^4.12.1"
     "@eslint/config-array": "npm:^0.19.0"
-    "@eslint/core": "npm:^0.10.0"
+    "@eslint/core": "npm:^0.11.0"
     "@eslint/eslintrc": "npm:^3.2.0"
-    "@eslint/js": "npm:9.18.0"
+    "@eslint/js": "npm:9.20.0"
     "@eslint/plugin-kit": "npm:^0.2.5"
     "@humanfs/node": "npm:^0.16.6"
     "@humanwhocodes/module-importer": "npm:^1.0.1"
@@ -2451,7 +2460,7 @@ __metadata:
       optional: true
   bin:
     eslint: bin/eslint.js
-  checksum: 10c0/7f592ad228b9bd627a24870fdc875bacdab7bf535d4b67316c4cb791e90d0125130a74769f3c407b0c4b7027b3082ef33864a63ee1024552a60a17db60493f15
+  checksum: 10c0/5eb2d9b5ed85a0b022871d19719417d110afb07a4abfedd856ad03d9a821def5f6bc31d7c407ca27f56e5e66e39375300fd2b877017245eb99c44060d6c983bd
   languageName: node
   linkType: hard
 
@@ -4721,12 +4730,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prettier@npm:^3.4.2":
-  version: 3.4.2
-  resolution: "prettier@npm:3.4.2"
+"prettier@npm:^3.5.0":
+  version: 3.5.0
+  resolution: "prettier@npm:3.5.0"
   bin:
     prettier: bin/prettier.cjs
-  checksum: 10c0/99e076a26ed0aba4ebc043880d0f08bbb8c59a4c6641cdee6cdadf2205bdd87aa1d7823f50c3aea41e015e99878d37c58d7b5f0e663bba0ef047f94e36b96446
+  checksum: 10c0/6c355d74c377f5622953229d92477e8b9779162e848db90fd7e06c431deb73585d31fafc4516cf5868917825b97b9ec7c87c8d8b8e03ccd9fc9c0b7699d1a650
   languageName: node
   linkType: hard
 
@@ -5325,12 +5334,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ts-api-utils@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "ts-api-utils@npm:2.0.0"
+"ts-api-utils@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "ts-api-utils@npm:2.0.1"
   peerDependencies:
     typescript: ">=4.8.4"
-  checksum: 10c0/6165e29a5b75bd0218e3cb0f9ee31aa893dbd819c2e46dbb086c841121eb0436ed47c2c18a20cb3463d74fd1fb5af62e2604ba5971cc48e5b38ebbdc56746dfc
+  checksum: 10c0/23fd56a958b332cac00150a652e4c84730df30571bd2faa1ba6d7b511356d1a61656621492bb6c7f15dd6e18847a1408357a0e406671d358115369a17f5bfedd
   languageName: node
   linkType: hard
 

From f96d114699ac1eb7f50a04816654dae981aef0fa Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Thu, 26 Dec 2024 18:06:45 -0300
Subject: [PATCH 036/200] refactor: extract Binding equality to original
 classes

---
 .../java/com/ichi2/anki/reviewer/Binding.kt   | 15 ++++++-
 .../ichi2/anki/reviewer/MappableBinding.kt    | 41 +------------------
 2 files changed, 16 insertions(+), 40 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/Binding.kt b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/Binding.kt
index 8a9e923cdb99..bb9dbf8efa46 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/Binding.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/Binding.kt
@@ -23,6 +23,7 @@ import com.ichi2.anki.utils.ext.ifNotZero
 import com.ichi2.utils.StringUtil
 import com.ichi2.utils.lastIndexOfOrNull
 import timber.log.Timber
+import java.util.Objects
 
 sealed interface Binding {
     data class GestureInput(
@@ -75,6 +76,7 @@ sealed interface Binding {
         val modifierKeys: ModifierKeys
     }
 
+    @Suppress("EqualsOrHashCode")
     data class KeyCode(
         val keycode: Int,
         override val modifierKeys: ModifierKeys = ModifierKeys.none(),
@@ -101,8 +103,12 @@ sealed interface Binding {
                 append(modifierKeys.toString())
                 append(keycode)
             }
+
+        // don't include the modifierKeys
+        override fun hashCode(): Int = Objects.hash(keycode)
     }
 
+    @Suppress("EqualsOrHashCode")
     data class UnicodeCharacter(
         val unicodeCharacter: Char,
         override val modifierKeys: ModifierKeys = AppDefinedModifierKeys.allowShift(),
@@ -121,6 +127,9 @@ sealed interface Binding {
                 append(modifierKeys.toString())
                 append(unicodeCharacter)
             }
+
+        // don't include the modifierKeys
+        override fun hashCode(): Int = Objects.hash(unicodeCharacter)
     }
 
     data object UnknownBinding : Binding {
@@ -168,7 +177,7 @@ sealed interface Binding {
                 if (shift) append("Shift+")
             }
 
-        fun semiStructuralEquals(keys: ModifierKeys): Boolean {
+        private fun semiStructuralEquals(keys: ModifierKeys): Boolean {
             if (this.alt != keys.alt || this.ctrl != keys.ctrl) {
                 return false
             }
@@ -179,6 +188,10 @@ sealed interface Binding {
             )
         }
 
+        override fun equals(other: Any?): Boolean = other is ModifierKeys && semiStructuralEquals(other)
+
+        override fun hashCode(): Int = Objects.hash(ctrl, alt, shift, shiftMatches(true), shiftMatches(false))
+
         companion object {
             fun none(): ModifierKeys = ModifierKeys(shift = false, ctrl = false, alt = false)
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MappableBinding.kt b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MappableBinding.kt
index c9cdda5f0a17..25cc52924997 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MappableBinding.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MappableBinding.kt
@@ -22,11 +22,8 @@ import androidx.annotation.CheckResult
 import com.ichi2.anki.R
 import com.ichi2.anki.cardviewer.Gesture
 import com.ichi2.anki.cardviewer.ViewerCommand
-import com.ichi2.anki.reviewer.Binding.AxisButtonBinding
 import com.ichi2.anki.reviewer.Binding.GestureInput
 import com.ichi2.anki.reviewer.Binding.KeyBinding
-import com.ichi2.anki.reviewer.Binding.KeyCode
-import com.ichi2.anki.reviewer.Binding.UnicodeCharacter
 import com.ichi2.utils.hash
 import timber.log.Timber
 import java.util.Objects
@@ -47,48 +44,14 @@ class MappableBinding(
         if (other == null) return false
 
         val otherBinding = (other as MappableBinding).binding
-        val bindingEquals =
-            when {
-                binding is KeyCode && otherBinding is KeyCode -> binding.keycode == otherBinding.keycode && modifierEquals(otherBinding)
-                binding is UnicodeCharacter && otherBinding is UnicodeCharacter -> {
-                    binding.unicodeCharacter == otherBinding.unicodeCharacter &&
-                        modifierEquals(otherBinding)
-                }
-                binding is GestureInput && otherBinding is GestureInput -> binding.gesture == otherBinding.gesture
-                binding is AxisButtonBinding && otherBinding is AxisButtonBinding -> {
-                    binding.axis == otherBinding.axis && binding.threshold == otherBinding.threshold
-                }
-                else -> false
-            }
-        if (!bindingEquals) {
+        if (binding != otherBinding) {
             return false
         }
 
         return screen.screenEquals(other.screen)
     }
 
-    override fun hashCode(): Int {
-        // don't include the modifierKeys or mSide
-        val bindingHash =
-            when (binding) {
-                is KeyCode -> binding.keycode
-                is UnicodeCharacter -> binding.unicodeCharacter
-                is GestureInput -> binding.gesture
-                is AxisButtonBinding -> hash(binding.axis.motionEventValue, binding.threshold.toInt())
-                else -> 0
-            }
-        return Objects.hash(bindingHash, screen.prefix)
-    }
-
-    private fun modifierEquals(otherBinding: KeyBinding): Boolean {
-        // equals allowing subclasses
-        val keys = otherBinding.modifierKeys
-        val thisKeys = (this.binding as KeyBinding).modifierKeys
-        if (thisKeys === keys) return true
-        return thisKeys.semiStructuralEquals(keys)
-
-        // allow subclasses to work - a subclass which overrides shiftMatches will return true on one of the tests
-    }
+    override fun hashCode(): Int = Objects.hash(binding, screen.prefix)
 
     fun toDisplayString(context: Context): String = screen.toDisplayString(context, binding)
 

From f7ee6b94a3184ae8c98c1d689fce4ebc32110b7e Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Wed, 5 Feb 2025 16:35:10 -0300
Subject: [PATCH 037/200] refactor(Binding): inline some methods

---
 AnkiDroid/src/main/java/com/ichi2/anki/reviewer/Binding.kt | 6 +-----
 .../src/test/java/com/ichi2/anki/reviewer/BindingTest.kt   | 7 +++----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/Binding.kt b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/Binding.kt
index bb9dbf8efa46..63bddce697fc 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/Binding.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/Binding.kt
@@ -162,14 +162,10 @@ sealed interface Binding {
 
         private fun ctrlMatches(event: KeyEvent): Boolean = ctrl == event.isCtrlPressed
 
-        private fun altMatches(event: KeyEvent): Boolean = altMatches(event.isAltPressed)
+        private fun altMatches(event: KeyEvent): Boolean = alt == event.isAltPressed
 
         open fun shiftMatches(shiftPressed: Boolean): Boolean = shift == shiftPressed
 
-        fun ctrlMatches(ctrlPressed: Boolean): Boolean = ctrl == ctrlPressed
-
-        fun altMatches(altPressed: Boolean): Boolean = alt == altPressed
-
         override fun toString() =
             buildString {
                 if (ctrl) append("Ctrl+")
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/BindingTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/BindingTest.kt
index 425ab37501f9..3558f760d0a3 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/BindingTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/BindingTest.kt
@@ -25,14 +25,13 @@ import org.mockito.ArgumentMatchers.anyInt
 import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.mock
 import kotlin.reflect.KFunction1
-import kotlin.reflect.KFunction2
 
 class BindingTest {
     @Test
     fun modifierKeys_Are_Loaded() {
         testModifierKeys("shift", KeyEvent::isShiftPressed, Binding.ModifierKeys::shiftMatches)
-        testModifierKeys("ctrl", KeyEvent::isCtrlPressed, Binding.ModifierKeys::ctrlMatches)
-        testModifierKeys("alt", KeyEvent::isAltPressed, Binding.ModifierKeys::altMatches)
+        testModifierKeys("ctrl", KeyEvent::isCtrlPressed) { k, ctrlPressed -> k.ctrl == ctrlPressed }
+        testModifierKeys("alt", KeyEvent::isAltPressed) { k, altPressed -> k.alt == altPressed }
     }
 
     @Test
@@ -72,7 +71,7 @@ class BindingTest {
     private fun testModifierKeys(
         name: String,
         event: KFunction1<KeyEvent, Boolean>,
-        getValue: KFunction2<Binding.ModifierKeys, Boolean, Boolean>,
+        getValue: (Binding.ModifierKeys, Boolean) -> Boolean,
     ) {
         fun testModifierResult(
             event: KFunction1<KeyEvent, Boolean>,

From 4fd3bdbb8ccd03abb1705f514768b7f425686ef3 Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Wed, 5 Feb 2025 16:56:05 -0300
Subject: [PATCH 038/200] test: modifier keys equality

---
 .../java/com/ichi2/anki/reviewer/Binding.kt     |  4 ++--
 .../java/com/ichi2/anki/reviewer/BindingTest.kt | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/Binding.kt b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/Binding.kt
index 63bddce697fc..6d81760e3087 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/Binding.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/Binding.kt
@@ -186,7 +186,7 @@ sealed interface Binding {
 
         override fun equals(other: Any?): Boolean = other is ModifierKeys && semiStructuralEquals(other)
 
-        override fun hashCode(): Int = Objects.hash(ctrl, alt, shift, shiftMatches(true), shiftMatches(false))
+        override fun hashCode(): Int = Objects.hash(ctrl, alt, shiftMatches(true))
 
         companion object {
             fun none(): ModifierKeys = ModifierKeys(shift = false, ctrl = false, alt = false)
@@ -213,7 +213,7 @@ sealed interface Binding {
     }
 
     /** Modifier keys which cannot be defined by a binding  */
-    private class AppDefinedModifierKeys private constructor() : ModifierKeys(false, false, false) {
+    class AppDefinedModifierKeys private constructor() : ModifierKeys(false, false, false) {
         override fun shiftMatches(shiftPressed: Boolean): Boolean = true
 
         companion object {
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/BindingTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/BindingTest.kt
index 3558f760d0a3..28c83f834de9 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/BindingTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/BindingTest.kt
@@ -25,6 +25,8 @@ import org.mockito.ArgumentMatchers.anyInt
 import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.mock
 import kotlin.reflect.KFunction1
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
 
 class BindingTest {
     @Test
@@ -68,6 +70,21 @@ class BindingTest {
         assertThat(Binding.unknown().toString(), equalTo(""))
     }
 
+    @Test
+    fun testModifierKeysEquality() {
+        val one = Binding.AppDefinedModifierKeys.allowShift()
+        val two = Binding.ModifierKeys(shift = true, ctrl = false, alt = false)
+
+        assertTrue(one.shiftMatches(true))
+        assertTrue(one.shiftMatches(false))
+
+        assertTrue(two.shiftMatches(true))
+        assertFalse(two.shiftMatches(false))
+
+        assertEquals(one, two)
+        assertEquals(one.hashCode(), two.hashCode())
+    }
+
     private fun testModifierKeys(
         name: String,
         event: KFunction1<KeyEvent, Boolean>,

From ef9826778d1dbfe9de391c753127efdb1438c17b Mon Sep 17 00:00:00 2001
From: AnkiDroid Translations <ankidroid@ankidroid.org>
Date: Mon, 10 Feb 2025 13:48:57 +0000
Subject: [PATCH 039/200] Updated strings from Crowdin

---
 AnkiDroid/src/main/res/values-af/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-am/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-ar/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-az/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-be/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-bg/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-bn/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-ca/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-ckb/03-dialogs.xml        | 4 ----
 AnkiDroid/src/main/res/values-cs/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-da/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-de/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-el/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-eo/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-es-rAR/03-dialogs.xml     | 4 ----
 AnkiDroid/src/main/res/values-es-rES/03-dialogs.xml     | 4 ----
 AnkiDroid/src/main/res/values-et/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-eu/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-fa/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-fi/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-fil/03-dialogs.xml        | 4 ----
 AnkiDroid/src/main/res/values-fr/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-fy/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-ga/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-gl/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-got/03-dialogs.xml        | 4 ----
 AnkiDroid/src/main/res/values-gu/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-heb/03-dialogs.xml        | 4 ----
 AnkiDroid/src/main/res/values-hi/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-hr/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-hu/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-hy/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-ind/03-dialogs.xml        | 4 ----
 AnkiDroid/src/main/res/values-is/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-it/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-iw/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-ja/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-jv/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-ka/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-kk/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-km/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-kn/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-ko/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-ku/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-ky/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-lt/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-lv/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-mk/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-ml/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-mn/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-mr/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-ms/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-my/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-nl/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-nn/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-no/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-or/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-pa/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-pl/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-pt-rBR/03-dialogs.xml     | 4 ----
 AnkiDroid/src/main/res/values-pt-rPT/03-dialogs.xml     | 4 ----
 AnkiDroid/src/main/res/values-ro/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-ru/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-sat/03-dialogs.xml        | 4 ----
 AnkiDroid/src/main/res/values-sc/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-sk/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-sl/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-sq/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-sr/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-ss/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-sv/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-sw/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-ta/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-te/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-tg/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-tgl/03-dialogs.xml        | 4 ----
 AnkiDroid/src/main/res/values-th/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-ti/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-tn/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-tr/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-ts/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-tt/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-ug/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-uk/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-ur/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-uz/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-ve/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-vi/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-wo/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-xh/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-yue/03-dialogs.xml        | 4 ----
 AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml     | 4 ----
 AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml | 2 +-
 AnkiDroid/src/main/res/values-zh-rTW/03-dialogs.xml     | 4 ----
 AnkiDroid/src/main/res/values-zu/03-dialogs.xml         | 4 ----
 95 files changed, 1 insertion(+), 377 deletions(-)

diff --git a/AnkiDroid/src/main/res/values-af/03-dialogs.xml b/AnkiDroid/src/main/res/values-af/03-dialogs.xml
index 0c89eb14c259..bedd2ec9b523 100644
--- a/AnkiDroid/src/main/res/values-af/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-af/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Verwyder gefilterde pak %s en stuur alle kaarte terug na hul oorspronklike pakke?</string>
     <string name="no_tts_available_message">Geen teks-na-spraak taal beskikbaar nie</string>
     <string name="tts_no_tts">Moet nie praat nie</string>
-    <string name="unused_strings">\n\nOngebruikte lêers:\n</string>
     <string name="reposition_card_dialog_title">Herposisioneer nuwe kaart</string>
     <string name="reposition_card_not_new_error">Slegs nuwe kaarte kan herposisioneer word</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Media word nagegaan&#8230;</string>
     <string name="check_media_acknowledge">Media nagegaan</string>
     <string name="check_media_invalid">Lêers met ongeldige enkodering: %d</string>
-    <string name="check_media_unused">Lêers in mediavouer maar nie deur enige kaarte gebruik nie: %d</string>
-    <string name="check_media_nohave">Lêers wat op kaarte gebruik word maar nie in mediavouer is nie: %d</string>
     <string name="check_media_no_unused_missing">Geen ongebruikte of ontbrekende lêers gevind nie</string>
-    <string name="check_media_db_updated">Media-databasis is herbou</string>
     <string name="check_media_delete_unused">Verwyder ongebruikte</string>
     <string name="delete_media_message">Media word uitgevee&#8230;</string>
     <string name="delete_media_result_title">Verwyderingsresultaat</string>
diff --git a/AnkiDroid/src/main/res/values-am/03-dialogs.xml b/AnkiDroid/src/main/res/values-am/03-dialogs.xml
index 8fe479b3a949..bba24a6cda13 100644
--- a/AnkiDroid/src/main/res/values-am/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-am/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="unused_strings">\n\nጥቅም ላይ ያልዋሉ ፋይሎች፡\n</string>
     <string name="reposition_card_dialog_title">የአዲስ ካርድ ቦታ መለወጫ</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Checking media&#8230;</string>
     <string name="check_media_acknowledge">Media checked</string>
     <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_unused">Files in media folder but not used by any cards: %d</string>
-    <string name="check_media_nohave">Files used on cards but not in media folder: %d</string>
     <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_db_updated">Media database rebuilt</string>
     <string name="check_media_delete_unused">Delete unused</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-ar/03-dialogs.xml b/AnkiDroid/src/main/res/values-ar/03-dialogs.xml
index a594b212491c..a624059dbaaa 100644
--- a/AnkiDroid/src/main/res/values-ar/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ar/03-dialogs.xml
@@ -59,7 +59,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">لا يتوفر دعم تحويل النص إلى كلام لأي لغة</string>
     <string name="tts_no_tts">لا تنطق</string>
-    <string name="unused_strings">\n\nملفات عير مستخدمة:\n</string>
     <string name="reposition_card_dialog_title">تغيير موضع البطاقة الجديدة</string>
     <string name="reposition_card_not_new_error">يمكن تغيير موضع البطاقات الجديدة فقط</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -124,10 +123,7 @@
     <string name="check_media_message">يجري فحص الوسائط&#8230;</string>
     <string name="check_media_acknowledge">تم فحص الوسائط</string>
     <string name="check_media_invalid">ملفات بترميز غير صالح: %d</string>
-    <string name="check_media_unused">ملفات موجودة في مجلد الوسائط لكنها غير مستخدمة من قبل أي بطاقة: %d</string>
-    <string name="check_media_nohave">ملفات مستخدمة في البطاقات لكنها غير موجودة في مجلد الوسائط: %d</string>
     <string name="check_media_no_unused_missing">لم يُعثَر على ملفات غير مستخدمة أو مفقودة</string>
-    <string name="check_media_db_updated">أعيد بناء قاعدة بيانات الوسائط</string>
     <string name="check_media_delete_unused">حذف غير المستخدمة</string>
     <string name="delete_media_message">جار حذف الوسائط&#8230;</string>
     <string name="delete_media_result_title">نتيجة الحذف</string>
diff --git a/AnkiDroid/src/main/res/values-az/03-dialogs.xml b/AnkiDroid/src/main/res/values-az/03-dialogs.xml
index b508ed2b4e15..f8b3c7ecf142 100644
--- a/AnkiDroid/src/main/res/values-az/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-az/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Mətndən-çıxış dilinə ehtiyac yoxdur</string>
     <string name="tts_no_tts">Söhbət etməyin</string>
-    <string name="unused_strings">\n\nUnused files:\n</string>
     <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Checking media&#8230;</string>
     <string name="check_media_acknowledge">Media checked</string>
     <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_unused">Files in media folder but not used by any cards: %d</string>
-    <string name="check_media_nohave">Files used on cards but not in media folder: %d</string>
     <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_db_updated">Media database rebuilt</string>
     <string name="check_media_delete_unused">Delete unused</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-be/03-dialogs.xml b/AnkiDroid/src/main/res/values-be/03-dialogs.xml
index 7f4750087280..b37b6c4d6299 100644
--- a/AnkiDroid/src/main/res/values-be/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-be/03-dialogs.xml
@@ -57,7 +57,6 @@
     <string name="delete_cram_deck_message">Выдаліць фільтраваную калоду %s і адправіць усе карткі назад у іх арыгінальныя калоды?</string>
     <string name="no_tts_available_message">Сінтэз маўлення недаступны</string>
     <string name="tts_no_tts">Не прамаўляць</string>
-    <string name="unused_strings">\n\nНявыкарыстаныя файлы:\n</string>
     <string name="reposition_card_dialog_title">Перамясціць новую картку</string>
     <string name="reposition_card_not_new_error">Толькі новыя карткі могуць быць перамешчаныя</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -118,10 +117,7 @@
     <string name="check_media_message">Праверка медыяфайлаў&#8230;</string>
     <string name="check_media_acknowledge">Медыяфайлы правераныя</string>
     <string name="check_media_invalid">Файлы з памылковым кадаваннем: %d</string>
-    <string name="check_media_unused">Медыяфайлы знаходзяцца ў адпаведнай папцы, але не прымацаваныя да картак: %d</string>
-    <string name="check_media_nohave">Медыяфайлы не знаходзяцца ў адпаведнай папцы, але прымацаваныя да картак: %d</string>
     <string name="check_media_no_unused_missing">Адсутных або файлаў, якія не выкарыстоўваюцца не знойдзена</string>
-    <string name="check_media_db_updated">База даных з медыяфайлаламі перабудавана</string>
     <string name="check_media_delete_unused">Выдаліць, якія не выкарыстоўваюцца</string>
     <string name="delete_media_message">Выдаленне медыяфайлаў&#8230;</string>
     <string name="delete_media_result_title">Вынік выдалення</string>
diff --git a/AnkiDroid/src/main/res/values-bg/03-dialogs.xml b/AnkiDroid/src/main/res/values-bg/03-dialogs.xml
index 3fa24b5245fa..3f426899b60c 100644
--- a/AnkiDroid/src/main/res/values-bg/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-bg/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Няма наличен синтез за език</string>
     <string name="tts_no_tts">Не говори</string>
-    <string name="unused_strings">\n\nНеизползвани файли:\n</string>
     <string name="reposition_card_dialog_title">Преместване на нова карта</string>
     <string name="reposition_card_not_new_error">Само нови карти могат да бъдат премествани</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Проверка на медия&#8230;</string>
     <string name="check_media_acknowledge">Медията е проверена</string>
     <string name="check_media_invalid">Файлове с невалидно кодиране: %d</string>
-    <string name="check_media_unused">Файловете са в медийната папка, но не се използват от всички карти: %d</string>
-    <string name="check_media_nohave">Файлове, използвани в картите не са медийната папка: %d</string>
     <string name="check_media_no_unused_missing">Няма намерени неизползвани или липсващи файлове</string>
-    <string name="check_media_db_updated">Медийната база данни е възстановена</string>
     <string name="check_media_delete_unused">Изтрий неизползваните</string>
     <string name="delete_media_message">Изтриване на медийни файлове&#8230;</string>
     <string name="delete_media_result_title">Резултат за изтриване</string>
diff --git a/AnkiDroid/src/main/res/values-bn/03-dialogs.xml b/AnkiDroid/src/main/res/values-bn/03-dialogs.xml
index d475805a357c..1794387d6b84 100644
--- a/AnkiDroid/src/main/res/values-bn/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-bn/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">ফিল্টার করা ডেক %s মুছে ফেলবেন এবং সমস্ত কার্ড তাদের আসল ডেকে ফিরিয়ে দেবেন?</string>
     <string name="no_tts_available_message">কোনও টেক্সট টু স্পিচ ভাষা উপলব্ধ নেই</string>
     <string name="tts_no_tts">নিশ্চুপ</string>
-    <string name="unused_strings">\n\nঅব্যবহৃত ফাইলসমূহ:\n</string>
     <string name="reposition_card_dialog_title">নতুন কার্ড এর ক্রম পরিবর্তন</string>
     <string name="reposition_card_not_new_error">শুধু মাত্র নতুন কার্ড এর ক্রম বদলানো যাবে</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">মিডিয়া পরীক্ষা করা হচ্ছে&#8230;</string>
     <string name="check_media_acknowledge">মিডিয়া চেক করা হয়েছে</string>
     <string name="check_media_invalid">অবৈধ এনকোডিং সহ ফাইল: %d</string>
-    <string name="check_media_unused">মিডিয়া ফোল্ডারে ফাইল করুন কিন্তু কোনো কার্ড ব্যবহার হচ্ছে না: %d</string>
-    <string name="check_media_nohave">Files used on cards but not in media folder: %d</string>
     <string name="check_media_no_unused_missing">কোন অব্যবহৃত বা অনুপস্থিত ফাইল খুঁজে পাওয়া যায়নি</string>
-    <string name="check_media_db_updated">মিডিয়া ডাটাবেস পুনর্নির্মাণ</string>
     <string name="check_media_delete_unused">অব্যবহৃত মুছুন</string>
     <string name="delete_media_message">মিডিয়া মুছে ফেলা হচ্ছে&#8230;</string>
     <string name="delete_media_result_title">মুছে ফেলার ফলাফল</string>
diff --git a/AnkiDroid/src/main/res/values-ca/03-dialogs.xml b/AnkiDroid/src/main/res/values-ca/03-dialogs.xml
index 0da65e5d0d17..54e7271f0a05 100644
--- a/AnkiDroid/src/main/res/values-ca/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ca/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No hi ha idiomes de síntesi de veu disponibles</string>
     <string name="tts_no_tts">No parlis</string>
-    <string name="unused_strings">\n\Fitxers no usats:\n</string>
     <string name="reposition_card_dialog_title">Recol·locar carta nova</string>
     <string name="reposition_card_not_new_error">Solament es poden recol·locar les cartes noves</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Comprovant multimèdia&#8230;</string>
     <string name="check_media_acknowledge">Multimèdia comprovada</string>
     <string name="check_media_invalid">Arxius amb codificació no vàlida: %d</string>
-    <string name="check_media_unused">Arxius existents en carpeta de multimèdia però no utilitzats per qualsevol carta: %d</string>
-    <string name="check_media_nohave">Fitxers utilitzats en cartes però no existents en carpeta de multimèdia: %d</string>
     <string name="check_media_no_unused_missing">Cap arixu no utilitzat o mancant trobat</string>
-    <string name="check_media_db_updated">Base de dades de multimèdia reconstruïda</string>
     <string name="check_media_delete_unused">Suprimir no utilitzats</string>
     <string name="delete_media_message">Suprimint medis&#8230;</string>
     <string name="delete_media_result_title">Resultat de la supressió</string>
diff --git a/AnkiDroid/src/main/res/values-ckb/03-dialogs.xml b/AnkiDroid/src/main/res/values-ckb/03-dialogs.xml
index a607b061a8a5..c2f07ad2a3b1 100644
--- a/AnkiDroid/src/main/res/values-ckb/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ckb/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Nexwîne</string>
-    <string name="unused_strings">\n\nUnused files:\n</string>
     <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">&#8230;Medyayê kontrol dike</string>
     <string name="check_media_acknowledge">Medyayê kontrol kir</string>
     <string name="check_media_invalid">Pelên bi kodvekirinên çewt: %d</string>
-    <string name="check_media_unused">Files in media folder but not used by any cards: %d</string>
-    <string name="check_media_nohave">Files used on cards but not in media folder: %d</string>
     <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_db_updated">Media database rebuilt</string>
     <string name="check_media_delete_unused">Yê bikarnehatî jê bibe</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-cs/03-dialogs.xml b/AnkiDroid/src/main/res/values-cs/03-dialogs.xml
index c37af94ea62f..0e86cf4a7b88 100644
--- a/AnkiDroid/src/main/res/values-cs/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-cs/03-dialogs.xml
@@ -57,7 +57,6 @@
     <string name="delete_cram_deck_message">Vymazat filtrovaný balíček %s a poslat všechny karty zpět do jejich původních balíčků?</string>
     <string name="no_tts_available_message">Není dostupný žádný jazyk převodu textu na řeč</string>
     <string name="tts_no_tts">Nemluv</string>
-    <string name="unused_strings">\n\nNepoužité soubory:\n</string>
     <string name="reposition_card_dialog_title">Změnit pořadí nové karty</string>
     <string name="reposition_card_not_new_error">Změnit pořadí lze pouze u nových karet</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -118,10 +117,7 @@
     <string name="check_media_message">Kontrolují se multimédia&#8230;</string>
     <string name="check_media_acknowledge">Multimédia zkontrolována</string>
     <string name="check_media_invalid">Soubory s neplatným kódováním: %d</string>
-    <string name="check_media_unused">Soubory ve složce s multimédii, ale nejsou používány na žádné kartě: %d</string>
-    <string name="check_media_nohave">Soubory používané na kartách, ale nejsou ve složce s multimédii: %d</string>
     <string name="check_media_no_unused_missing">Nenalezeny žádné nepoužívané nebo chybějící soubory</string>
-    <string name="check_media_db_updated">Multimediální databáze opravena</string>
     <string name="check_media_delete_unused">Odstranit nepoužité</string>
     <string name="delete_media_message">Odstraňují se multimédia&#8230;</string>
     <string name="delete_media_result_title">Výsledek odstraňování</string>
diff --git a/AnkiDroid/src/main/res/values-da/03-dialogs.xml b/AnkiDroid/src/main/res/values-da/03-dialogs.xml
index af5b334faf62..a1a83eade31c 100644
--- a/AnkiDroid/src/main/res/values-da/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-da/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Intet Tekst-Til-Tale sprog tilgængelig</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="unused_strings">\n\nUnused files:\n</string>
     <string name="reposition_card_dialog_title">Repositionér nyt kort</string>
     <string name="reposition_card_not_new_error">Udelukkende nye kort kan repositioneres</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Checking media&#8230;</string>
     <string name="check_media_acknowledge">Media checked</string>
     <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_unused">Files in media folder but not used by any cards: %d</string>
-    <string name="check_media_nohave">Files used on cards but not in media folder: %d</string>
     <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_db_updated">Media database rebuilt</string>
     <string name="check_media_delete_unused">Delete unused</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-de/03-dialogs.xml b/AnkiDroid/src/main/res/values-de/03-dialogs.xml
index 65212153ec1b..08af5811948e 100644
--- a/AnkiDroid/src/main/res/values-de/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-de/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Gefilterten Stapel „%s“ löschen und alle Karten zurück in ihre ursprünglichen Stapel senden?</string>
     <string name="no_tts_available_message">Keine Vorlesesprache verfügbar</string>
     <string name="tts_no_tts">Nicht vorlesen</string>
-    <string name="unused_strings">\n\nUnbenutzte Dateien:\n</string>
     <string name="reposition_card_dialog_title">Position der neuen Karte ändern</string>
     <string name="reposition_card_not_new_error">Die Position kann nur für neue Karten geändert werden</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Medien werden überprüft &#8230;</string>
     <string name="check_media_acknowledge">Medien überprüft</string>
     <string name="check_media_invalid">Dateien mit ungültiger Codierung: %d</string>
-    <string name="check_media_unused">Dateien im Medienordner, die von keiner Karte genutzt werden: %d</string>
-    <string name="check_media_nohave">Von Karten genutzte Dateien, die im Medienordner fehlen: %d</string>
     <string name="check_media_no_unused_missing">Keine unbenutzten oder fehlenden Dateien gefunden.</string>
-    <string name="check_media_db_updated">Mediendatenbank neu aufgebaut</string>
     <string name="check_media_delete_unused">Ungenutzte löschen</string>
     <string name="delete_media_message">Medien werden gelöscht &#8230;</string>
     <string name="delete_media_result_title">Löschergebnis</string>
diff --git a/AnkiDroid/src/main/res/values-el/03-dialogs.xml b/AnkiDroid/src/main/res/values-el/03-dialogs.xml
index 30113e36d91b..a4929bbba611 100644
--- a/AnkiDroid/src/main/res/values-el/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-el/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Διαγράψτε τη φιλτραρισμένη τράπουλα %s και στείλτε όλες τις κάρτες πίσω στις αρχικές τους τράπουλες;</string>
     <string name="no_tts_available_message">Δεν είναι διαθέσιμη η μετατροπής κειμένου σε ομιλία</string>
     <string name="tts_no_tts">Σίγαση</string>
-    <string name="unused_strings">\n\nΑχρησιμοποίητα αρχεία:\n</string>
     <string name="reposition_card_dialog_title">Επανατοποθέτηση νέας κάρτας</string>
     <string name="reposition_card_not_new_error">Μόνο νέες κάρτες μπορούν να επανατοποθετηθούν</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Έλεγχος πολυμέσων&#8230;</string>
     <string name="check_media_acknowledge">Τα πολυμέσα ελέγχθηκαν</string>
     <string name="check_media_invalid">Αρχεία με μη έγκυρη κωδικοποίηση: %d</string>
-    <string name="check_media_unused">Αρχεία στο φάκελο πολυμέσων που όμως δεν χρησιμοποιούνται από οποιαδήποτε κάρτα: %d</string>
-    <string name="check_media_nohave">Αρχεία που χρησιμοποιούνται σε κάρτες αλλά όχι στο φάκελο πολυμέσων: %d</string>
     <string name="check_media_no_unused_missing">Δεν βρέθηκαν αχρησιμοποίητα ή ελλείποντα αρχεία</string>
-    <string name="check_media_db_updated">H βάση δεδομένων πολυμέσων ανακατασκευάστηκε</string>
     <string name="check_media_delete_unused">Διαγραφή αχρησιμοποίητων</string>
     <string name="delete_media_message">Διαγραφή πολυμέσων&#8230;</string>
     <string name="delete_media_result_title">Αποτέλεσμα διαγραφής</string>
diff --git a/AnkiDroid/src/main/res/values-eo/03-dialogs.xml b/AnkiDroid/src/main/res/values-eo/03-dialogs.xml
index 974ed4590815..90b62857d31d 100644
--- a/AnkiDroid/src/main/res/values-eo/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-eo/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Ĉu forigi la filtritan kartaron %s kaj movi ĉiujn ĝiajn kartojn reen al iliaj originalaj kartaroj?</string>
     <string name="no_tts_available_message">Neniu parolsintezilo disponebla</string>
     <string name="tts_no_tts">Ne paroli</string>
-    <string name="unused_strings">\n\nNeuzataj dosieroj:\n</string>
     <string name="reposition_card_dialog_title">Repozicii novan karton</string>
     <string name="reposition_card_not_new_error">Nur novaj kartoj povas esti repoziciitaj</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Kontrolado de aŭdvidaĵoj&#8230;</string>
     <string name="check_media_acknowledge">Kontrolis aŭdvidaĵojn</string>
     <string name="check_media_invalid">Dosieroj kun erara signokodo: %d</string>
-    <string name="check_media_unused">Dosieroj ene aŭdvidaĵa dosierujo, sed ne uzataj de iu karto: %d</string>
-    <string name="check_media_nohave">Dosieroj uzataj de kartoj, sed malestaj en aŭdvidaĵa dosierujo: %d</string>
     <string name="check_media_no_unused_missing">Ne trovis iujn ajn neuzatajn aŭ mankajn dosierojn</string>
-    <string name="check_media_db_updated">Rekreis datumbazon de aŭdvidaĵoj</string>
     <string name="check_media_delete_unused">Forigi neuzatajn</string>
     <string name="delete_media_message">Forigado de aŭdvidaĵoj&#8230;</string>
     <string name="delete_media_result_title">Rezulto de forigo</string>
diff --git a/AnkiDroid/src/main/res/values-es-rAR/03-dialogs.xml b/AnkiDroid/src/main/res/values-es-rAR/03-dialogs.xml
index 9c9663ecc9e6..4c086954c67e 100644
--- a/AnkiDroid/src/main/res/values-es-rAR/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-es-rAR/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">¿Borrar el mazo filtrado %s y devolver todas las cartas a sus mazos originales?</string>
     <string name="no_tts_available_message">No hay un idioma de texto-a-voz disponible</string>
     <string name="tts_no_tts">No hable</string>
-    <string name="unused_strings">\n\nArchivos sin utilizar:\n</string>
     <string name="reposition_card_dialog_title">Reposicionar nueva tarjeta</string>
     <string name="reposition_card_not_new_error">Sólo las tarjetas nuevas pueden ser reposicionadas</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Comprobando archivos multimedia&#8230;</string>
     <string name="check_media_acknowledge">Archivos multimedia comprobados</string>
     <string name="check_media_invalid">Archivos con codificación inválida: %d</string>
-    <string name="check_media_unused">Archivos en la carpeta de multimedia pero no utilizados en ninguna tarjeta: %d</string>
-    <string name="check_media_nohave">Archivos utilizados en tarjetas pero no en la carpeta de multimedia: %d</string>
     <string name="check_media_no_unused_missing">No se halló archivos sin utilizar o perdidos</string>
-    <string name="check_media_db_updated">Base de datos de archivos multimedia reconstruida</string>
     <string name="check_media_delete_unused">Eliminar no utilizado</string>
     <string name="delete_media_message">Eliminando multimedia&#8230;</string>
     <string name="delete_media_result_title">Resultado de la eliminación</string>
diff --git a/AnkiDroid/src/main/res/values-es-rES/03-dialogs.xml b/AnkiDroid/src/main/res/values-es-rES/03-dialogs.xml
index 5bc86185aa1a..16eb28c8c39c 100644
--- a/AnkiDroid/src/main/res/values-es-rES/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-es-rES/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">¿Borrar el mazo filtrado %s y devolver todas las cartas a sus mazos originales?</string>
     <string name="no_tts_available_message">No hay idiomas de texto-a-voz disponibles</string>
     <string name="tts_no_tts">No hablar</string>
-    <string name="unused_strings">\n\nArchivos sin utilizar:\n</string>
     <string name="reposition_card_dialog_title">Reposicionar nueva tarjeta</string>
     <string name="reposition_card_not_new_error">Sólo las tarjetas nuevas pueden ser reposicionadas</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Comprobando archivos multimedia&#8230;</string>
     <string name="check_media_acknowledge">Archivos multimedia comprobados</string>
     <string name="check_media_invalid">Archivos con codificación no válida: %d</string>
-    <string name="check_media_unused">Archivos en la carpeta de archivos multimedia pero no utilizados por ninguna tarjeta: %d</string>
-    <string name="check_media_nohave">Archivos utilizados en las tarjetas pero no en la carpeta de archivos multimedia: %d</string>
     <string name="check_media_no_unused_missing">No hay archivos no utilizados o perdidos.</string>
-    <string name="check_media_db_updated">Base de datos de archivos multimedia reconstruida</string>
     <string name="check_media_delete_unused">Eliminar no utilizados</string>
     <string name="delete_media_message">Eliminando multimedia&#8230;</string>
     <string name="delete_media_result_title">Resultado de la eliminación</string>
diff --git a/AnkiDroid/src/main/res/values-et/03-dialogs.xml b/AnkiDroid/src/main/res/values-et/03-dialogs.xml
index b28e12978c2d..3e2da2251247 100644
--- a/AnkiDroid/src/main/res/values-et/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-et/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Ära räägi</string>
-    <string name="unused_strings">\n\nUnused files:\n</string>
     <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Checking media&#8230;</string>
     <string name="check_media_acknowledge">Media checked</string>
     <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_unused">Files in media folder but not used by any cards: %d</string>
-    <string name="check_media_nohave">Files used on cards but not in media folder: %d</string>
     <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_db_updated">Media database rebuilt</string>
     <string name="check_media_delete_unused">Delete unused</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-eu/03-dialogs.xml b/AnkiDroid/src/main/res/values-eu/03-dialogs.xml
index 4ea0692d45c2..f3b0cddfead6 100644
--- a/AnkiDroid/src/main/res/values-eu/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-eu/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Ez dago testua hizketa bihurketarako hizkuntzarik</string>
     <string name="tts_no_tts">Ez hitz egin</string>
-    <string name="unused_strings">\n\nUnused files:\n</string>
     <string name="reposition_card_dialog_title">Birkokatu karta berria</string>
     <string name="reposition_card_not_new_error">Bakarrik karta berriak birkokatu daitezke</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Checking media&#8230;</string>
     <string name="check_media_acknowledge">Media checked</string>
     <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_unused">Files in media folder but not used by any cards: %d</string>
-    <string name="check_media_nohave">Files used on cards but not in media folder: %d</string>
     <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_db_updated">Media database rebuilt</string>
     <string name="check_media_delete_unused">Delete unused</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-fa/03-dialogs.xml b/AnkiDroid/src/main/res/values-fa/03-dialogs.xml
index b5bd877d7848..3746a4370263 100644
--- a/AnkiDroid/src/main/res/values-fa/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-fa/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">آبا می خواهید دسته فیلتر شده %s را حذف کنید و همه کارت ها را به دسته اصلیشان بفرستید؟</string>
     <string name="no_tts_available_message">زبان متن به گفتار در دسترس نیست</string>
     <string name="tts_no_tts">حرف نزن</string>
-    <string name="unused_strings">\n\nفایل های استفاده نشده:\n</string>
     <string name="reposition_card_dialog_title">تغییر مکان کارت جدید</string>
     <string name="reposition_card_not_new_error">فقط کارت‌های جدید می‌توانند جابه‌جا شوند</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">در حال بررسی رسانه&#8230;</string>
     <string name="check_media_acknowledge">رسانه بررسی شد</string>
     <string name="check_media_invalid">فایل هایي با کدگذاری نامعتبر: %d</string>
-    <string name="check_media_unused">فایل هایي که در پوشه رسانه هستند ولی توسط هیچ کارتی استفاده نشده اند: %d</string>
-    <string name="check_media_nohave">فایل هایي که در کارت ها استفاده شده اند ولی در پوشه رسانه وجود ندارند: %d</string>
     <string name="check_media_no_unused_missing">هیچ فایل مفقود شده یا بلا استفاده یافت نشد</string>
-    <string name="check_media_db_updated">پایگاه داده رسانه بازسازی شد</string>
     <string name="check_media_delete_unused">حذف استفاده نشده ها</string>
     <string name="delete_media_message">حذف رسانه&#8230;</string>
     <string name="delete_media_result_title">نتیجه حذف</string>
diff --git a/AnkiDroid/src/main/res/values-fi/03-dialogs.xml b/AnkiDroid/src/main/res/values-fi/03-dialogs.xml
index 5d8ab414f459..0d9f7a0ce22f 100644
--- a/AnkiDroid/src/main/res/values-fi/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-fi/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Poistetaanko suodatettu pakka \'%1$s\'? Kaikki kortit lähetetään niiden alkuperäisiin pakkoihin.</string>
     <string name="no_tts_available_message">Yhtään puhesyntetisaattorin tukemaa kieltä ei ole käytettävissä</string>
     <string name="tts_no_tts">Ei puhetta</string>
-    <string name="unused_strings">\n\nKäyttämättömät tiedostot:\n</string>
     <string name="reposition_card_dialog_title">Siirrä uusi kortti</string>
     <string name="reposition_card_not_new_error">Ainoastaan uudet kortit voidaan siirtää</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Tarkistetaan mediaa&#8230;</string>
     <string name="check_media_acknowledge">Media tarkistettu</string>
     <string name="check_media_invalid">%d tiedostoa virheellisellä koodauksella</string>
-    <string name="check_media_unused">%d käyttämätöntä tiedostoa mediakansiossa</string>
-    <string name="check_media_nohave">%d tiedostoa, joita käytetään korteissa, mutta jotka eivät ole mediakansiossa</string>
     <string name="check_media_no_unused_missing">Käyttämättömiä tai puuttuvia tiedostoja ei löytynyt.</string>
-    <string name="check_media_db_updated">Mediatietokanta rakennettiin uudelleen.</string>
     <string name="check_media_delete_unused">Poista käyttämättömät</string>
     <string name="delete_media_message">Poistetaan mediaa&#8230;</string>
     <string name="delete_media_result_title">Poiston tulos</string>
diff --git a/AnkiDroid/src/main/res/values-fil/03-dialogs.xml b/AnkiDroid/src/main/res/values-fil/03-dialogs.xml
index ff6e1b109920..cb766b78747a 100644
--- a/AnkiDroid/src/main/res/values-fil/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-fil/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Walang available na wika sa text-to-speech</string>
     <string name="tts_no_tts">Huwag magsalita</string>
-    <string name="unused_strings">\n\nHindi nagamit na mga file:\n</string>
     <string name="reposition_card_dialog_title">Iposisyon muli ang card</string>
     <string name="reposition_card_not_new_error">Mga bagong card lamang ang maaaring iposisyon muli</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -113,10 +112,7 @@
     <string name="check_media_acknowledge">Ang media ay sinuri</string>
     <string name="check_media_invalid">60/5000
 Mga file na may di-wastong pag-encode:%d</string>
-    <string name="check_media_unused">Mga file sa folder ng media ngunit hindi ginamit ng anumang mga kard:%d</string>
-    <string name="check_media_nohave">Mga file na ginamit sa mga kard ngunit hindi sa folder ng media:%d</string>
     <string name="check_media_no_unused_missing">Walang nagamit o nawawalang file na nahanap</string>
-    <string name="check_media_db_updated">Itinayo muli ang database ng media</string>
     <string name="check_media_delete_unused">Tanggalin ang hindi ginagamit</string>
     <string name="delete_media_message">Binubura ang media&#8230;</string>
     <string name="delete_media_result_title">Resulta ng pagbura</string>
diff --git a/AnkiDroid/src/main/res/values-fr/03-dialogs.xml b/AnkiDroid/src/main/res/values-fr/03-dialogs.xml
index 67f2154f5926..bb2fdfd90814 100644
--- a/AnkiDroid/src/main/res/values-fr/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-fr/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Supprimer le paquet filtré %s et renvoyer toutes les cartes dans leurs paquets d’origine?</string>
     <string name="no_tts_available_message">Aucun langage de synthèse vocale disponible</string>
     <string name="tts_no_tts">Ne pas parler</string>
-    <string name="unused_strings">\n\nFichiers inutilisés :\n</string>
     <string name="reposition_card_dialog_title">Repositionner la nouvelle carte</string>
     <string name="reposition_card_not_new_error">Seules les nouvelles cartes peuvent être repositionnées</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Vérification des médias&#8230;</string>
     <string name="check_media_acknowledge">Média vérifié</string>
     <string name="check_media_invalid">Fichiers avec un codage non valide : %d</string>
-    <string name="check_media_unused">Fichiers dans le dossier de médias, mais utilisés par aucune carte : %d</string>
-    <string name="check_media_nohave">Fichiers utilisés par une carte, mais pas présents dans le dossier de médias : %d</string>
     <string name="check_media_no_unused_missing">Aucun fichier inutilisé ou manquant.</string>
-    <string name="check_media_db_updated">Base de données de médias reconstruite.</string>
     <string name="check_media_delete_unused">Supprimer les médias inutiles</string>
     <string name="delete_media_message">Suppression du média&#8230;</string>
     <string name="delete_media_result_title">Résultat de la suppression</string>
diff --git a/AnkiDroid/src/main/res/values-fy/03-dialogs.xml b/AnkiDroid/src/main/res/values-fy/03-dialogs.xml
index 5852ca3049a5..d576b454fe11 100644
--- a/AnkiDroid/src/main/res/values-fy/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-fy/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="unused_strings">\n\nUnused files:\n</string>
     <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Checking media&#8230;</string>
     <string name="check_media_acknowledge">Media checked</string>
     <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_unused">Files in media folder but not used by any cards: %d</string>
-    <string name="check_media_nohave">Files used on cards but not in media folder: %d</string>
     <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_db_updated">Media database rebuilt</string>
     <string name="check_media_delete_unused">Delete unused</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-ga/03-dialogs.xml b/AnkiDroid/src/main/res/values-ga/03-dialogs.xml
index 058ac7a0ed20..37fa33a46ef0 100644
--- a/AnkiDroid/src/main/res/values-ga/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ga/03-dialogs.xml
@@ -58,7 +58,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Níl TTS ar fáil sa teanga seo </string>
     <string name="tts_no_tts">Teanga ar bith</string>
-    <string name="unused_strings">\n\nComhaid gan úsáid:\n</string>
     <string name="reposition_card_dialog_title">Athlonnaigh cárta nua</string>
     <string name="reposition_card_not_new_error">Ní féidir ach cártaí nua a athlonnú </string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -121,10 +120,7 @@
     <string name="check_media_message">Checking media&#8230;</string>
     <string name="check_media_acknowledge">Media checked</string>
     <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_unused">Files in media folder but not used by any cards: %d</string>
-    <string name="check_media_nohave">Files used on cards but not in media folder: %d</string>
     <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_db_updated">Media database rebuilt</string>
     <string name="check_media_delete_unused">Delete unused</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-gl/03-dialogs.xml b/AnkiDroid/src/main/res/values-gl/03-dialogs.xml
index 6ea85f0bef8d..e252439ee4d6 100644
--- a/AnkiDroid/src/main/res/values-gl/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-gl/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Ningún idioma de síntese de voz dispoñible</string>
     <string name="tts_no_tts">Non fales</string>
-    <string name="unused_strings">\n\nUnused files:\n</string>
     <string name="reposition_card_dialog_title">Reposicionar novo cartón</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Verificando multimedia&#8230;</string>
     <string name="check_media_acknowledge">Multimedia verificada</string>
     <string name="check_media_invalid">Ficheiros cunha codificación inválida: %d</string>
-    <string name="check_media_unused">Ficheiros no cartafol de medios pero sen usar por calquera cartón: %d</string>
-    <string name="check_media_nohave">Ficheiros usados nos cartóns pero non existen no cartafol de medios: %d</string>
     <string name="check_media_no_unused_missing">Non se atoparon ficheiros sen usar ou perdidos</string>
-    <string name="check_media_db_updated">Reconstruída a base de datos de medios</string>
     <string name="check_media_delete_unused">Eliminar os non empregados</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-got/03-dialogs.xml b/AnkiDroid/src/main/res/values-got/03-dialogs.xml
index 2d97a595cb90..3b1bb56e51b9 100644
--- a/AnkiDroid/src/main/res/values-got/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-got/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Bokos-du-gwaurdja razda nist</string>
     <string name="tts_no_tts">Ni rodei</string>
-    <string name="unused_strings">\n\nUnused files:\n</string>
     <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Checking media&#8230;</string>
     <string name="check_media_acknowledge">Media checked</string>
     <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_unused">Files in media folder but not used by any cards: %d</string>
-    <string name="check_media_nohave">Files used on cards but not in media folder: %d</string>
     <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_db_updated">Media database rebuilt</string>
     <string name="check_media_delete_unused">Usnim unbruhta</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-gu/03-dialogs.xml b/AnkiDroid/src/main/res/values-gu/03-dialogs.xml
index 8edc3602bf1e..f84df4d9fb0a 100644
--- a/AnkiDroid/src/main/res/values-gu/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-gu/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">வடிகட்டப்பட்ட %s டெக்கை அகற்றிவிட்டு, எல்லா கார்டுகளையும் அவற்றின் அசல் டெக்குகளுக்குத் திருப்பிவிடவா?</string>
     <string name="no_tts_available_message">કોઈ ટેક્સ્ટ-ટુ-સ્પીચ ભાષા ઉપલબ્ધ નથી</string>
     <string name="tts_no_tts">બોલશો નહીં</string>
-    <string name="unused_strings">\n\nન વપરાયેલ ફાઇલો:\n</string>
     <string name="reposition_card_dialog_title">નવું કાર્ડ રિપોઝિશન કરો</string>
     <string name="reposition_card_not_new_error">ફક્ત નવા કાર્ડને જ સ્થાનાંતરિત કરી શકાય છે</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">મીડિયા તપાસી રહ્યું છે&#8230;</string>
     <string name="check_media_acknowledge">મીડિયા તપાસ્યું</string>
     <string name="check_media_invalid">અમાન્ય એન્કોડિંગ સાથેની ફાઇલો: %d</string>
-    <string name="check_media_unused">મીડિયા ફોલ્ડરમાં ફાઇલો પરંતુ કોઈપણ કાર્ડ દ્વારા ઉપયોગમાં લેવાતી નથી: %d</string>
-    <string name="check_media_nohave">કાર્ડ્સ પર વપરાયેલી ફાઇલો મીડિયા ફોલ્ડરમાં નથી: %d</string>
     <string name="check_media_no_unused_missing">કોઈ બિનઉપયોગી અથવા ગુમ થયેલ ફાઇલો મળી નથી</string>
-    <string name="check_media_db_updated">મીડિયા ડેટાબેઝ પુનઃબીલ્ડ</string>
     <string name="check_media_delete_unused">ન વપરાયેલ કાઢી નાખો</string>
     <string name="delete_media_message">મીડિયા ડિલીટ કરી રહ્યાં છીએ&#8230;</string>
     <string name="delete_media_result_title">કાઢી નાખવાનું પરિણામ</string>
diff --git a/AnkiDroid/src/main/res/values-heb/03-dialogs.xml b/AnkiDroid/src/main/res/values-heb/03-dialogs.xml
index 85c3c1f44e95..59c46c2b59f1 100644
--- a/AnkiDroid/src/main/res/values-heb/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-heb/03-dialogs.xml
@@ -57,7 +57,6 @@
     <string name="delete_cram_deck_message">למחוק את החפיסה %s המסוננת ולשלוח את כל הקלפים בחזרה לחפיסות המקוריות שלהם?</string>
     <string name="no_tts_available_message">אין שום שפת לכתוב-אל-דיבור זמין</string>
     <string name="tts_no_tts">אל תדבר.‏</string>
-    <string name="unused_strings">\n\nקבצים שאינם בשימוש:\n</string>
     <string name="reposition_card_dialog_title">שינוי מיקום כרטיס חדש</string>
     <string name="reposition_card_not_new_error">ניתן לשנות מיקום לכרטיסים חדשים בלבד</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -119,10 +118,7 @@
     <string name="check_media_message">קבצי המדיה בבדיקה&#8230;</string>
     <string name="check_media_acknowledge">קבצי המדיה נבדקו</string>
     <string name="check_media_invalid">קבצים בקידוד תקול: %d</string>
-    <string name="check_media_unused">קבצים שנמצאים בספריית המדיה אבל אינם בשימוש על ידי אף קלף: %d</string>
-    <string name="check_media_nohave">קבצים בשימוש קלפים שאינם בתיקיית המדיה: %d</string>
     <string name="check_media_no_unused_missing">לא נמצאו קבצים חסרים או שאינם בשימוש</string>
-    <string name="check_media_db_updated">מסד נתוני המדיה נבנה מחדש</string>
     <string name="check_media_delete_unused">מחיקת כאלו שאינם בשימוש</string>
     <string name="delete_media_message">המדיה נמחקת&#8230;</string>
     <string name="delete_media_result_title">תוצאת מחיקה</string>
diff --git a/AnkiDroid/src/main/res/values-hi/03-dialogs.xml b/AnkiDroid/src/main/res/values-hi/03-dialogs.xml
index d3cf0d918833..cf8de2b986eb 100644
--- a/AnkiDroid/src/main/res/values-hi/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-hi/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">फ़िल्टर किए गए डेक %s को हटाएं और सभी कार्डों को उनके मूल डेक पर वापस भेजें?</string>
     <string name="no_tts_available_message">कोई लेख-से-बोली भाषा उपलब्ध नहीं</string>
     <string name="tts_no_tts">बात न करें</string>
-    <string name="unused_strings">\n\nअप्रयुक्त फाइलें:\n</string>
     <string name="reposition_card_dialog_title">नया कार्ड पुन: प्रस्तुत करें</string>
     <string name="reposition_card_not_new_error">केवल नए कार्डों को बदला जा सकता है</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">मीडिया जांच कर रहा है.. ।</string>
     <string name="check_media_acknowledge">मीडिया जांचा गया</string>
     <string name="check_media_invalid">अमांय एंकोडिंग वाली फ़ाइलें: %d</string>
-    <string name="check_media_unused">मीडिया फ़ोल्डर में फ़ाइलें लेकिन किसी भी कार्ड द्वारा उपयोग नहीं: %d</string>
-    <string name="check_media_nohave">कार्ड पर उपयोग की गई फ़ाइलें मीडिया फ़ोल्डर में नहीं: %d</string>
     <string name="check_media_no_unused_missing">कोई अनुपयोगी या गुम फ़ाइलें नहीं मिलीं</string>
-    <string name="check_media_db_updated">मीडिया डेटाबेस पुन</string>
     <string name="check_media_delete_unused">अप्रयुक्त हटाएं</string>
     <string name="delete_media_message">मीडिया हटा रहा है&#8230;</string>
     <string name="delete_media_result_title">विलोपन का परिणाम</string>
diff --git a/AnkiDroid/src/main/res/values-hr/03-dialogs.xml b/AnkiDroid/src/main/res/values-hr/03-dialogs.xml
index f6ba86ffc842..481b0dfa7290 100644
--- a/AnkiDroid/src/main/res/values-hr/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-hr/03-dialogs.xml
@@ -56,7 +56,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="unused_strings">\n\nUnused files:\n</string>
     <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -115,10 +114,7 @@
     <string name="check_media_message">Checking media&#8230;</string>
     <string name="check_media_acknowledge">Media checked</string>
     <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_unused">Files in media folder but not used by any cards: %d</string>
-    <string name="check_media_nohave">Files used on cards but not in media folder: %d</string>
     <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_db_updated">Media database rebuilt</string>
     <string name="check_media_delete_unused">Delete unused</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-hu/03-dialogs.xml b/AnkiDroid/src/main/res/values-hu/03-dialogs.xml
index 52bdd125a683..fa89a3403c41 100644
--- a/AnkiDroid/src/main/res/values-hu/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-hu/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Nincs rendelkezésre álló szövegfelolvasási nyelv</string>
     <string name="tts_no_tts">Ne beszélj</string>
-    <string name="unused_strings">\n\bNem használt fájlok:\n</string>
     <string name="reposition_card_dialog_title">Helyezze át az új kártyát</string>
     <string name="reposition_card_not_new_error">Csak az új kártyákat lehet áthelyezni</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Média ellenőrzése&#8230;</string>
     <string name="check_media_acknowledge">Média ellenőrizve</string>
     <string name="check_media_invalid">Érvénytelen kódolású fájlok: %d</string>
-    <string name="check_media_unused">Fájlok a média mappában, használaton kívül: %d</string>
-    <string name="check_media_nohave">Fájlok kártyákon, de mappából hiányozva: %d</string>
     <string name="check_media_no_unused_missing">Nincs haszálaton kívüli, vagy hiányzó fájl.</string>
-    <string name="check_media_db_updated">Média adatbázis újraépült.</string>
     <string name="check_media_delete_unused">Használaton kívüliek törlése</string>
     <string name="delete_media_message">Média törlése&#8230;</string>
     <string name="delete_media_result_title">Törlés eredménye</string>
diff --git a/AnkiDroid/src/main/res/values-hy/03-dialogs.xml b/AnkiDroid/src/main/res/values-hy/03-dialogs.xml
index 1f6fd67485e7..c51d7ab58414 100644
--- a/AnkiDroid/src/main/res/values-hy/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-hy/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Չխոսել</string>
-    <string name="unused_strings">\n\nՉօգտագործվող ֆայլեր`\n</string>
     <string name="reposition_card_dialog_title">Տեղափոխել նոր քարտը</string>
     <string name="reposition_card_not_new_error">Կարելի է տեղափոխել միայն նոր քարտերը</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Checking media&#8230;</string>
     <string name="check_media_acknowledge">Media checked</string>
     <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_unused">Files in media folder but not used by any cards: %d</string>
-    <string name="check_media_nohave">Files used on cards but not in media folder: %d</string>
     <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_db_updated">Media database rebuilt</string>
     <string name="check_media_delete_unused">Delete unused</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-ind/03-dialogs.xml b/AnkiDroid/src/main/res/values-ind/03-dialogs.xml
index 1aa843ac4173..66ffc9499f2d 100644
--- a/AnkiDroid/src/main/res/values-ind/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ind/03-dialogs.xml
@@ -54,7 +54,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Tidak ada bahasa teks-ke-ucapan tersedia</string>
     <string name="tts_no_tts">Jangan bicara</string>
-    <string name="unused_strings">\n\nBerkas yang tidak digunakan:\n</string>
     <string name="reposition_card_dialog_title">Pindah posisi kartu baru</string>
     <string name="reposition_card_not_new_error">Hanya kartu baru yang dapat pindah posisi</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -109,10 +108,7 @@
     <string name="check_media_message">Memeriksa media&#8230;</string>
     <string name="check_media_acknowledge">Media diperiksa</string>
     <string name="check_media_invalid">Berkas dengan pengodean tidak valid: %d</string>
-    <string name="check_media_unused">Berkas di folder media tapi tidak digunakan di kartu manapun: %d</string>
-    <string name="check_media_nohave">Berkas digunakan kartu tapi tidak ada di folder media: %d</string>
     <string name="check_media_no_unused_missing">Tidak ada berkas tidak terpakai atau hilang ditemukan</string>
-    <string name="check_media_db_updated">Basisdata media dibangun ulang</string>
     <string name="check_media_delete_unused">Hapus yang tidak terpakai</string>
     <string name="delete_media_message">Menghapus media&#8230;</string>
     <string name="delete_media_result_title">Hasil penghapusan</string>
diff --git a/AnkiDroid/src/main/res/values-is/03-dialogs.xml b/AnkiDroid/src/main/res/values-is/03-dialogs.xml
index 83030dbf6531..2ffe2bf2751a 100644
--- a/AnkiDroid/src/main/res/values-is/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-is/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="unused_strings">\n\nUnused files:\n</string>
     <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Checking media&#8230;</string>
     <string name="check_media_acknowledge">Media checked</string>
     <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_unused">Files in media folder but not used by any cards: %d</string>
-    <string name="check_media_nohave">Files used on cards but not in media folder: %d</string>
     <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_db_updated">Media database rebuilt</string>
     <string name="check_media_delete_unused">Delete unused</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-it/03-dialogs.xml b/AnkiDroid/src/main/res/values-it/03-dialogs.xml
index c7f26154d25c..b526732e0a44 100644
--- a/AnkiDroid/src/main/res/values-it/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-it/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Nessuna lingua per la sintesi vocale disponibile</string>
     <string name="tts_no_tts">Non parlare</string>
-    <string name="unused_strings">\n\nFile inutilizzati:\n</string>
     <string name="reposition_card_dialog_title">Riposiziona nuova carta</string>
     <string name="reposition_card_not_new_error">Solo le nuove carte possono essere riposizionate</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Controllo i media&#8230;</string>
     <string name="check_media_acknowledge">Media controllati</string>
     <string name="check_media_invalid">File con codifica non valida: %d</string>
-    <string name="check_media_unused">File nella cartella media ma non utilizzati da nessuna carta: %d</string>
-    <string name="check_media_nohave">File utilizzati sulle carte, ma non nella cartella media: %d</string>
     <string name="check_media_no_unused_missing">Nessun file inutilizzato o mancante trovato.</string>
-    <string name="check_media_db_updated">Database media ricostruito.</string>
     <string name="check_media_delete_unused">Elimina inutilizzati</string>
     <string name="delete_media_message">Eliminando media&#8230;</string>
     <string name="delete_media_result_title">Eliminazione risultato</string>
diff --git a/AnkiDroid/src/main/res/values-iw/03-dialogs.xml b/AnkiDroid/src/main/res/values-iw/03-dialogs.xml
index 85c3c1f44e95..59c46c2b59f1 100644
--- a/AnkiDroid/src/main/res/values-iw/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-iw/03-dialogs.xml
@@ -57,7 +57,6 @@
     <string name="delete_cram_deck_message">למחוק את החפיסה %s המסוננת ולשלוח את כל הקלפים בחזרה לחפיסות המקוריות שלהם?</string>
     <string name="no_tts_available_message">אין שום שפת לכתוב-אל-דיבור זמין</string>
     <string name="tts_no_tts">אל תדבר.‏</string>
-    <string name="unused_strings">\n\nקבצים שאינם בשימוש:\n</string>
     <string name="reposition_card_dialog_title">שינוי מיקום כרטיס חדש</string>
     <string name="reposition_card_not_new_error">ניתן לשנות מיקום לכרטיסים חדשים בלבד</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -119,10 +118,7 @@
     <string name="check_media_message">קבצי המדיה בבדיקה&#8230;</string>
     <string name="check_media_acknowledge">קבצי המדיה נבדקו</string>
     <string name="check_media_invalid">קבצים בקידוד תקול: %d</string>
-    <string name="check_media_unused">קבצים שנמצאים בספריית המדיה אבל אינם בשימוש על ידי אף קלף: %d</string>
-    <string name="check_media_nohave">קבצים בשימוש קלפים שאינם בתיקיית המדיה: %d</string>
     <string name="check_media_no_unused_missing">לא נמצאו קבצים חסרים או שאינם בשימוש</string>
-    <string name="check_media_db_updated">מסד נתוני המדיה נבנה מחדש</string>
     <string name="check_media_delete_unused">מחיקת כאלו שאינם בשימוש</string>
     <string name="delete_media_message">המדיה נמחקת&#8230;</string>
     <string name="delete_media_result_title">תוצאת מחיקה</string>
diff --git a/AnkiDroid/src/main/res/values-ja/03-dialogs.xml b/AnkiDroid/src/main/res/values-ja/03-dialogs.xml
index c94947a9b15c..a8e6a908aa21 100644
--- a/AnkiDroid/src/main/res/values-ja/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ja/03-dialogs.xml
@@ -54,7 +54,6 @@
     <string name="delete_cram_deck_message">フィルターデッキ「%s」を削除し、すべてのカードを元のデッキに戻しますか？</string>
     <string name="no_tts_available_message">テキスト読み上げ可能な言語がありません</string>
     <string name="tts_no_tts">発声なし</string>
-    <string name="unused_strings">\n\n(*) のファイルのリスト:\n</string>
     <string name="reposition_card_dialog_title">位置（新規カード番号）を変更</string>
     <string name="reposition_card_not_new_error">位置（新規カード番号）の変更は、新規カード以外には行えません。</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -109,10 +108,7 @@
     <string name="check_media_message">メディアをチェックしています&#8230;</string>
     <string name="check_media_acknowledge">メディアのチェックの完了</string>
     <string name="check_media_invalid">エンコーディングが無効なファイル数: %d</string>
-    <string name="check_media_unused">(*) メディア用フォルダ内に存在するが、どのカードにも使用されていないファイル: %d個</string>
-    <string name="check_media_nohave">カードに表示するよう記載されているが、メディア用フォルダ内に存在しないファイル: %d個</string>
     <string name="check_media_no_unused_missing">使用されていないファイル、不足しているファイルはありません</string>
-    <string name="check_media_db_updated">メディアのデータベースを再構築しました</string>
     <string name="check_media_delete_unused">(*) のファイルを削除</string>
     <string name="delete_media_message">メディアを削除中&#8230;</string>
     <string name="delete_media_result_title">削除結果</string>
diff --git a/AnkiDroid/src/main/res/values-jv/03-dialogs.xml b/AnkiDroid/src/main/res/values-jv/03-dialogs.xml
index 4161bf4b46ec..ecb2c3a28ce2 100644
--- a/AnkiDroid/src/main/res/values-jv/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-jv/03-dialogs.xml
@@ -54,7 +54,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="unused_strings">\n\nUnused files:\n</string>
     <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -109,10 +108,7 @@
     <string name="check_media_message">Checking media&#8230;</string>
     <string name="check_media_acknowledge">Media checked</string>
     <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_unused">Files in media folder but not used by any cards: %d</string>
-    <string name="check_media_nohave">Files used on cards but not in media folder: %d</string>
     <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_db_updated">Media database rebuilt</string>
     <string name="check_media_delete_unused">Delete unused</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-ka/03-dialogs.xml b/AnkiDroid/src/main/res/values-ka/03-dialogs.xml
index 8c5ad4b13ae5..ecfc158f3f50 100644
--- a/AnkiDroid/src/main/res/values-ka/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ka/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">მიუწვდომელია ხმოვანი წამკითხველის ენა</string>
     <string name="tts_no_tts">არ წაიკითხოს</string>
-    <string name="unused_strings">\n\nგამოუყენებელი ფაილები:\n</string>
     <string name="reposition_card_dialog_title">ახალი ბარათის გადაადგილება</string>
     <string name="reposition_card_not_new_error">პოზიციის შეცვლა მხოლოდ ახალი ბარათებისთვის შეიძლება</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">მედიაფაილების შემოწმება&#8230;</string>
     <string name="check_media_acknowledge">მედიაფაილები შემოწმდა</string>
     <string name="check_media_invalid">ფაილები არასწორი კოდირებით: %d</string>
-    <string name="check_media_unused">Files in media folder but not used by any cards: %d</string>
-    <string name="check_media_nohave">Files used on cards but not in media folder: %d</string>
     <string name="check_media_no_unused_missing">ვერ მოიძებნა უხმარი ან დაკარგული ფაილები</string>
-    <string name="check_media_db_updated">მედიაფაილების მონაცემთა ბაზა თავიდან აიგო</string>
     <string name="check_media_delete_unused">წაშალე გამოუყენებელი</string>
     <string name="delete_media_message">მიმდინარეობს მედიაფაილების წაშლა&#8230;</string>
     <string name="delete_media_result_title">წაშლის შედეგი</string>
diff --git a/AnkiDroid/src/main/res/values-kk/03-dialogs.xml b/AnkiDroid/src/main/res/values-kk/03-dialogs.xml
index 314a0ac4587f..61b99a871615 100644
--- a/AnkiDroid/src/main/res/values-kk/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-kk/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="unused_strings">\n\nUnused files:\n</string>
     <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Checking media&#8230;</string>
     <string name="check_media_acknowledge">Media checked</string>
     <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_unused">Files in media folder but not used by any cards: %d</string>
-    <string name="check_media_nohave">Files used on cards but not in media folder: %d</string>
     <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_db_updated">Media database rebuilt</string>
     <string name="check_media_delete_unused">Delete unused</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-km/03-dialogs.xml b/AnkiDroid/src/main/res/values-km/03-dialogs.xml
index 8d8bbf691e8e..9d0934257fe9 100644
--- a/AnkiDroid/src/main/res/values-km/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-km/03-dialogs.xml
@@ -54,7 +54,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="unused_strings">\n\nUnused files:\n</string>
     <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -109,10 +108,7 @@
     <string name="check_media_message">Checking media&#8230;</string>
     <string name="check_media_acknowledge">Media checked</string>
     <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_unused">Files in media folder but not used by any cards: %d</string>
-    <string name="check_media_nohave">Files used on cards but not in media folder: %d</string>
     <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_db_updated">Media database rebuilt</string>
     <string name="check_media_delete_unused">Delete unused</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-kn/03-dialogs.xml b/AnkiDroid/src/main/res/values-kn/03-dialogs.xml
index 25dfc5ca2650..ff284f4f285d 100644
--- a/AnkiDroid/src/main/res/values-kn/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-kn/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">ಫಿಲ್ಟರ್ ಮಾಡಿದ ಡೆಕ್ %s ಅನ್ನು ಅಳಿಸಿ ಮತ್ತು ಎಲ್ಲಾ ಕಾರ್ಡ್‌ಗಳನ್ನು ಅವುಗಳ ಮೂಲ ಡೆಕ್‌ಗಳಿಗೆ ಹಿಂತಿರುಗಿಸುವುದೇ?</string>
     <string name="no_tts_available_message">ಯಾವುದೇ ಪಠ್ಯದಿಂದ ಭಾಷಣಕ್ಕೆ ಭಾಷೆ ಲಭ್ಯವಿಲ್ಲ</string>
     <string name="tts_no_tts">ಮಾತನಾಡಬೇಡ</string>
-    <string name="unused_strings">\n\nಬಳಕೆಯಾಗದ ಫೈಲ್‌ಗಳು:\n</string>
     <string name="reposition_card_dialog_title">ಹೊಸ ಕಾರ್ಡ್ ಅನ್ನು ಮರುಸೇರಿಸಿ</string>
     <string name="reposition_card_not_new_error">ಹೊಸ ಕಾರ್ಡ್‌ಗಳನ್ನು ಮಾತ್ರ ಮರುಸ್ಥಾಪಿಸಬಹುದು</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">ಮಾಧ್ಯಮವನ್ನು ಪರಿಶೀಲಿಸಲಾಗುತ್ತಿದೆ&#8230;</string>
     <string name="check_media_acknowledge">ಮಾಧ್ಯಮದವರನ್ನು ಪರಿಶೀಲಿಸಿದರು</string>
     <string name="check_media_invalid">ಅಮಾನ್ಯ ಎನ್‌ಕೋಡಿಂಗ್ ಹೊಂದಿರುವ ಫೈಲ್‌ಗಳು: %d</string>
-    <string name="check_media_unused">ಮೀಡಿಯಾ ಫೋಲ್ಡರ್‌ನಲ್ಲಿರುವ ಫೈಲ್‌ಗಳು ಆದರೆ ಯಾವುದೇ ಕಾರ್ಡ್‌ಗಳಿಂದ ಬಳಸಲಾಗುವುದಿಲ್ಲ: %d</string>
-    <string name="check_media_nohave">ಕಾರ್ಡ್‌ಗಳಲ್ಲಿ ಬಳಸಲಾದ ಫೈಲ್‌ಗಳು ಆದರೆ ಮಾಧ್ಯಮ ಫೋಲ್ಡರ್‌ನಲ್ಲಿಲ್ಲ: %d</string>
     <string name="check_media_no_unused_missing">ಬಳಕೆಯಾಗದ ಅಥವಾ ಕಾಣೆಯಾದ ಫೈಲ್‌ಗಳು ಕಂಡುಬಂದಿಲ್ಲ</string>
-    <string name="check_media_db_updated">ಮಾಧ್ಯಮ ಡೇಟಾಬೇಸ್ ಅನ್ನು ಮರುನಿರ್ಮಿಸಲಾಯಿತು</string>
     <string name="check_media_delete_unused">ಬಳಕೆಯಾಗದ ಅಳಿಸಿ</string>
     <string name="delete_media_message">ಮಾಧ್ಯಮವನ್ನು ಅಳಿಸಲಾಗುತ್ತಿದೆ&#8230;</string>
     <string name="delete_media_result_title">ಅಳಿಸುವಿಕೆ ಫಲಿತಾಂಶ</string>
diff --git a/AnkiDroid/src/main/res/values-ko/03-dialogs.xml b/AnkiDroid/src/main/res/values-ko/03-dialogs.xml
index bd49f3de78c4..d8015ae018d9 100644
--- a/AnkiDroid/src/main/res/values-ko/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ko/03-dialogs.xml
@@ -54,7 +54,6 @@
     <string name="delete_cram_deck_message">필터링된 덱 %s을(를) 삭제하고 모든 카드를 원래 덱으로 돌려보낼까요?</string>
     <string name="no_tts_available_message">문장 읽어주기 기능(TTS)을 사용할 수 없음</string>
     <string name="tts_no_tts">무음</string>
-    <string name="unused_strings">\n\n사용되지 않은 파일:\n</string>
     <string name="reposition_card_dialog_title">새 카드 위치 변경</string>
     <string name="reposition_card_not_new_error">새 카드만 순서를 조정할 수 있습니다.</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -109,10 +108,7 @@
     <string name="check_media_message">미디어 점검 중&#8230;</string>
     <string name="check_media_acknowledge">미디어 점검됨</string>
     <string name="check_media_invalid">올바르지 않은 인코딩을 포함한 파일: %d</string>
-    <string name="check_media_unused">미디어 폴더에 있지만 어떠한 카드에도 사용되지 않은 파일: %d</string>
-    <string name="check_media_nohave">카드에 사용되었지만 미디어 폴더에는 없는 파일: %d</string>
     <string name="check_media_no_unused_missing">사용되지 않거나 누락된 파일이 발견되지 않았습니다.</string>
-    <string name="check_media_db_updated">미디어 데이터베이스를 다시 기록했습니다.</string>
     <string name="check_media_delete_unused">사용되지 않은 파일 삭제</string>
     <string name="delete_media_message">미디어 삭제 중&#8230;</string>
     <string name="delete_media_result_title">삭제 결과</string>
diff --git a/AnkiDroid/src/main/res/values-ku/03-dialogs.xml b/AnkiDroid/src/main/res/values-ku/03-dialogs.xml
index a607b061a8a5..c2f07ad2a3b1 100644
--- a/AnkiDroid/src/main/res/values-ku/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ku/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Nexwîne</string>
-    <string name="unused_strings">\n\nUnused files:\n</string>
     <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">&#8230;Medyayê kontrol dike</string>
     <string name="check_media_acknowledge">Medyayê kontrol kir</string>
     <string name="check_media_invalid">Pelên bi kodvekirinên çewt: %d</string>
-    <string name="check_media_unused">Files in media folder but not used by any cards: %d</string>
-    <string name="check_media_nohave">Files used on cards but not in media folder: %d</string>
     <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_db_updated">Media database rebuilt</string>
     <string name="check_media_delete_unused">Yê bikarnehatî jê bibe</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-ky/03-dialogs.xml b/AnkiDroid/src/main/res/values-ky/03-dialogs.xml
index a8566f1fa26f..1c406a25e9ca 100644
--- a/AnkiDroid/src/main/res/values-ky/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ky/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="unused_strings">\n\nUnused files:\n</string>
     <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Checking media&#8230;</string>
     <string name="check_media_acknowledge">Media checked</string>
     <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_unused">Files in media folder but not used by any cards: %d</string>
-    <string name="check_media_nohave">Files used on cards but not in media folder: %d</string>
     <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_db_updated">Media database rebuilt</string>
     <string name="check_media_delete_unused">Delete unused</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-lt/03-dialogs.xml b/AnkiDroid/src/main/res/values-lt/03-dialogs.xml
index 49909e94edaa..be929d17e5a4 100644
--- a/AnkiDroid/src/main/res/values-lt/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-lt/03-dialogs.xml
@@ -57,7 +57,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Teksto perskaityti nurodyta kalba negalime</string>
     <string name="tts_no_tts">Nekalbėkite</string>
-    <string name="unused_strings">\n\nNenaudojami failai:\n</string>
     <string name="reposition_card_dialog_title">Pakeiskite naujos kortelės padėtį</string>
     <string name="reposition_card_not_new_error">Gali būti keičiamas tik naujų kortelių išdėstymas</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -118,10 +117,7 @@
     <string name="check_media_message">Tikrinamos laikmenos&#8230;</string>
     <string name="check_media_acknowledge">Laikmenos patikrintos</string>
     <string name="check_media_invalid">Failai su neveikiančia koduote: %d</string>
-    <string name="check_media_unused">Laikmenų aplanke esantys failai, kurie nėra naudojami kortelėse: %d</string>
-    <string name="check_media_nohave">Failai, kurie yra naudojami kortelėse, bet kurių nėra laikmenų aplanke: %d</string>
     <string name="check_media_no_unused_missing">Nerasta nenaudojamų ar trūkstamų failų.</string>
-    <string name="check_media_db_updated">Laikmenų duomenų bazė atkurta</string>
     <string name="check_media_delete_unused">Ištrinti nenaudojamus</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-lv/03-dialogs.xml b/AnkiDroid/src/main/res/values-lv/03-dialogs.xml
index 3b7e179f851d..835db5f93028 100644
--- a/AnkiDroid/src/main/res/values-lv/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-lv/03-dialogs.xml
@@ -56,7 +56,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="unused_strings">\n\nUnused files:\n</string>
     <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -115,10 +114,7 @@
     <string name="check_media_message">Checking media&#8230;</string>
     <string name="check_media_acknowledge">Media checked</string>
     <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_unused">Files in media folder but not used by any cards: %d</string>
-    <string name="check_media_nohave">Files used on cards but not in media folder: %d</string>
     <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_db_updated">Media database rebuilt</string>
     <string name="check_media_delete_unused">Delete unused</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-mk/03-dialogs.xml b/AnkiDroid/src/main/res/values-mk/03-dialogs.xml
index fe11400f58d9..5cbeedc2510b 100644
--- a/AnkiDroid/src/main/res/values-mk/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-mk/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Нема достапен јазик за текст-во-говор</string>
     <string name="tts_no_tts">Не зборувај</string>
-    <string name="unused_strings">\n\nUnused files:\n</string>
     <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Проверка на медиумит&#8230;</string>
     <string name="check_media_acknowledge">Медиумите се проверени</string>
     <string name="check_media_invalid">Датотеки со невалидно шифрирање: %d</string>
-    <string name="check_media_unused">Датотеки во медиумски фолдер, но не се користат од било која картичка: %d</string>
-    <string name="check_media_nohave">Датотеки кои се користат на картички, но не во медиумски фолдер: %d</string>
     <string name="check_media_no_unused_missing">Не се пронајдени неискористени или исчезнати датотеки</string>
-    <string name="check_media_db_updated">Медиумската база на податоци е повторно изградена</string>
     <string name="check_media_delete_unused">Избришете го неискористеното</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-ml/03-dialogs.xml b/AnkiDroid/src/main/res/values-ml/03-dialogs.xml
index be36dfb6feb8..7de736acbbc2 100644
--- a/AnkiDroid/src/main/res/values-ml/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ml/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">ടെക്സ്റ്റ്-ടു-സ്പീച്ച് ഭാഷ ലഭ്യമല്ല</string>
     <string name="tts_no_tts">സംസാരിക്കരുത്</string>
-    <string name="unused_strings">\n\nഉപയോഗിക്കാത്ത ഫയലുകൾ:\n</string>
     <string name="reposition_card_dialog_title">പുതിയ കാർഡ് പുന  സ്ഥാപിക്കുക</string>
     <string name="reposition_card_not_new_error">പുതിയ കാർഡുകൾ മാത്രമേ പുന  സ്ഥാപിക്കാൻ കഴിയൂ</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">മീഡിയ പരിശോധിക്കുന്നു&#8230;</string>
     <string name="check_media_acknowledge">മീഡിയ പരിശോധിച്ചു</string>
     <string name="check_media_invalid">അസാധുവായ എൻ‌കോഡിംഗ് ഉള്ള ഫയലുകൾ‌:%d</string>
-    <string name="check_media_unused">മീഡിയ ഫോൾഡറിലെ ഫയലുകൾ എന്നാൽ ഏതെങ്കിലും കാർഡുകൾ ഉപയോഗിക്കുന്നില്ല:%d</string>
-    <string name="check_media_nohave">കാർഡുകളിൽ ഉപയോഗിക്കുന്ന ഫയലുകൾ പക്ഷേ മീഡിയ ഫോൾഡറിൽ ഇല്ല:%d</string>
     <string name="check_media_no_unused_missing">ഉപയോഗിക്കാത്തതോ നഷ്‌ടമായതോ ആയ ഫയലുകളൊന്നും കണ്ടെത്തിയില്ല</string>
-    <string name="check_media_db_updated">മീഡിയ ഡാറ്റാബേസ് പുനർനിർമ്മിച്ചു</string>
     <string name="check_media_delete_unused">ഉപയോഗിക്കാത്തവ ഇല്ലാതാക്കുക</string>
     <string name="delete_media_message">മീഡിയ ഇല്ലാതാക്കുന്നു&#8230;</string>
     <string name="delete_media_result_title">ഇല്ലാതാക്കൽ ഫലം</string>
diff --git a/AnkiDroid/src/main/res/values-mn/03-dialogs.xml b/AnkiDroid/src/main/res/values-mn/03-dialogs.xml
index 4f39a0bafe0a..d156c86298d1 100644
--- a/AnkiDroid/src/main/res/values-mn/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-mn/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="unused_strings">\n\nUnused files:\n</string>
     <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Checking media&#8230;</string>
     <string name="check_media_acknowledge">Media checked</string>
     <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_unused">Files in media folder but not used by any cards: %d</string>
-    <string name="check_media_nohave">Files used on cards but not in media folder: %d</string>
     <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_db_updated">Media database rebuilt</string>
     <string name="check_media_delete_unused">Delete unused</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-mr/03-dialogs.xml b/AnkiDroid/src/main/res/values-mr/03-dialogs.xml
index acc18c9d0344..ed006a808336 100644
--- a/AnkiDroid/src/main/res/values-mr/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-mr/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">मजकूर-ते-भाषणाची भाषा उपलब्ध नाही</string>
     <string name="tts_no_tts">बोलू नका</string>
-    <string name="unused_strings">\n\nन वापरलेल्या फाइल्स:\n</string>
     <string name="reposition_card_dialog_title">नवीन कार्ड पुनर्स्थित करा</string>
     <string name="reposition_card_not_new_error">केवळ नवीन कार्डे पुनर्स्थित केली जाऊ शकतात</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">मीडिया तपासत आहे&#8230;</string>
     <string name="check_media_acknowledge">माध्यम तपासले</string>
     <string name="check_media_invalid">अवैध एन्कोडिंगसह फायली:%d</string>
-    <string name="check_media_unused">मीडिया फोल्डरमधील फायली परंतु कोणत्याही कार्डांद्वारे वापरल्या जात नाहीत:%d</string>
-    <string name="check_media_nohave">फायली कार्डावर वापरल्या परंतु मीडिया फोल्डरमध्ये नाहीत:%d</string>
     <string name="check_media_no_unused_missing">कोणत्याही न वापरलेल्या किंवा गहाळ फायली आढळल्या नाहीत</string>
-    <string name="check_media_db_updated">मीडिया डेटाबेस पुन्हा तयार केला</string>
     <string name="check_media_delete_unused">न वापरलेले हटवा</string>
     <string name="delete_media_message">मीडिया हटवित आहे&#8230;</string>
     <string name="delete_media_result_title">हटविण्याचा निकाल</string>
diff --git a/AnkiDroid/src/main/res/values-ms/03-dialogs.xml b/AnkiDroid/src/main/res/values-ms/03-dialogs.xml
index ab03fa1dbf17..51d19de12d4e 100644
--- a/AnkiDroid/src/main/res/values-ms/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ms/03-dialogs.xml
@@ -54,7 +54,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Teks-ke-ucapan bahasa tiada</string>
     <string name="tts_no_tts">Jangan bercakap</string>
-    <string name="unused_strings">\n\nFail tidak digunakan:\n</string>
     <string name="reposition_card_dialog_title">Alih posisi kad baru</string>
     <string name="reposition_card_not_new_error">Hanya kad baru boleh alih posisi</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -109,10 +108,7 @@
     <string name="check_media_message">Memeriksa media&#8230;</string>
     <string name="check_media_acknowledge">Media telah diperiksa</string>
     <string name="check_media_invalid">Fail dengan pengekodan tidak sah: %d</string>
-    <string name="check_media_unused">Fail dalam folder media namun tidak digunakan oleh mana-mana kad: %d</string>
-    <string name="check_media_nohave">Fail digunakan pada kad namun bukan dalam folder media: %d</string>
     <string name="check_media_no_unused_missing">Tiada fail tidak digunakan or hilang ditemui</string>
-    <string name="check_media_db_updated">Pangkalan data media telah dibina semula</string>
     <string name="check_media_delete_unused">Padam yang tidak digunakan</string>
     <string name="delete_media_message">Memadam media&#8230;</string>
     <string name="delete_media_result_title">Keputusan pemadaman</string>
diff --git a/AnkiDroid/src/main/res/values-my/03-dialogs.xml b/AnkiDroid/src/main/res/values-my/03-dialogs.xml
index 27ec775ba812..22cc38cc490e 100644
--- a/AnkiDroid/src/main/res/values-my/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-my/03-dialogs.xml
@@ -54,7 +54,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="unused_strings">\n\nUnused files:\n</string>
     <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -109,10 +108,7 @@
     <string name="check_media_message">Checking media&#8230;</string>
     <string name="check_media_acknowledge">Media checked</string>
     <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_unused">Files in media folder but not used by any cards: %d</string>
-    <string name="check_media_nohave">Files used on cards but not in media folder: %d</string>
     <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_db_updated">Media database rebuilt</string>
     <string name="check_media_delete_unused">Delete unused</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-nl/03-dialogs.xml b/AnkiDroid/src/main/res/values-nl/03-dialogs.xml
index 137403c783fd..4c868775d098 100644
--- a/AnkiDroid/src/main/res/values-nl/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-nl/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Verwijder gefilterd deck %s en plaats alle kaarten terug in hun oorspronkelijke decks?</string>
     <string name="no_tts_available_message">Geen tekst-naar-spraak taal beschikbaar</string>
     <string name="tts_no_tts">Niet spreken</string>
-    <string name="unused_strings">\n\nOngebruikte bestanden:\n</string>
     <string name="reposition_card_dialog_title">Nieuwe kaart verplaatsen</string>
     <string name="reposition_card_not_new_error">Alleen nieuwe kaarten kunnen verplaatst worden</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Media controleren&#8230;</string>
     <string name="check_media_acknowledge">Media gecontroleerd</string>
     <string name="check_media_invalid">Bestanden met ongeldige codering: %d</string>
-    <string name="check_media_unused">Bestanden in media-map maar niet in kaarten gebruikt: %d</string>
-    <string name="check_media_nohave">Bestanden die worden gebruikt op kaarten maar niet in mediamap: %d</string>
     <string name="check_media_no_unused_missing">Geen ongebruikte of vermiste bestanden gevonden</string>
-    <string name="check_media_db_updated">Mediagegevensbestand herbouwd</string>
     <string name="check_media_delete_unused">Ongebruikte verwijderen</string>
     <string name="delete_media_message">Verwijdering van media&#8230;</string>
     <string name="delete_media_result_title">Resultaat van verwijdering</string>
diff --git a/AnkiDroid/src/main/res/values-nn/03-dialogs.xml b/AnkiDroid/src/main/res/values-nn/03-dialogs.xml
index b7e49be39995..64759885b0af 100644
--- a/AnkiDroid/src/main/res/values-nn/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-nn/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Ingen \"tekst til tale\"-språk tilgjengelige</string>
     <string name="tts_no_tts">Ikke snakk</string>
-    <string name="unused_strings">\n\nUnused files:\n</string>
     <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Checking media&#8230;</string>
     <string name="check_media_acknowledge">Media checked</string>
     <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_unused">Files in media folder but not used by any cards: %d</string>
-    <string name="check_media_nohave">Files used on cards but not in media folder: %d</string>
     <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_db_updated">Media database rebuilt</string>
     <string name="check_media_delete_unused">Slett ubrukte</string>
     <string name="delete_media_message">Sletter media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-no/03-dialogs.xml b/AnkiDroid/src/main/res/values-no/03-dialogs.xml
index 532724960b7c..36e0d12ab6c7 100644
--- a/AnkiDroid/src/main/res/values-no/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-no/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Ingen \"tekst til tale\"-språk tilgjengelige</string>
     <string name="tts_no_tts">Ikke snakk</string>
-    <string name="unused_strings">\n\nUnused files:\n</string>
     <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Checking media&#8230;</string>
     <string name="check_media_acknowledge">Media checked</string>
     <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_unused">Files in media folder but not used by any cards: %d</string>
-    <string name="check_media_nohave">Files used on cards but not in media folder: %d</string>
     <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_db_updated">Media database rebuilt</string>
     <string name="check_media_delete_unused">Slett ubrukte</string>
     <string name="delete_media_message">Sletter media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-or/03-dialogs.xml b/AnkiDroid/src/main/res/values-or/03-dialogs.xml
index 542ce88a13ca..91265b613b34 100644
--- a/AnkiDroid/src/main/res/values-or/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-or/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">କୌଣସି ପାଠ୍ୟ-ରୁ-କଥନ ଭାଷା ଉପଲବ୍ଧ ନାହିଁ</string>
     <string name="tts_no_tts">କଥା କୁହ ନାହିଁ</string>
-    <string name="unused_strings">\n\nଅବ୍ୟବହୃତ ଫାଇଲ:\n</string>
     <string name="reposition_card_dialog_title">ନୂଆ ପତ୍ରଟିକୁ ପୁନଃଅଵସ୍ଥିତ କରିବା</string>
     <string name="reposition_card_not_new_error">କେଵଳ ନୂଆ ପତ୍ରଗୁଡ଼ିକୁ ପୁନଃଅଵସ୍ଥିତ କରିହେବ</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">ମିଡ଼ିଆ ଯାଞ୍ଚ ଚାଲିଛି&#8230;</string>
     <string name="check_media_acknowledge">ମିଡ଼ିଆ ଯାଞ୍ଚ କରାଗଲା</string>
     <string name="check_media_invalid">ଅବୈଧ ଏନକୋଡିଂ ସହିତ ଫାଇଲଗୁଡିକ: %d</string>
-    <string name="check_media_unused">ମିଡ଼ିଆ ଫୋଲ୍ଡରରେ ଗଚ୍ଛିତ କିନ୍ତୁ କୌଣସି ପତ୍ର ଦ୍ୱାରା ବ୍ୟବହାର ହେଉନଥିବା ଫାଇଲଗୁଡ଼ିକ: %d</string>
-    <string name="check_media_nohave">ପତ୍ରରେ ବ୍ୟବହୃତ କିନ୍ତୁ ମିଡ଼ିଆ ଫୋଲ୍ଡରରେ ନଥିବା ଫାଇଲଗୁଡ଼ିକ: %d</string>
     <string name="check_media_no_unused_missing">କୌଣସି ଅବ୍ୟବହୃତ କିମ୍ବା ନିଖୋଜ ଫାଇଲ ମିଳିଲା ନାହିଁ</string>
-    <string name="check_media_db_updated">ମିଡ଼ିଆ ଡାଟାବେସ୍ ପୁନଃନିର୍ମିତ</string>
     <string name="check_media_delete_unused">ଅବ୍ୟବହୃତ ବିଲୋପ କରନ୍ତୁ</string>
     <string name="delete_media_message">ମିଡ଼ିଆ ଵିଲୋପ ହେଉଛି&#8230;</string>
     <string name="delete_media_result_title">ବିଲୋପ ଫଳାଫଳ</string>
diff --git a/AnkiDroid/src/main/res/values-pa/03-dialogs.xml b/AnkiDroid/src/main/res/values-pa/03-dialogs.xml
index 78c6aea7c539..8ecd426eccdc 100644
--- a/AnkiDroid/src/main/res/values-pa/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-pa/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">ਫਿਲਟਰ ਕੀਤੇ ਡੈੱਕ %s ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ ਅਤੇ ਸਾਰੇ ਕਾਰਡਾਂ ਨੂੰ ਉਹਨਾਂ ਦੇ ਅਸਲ ਡੈੱਕ \'ਤੇ ਵਾਪਸ ਕਰਨਾ ਹੈ?</string>
     <string name="no_tts_available_message">ਕੋਈ ਟੈਕਸਟ-ਟੂ-ਸਪੀਚ ਭਾਸ਼ਾ ਉਪਲਬਧ ਨਹੀਂ ਹੈ</string>
     <string name="tts_no_tts">ਨਾ ਬੋਲੋ</string>
-    <string name="unused_strings">\n\nਅਣਵਰਤੀਆਂ ਫਾਈਲਾਂ:\n</string>
     <string name="reposition_card_dialog_title">ਨਵਾਂ ਕਾਰਡ ਬਦਲੋ</string>
     <string name="reposition_card_not_new_error">ਸਿਰਫ਼ ਨਵੇਂ ਕਾਰਡਾਂ ਨੂੰ ਹੀ ਮੁੜ-ਸਥਾਪਿਤ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Checking media&#8230;</string>
     <string name="check_media_acknowledge">ਮੀਡੀਆ ਦੀ ਜਾਂਚ ਕੀਤੀ ਗਈ</string>
     <string name="check_media_invalid">ਗਲਤ ਏਨਕੋਡਿੰਗ ਵਾਲੀਆਂ ਫਾਈਲਾਂ: %d</string>
-    <string name="check_media_unused">ਮੀਡੀਆ ਫੋਲਡਰ ਵਿੱਚ ਫਾਈਲਾਂ ਪਰ ਕਿਸੇ ਵੀ ਕਾਰਡ ਦੁਆਰਾ ਨਹੀਂ ਵਰਤੀਆਂ ਗਈਆਂ: %d</string>
-    <string name="check_media_nohave">ਫਾਈਲਾਂ ਕਾਰਡਾਂ \'ਤੇ ਵਰਤੀਆਂ ਗਈਆਂ ਪਰ ਮੀਡੀਆ ਫੋਲਡਰ ਵਿੱਚ ਨਹੀਂ: %d</string>
     <string name="check_media_no_unused_missing">ਕੋਈ ਅਣਵਰਤੀਆਂ ਜਾਂ ਗੁੰਮ ਹੋਈਆਂ ਫਾਈਲਾਂ ਨਹੀਂ ਲੱਭੀਆਂ</string>
-    <string name="check_media_db_updated">ਮੀਡੀਆ ਡਾਟਾਬੇਸ ਦੁਬਾਰਾ ਬਣਾਇਆ ਗਿਆ</string>
     <string name="check_media_delete_unused">ਨਾ ਵਰਤੇ ਗਏ ਨੂੰ ਮਿਟਾਓ</string>
     <string name="delete_media_message">ਮੀਡੀਆ ਨੂੰ ਮਿਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ&#8230;</string>
     <string name="delete_media_result_title">ਮਿਟਾਉਣ ਦਾ ਨਤੀਜਾ</string>
diff --git a/AnkiDroid/src/main/res/values-pl/03-dialogs.xml b/AnkiDroid/src/main/res/values-pl/03-dialogs.xml
index 2191a0271d50..ce87767c4906 100644
--- a/AnkiDroid/src/main/res/values-pl/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-pl/03-dialogs.xml
@@ -57,7 +57,6 @@
     <string name="delete_cram_deck_message">Czy na pewno chcesz usunąć filtrowaną talię %s i przenieść wszystkie karty do ich oryginalnych talii?</string>
     <string name="no_tts_available_message">Brak dostępnego języka zamiany tekstu na mowę</string>
     <string name="tts_no_tts">Nie mów</string>
-    <string name="unused_strings">\n\nNieużywane pliki:\n</string>
     <string name="reposition_card_dialog_title">Przestawianie nowej karty</string>
     <string name="reposition_card_not_new_error">Tylko nowe karty mogą być przestawione</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -118,10 +117,7 @@
     <string name="check_media_message">Sprawdzanie mediów&#8230;</string>
     <string name="check_media_acknowledge">Media sprawdzone</string>
     <string name="check_media_invalid">Plików z błędnym kodowaniem: %d</string>
-    <string name="check_media_unused">Plików z foldera mediów, które nie są użyte na żadnej karcie: %d</string>
-    <string name="check_media_nohave">Plików wymienionych na kartach ale nie znalezionych w folderze mediów: %d</string>
     <string name="check_media_no_unused_missing">Nie znaleziono nie używanych ani brakujących plików.</string>
-    <string name="check_media_db_updated">Baza mediów przebudowana.</string>
     <string name="check_media_delete_unused">Usuń nieużywane</string>
     <string name="delete_media_message">Usuwanie mediów&#8230;</string>
     <string name="delete_media_result_title">Wynik usuwania</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rBR/03-dialogs.xml b/AnkiDroid/src/main/res/values-pt-rBR/03-dialogs.xml
index 57f32c42ba2b..0300e2b06777 100644
--- a/AnkiDroid/src/main/res/values-pt-rBR/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-pt-rBR/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Excluir baralho filtrado %s e enviar todas as cartas de volta para seus baralhos originais?</string>
     <string name="no_tts_available_message">Nenhum idioma de texto para fala disponível</string>
     <string name="tts_no_tts">Não fale</string>
-    <string name="unused_strings">\n\nArquivos não utilizados:\n</string>
     <string name="reposition_card_dialog_title">Reposicionar novo cartão</string>
     <string name="reposition_card_not_new_error">Apenas novos cartões podem ser reposicionados</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Verificando mídia&#8230;</string>
     <string name="check_media_acknowledge">Mídia verificada</string>
     <string name="check_media_invalid">Arquivos com codificação inválida: %d</string>
-    <string name="check_media_unused">Arquivos na pasta de mídia não usados por nenhum cartão: %d</string>
-    <string name="check_media_nohave">Arquivos usados por cartões mas que não estão na pasta de mídia: %d</string>
     <string name="check_media_no_unused_missing">Não foram encontrados arquivos não utilizados ou faltantes.</string>
-    <string name="check_media_db_updated">Banco de dados de mídia reconstruído.</string>
     <string name="check_media_delete_unused">Excluir não utilizados</string>
     <string name="delete_media_message">Excluindo mídia&#8230;</string>
     <string name="delete_media_result_title">Resultado da exclusão</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rPT/03-dialogs.xml b/AnkiDroid/src/main/res/values-pt-rPT/03-dialogs.xml
index e20f6f15c84c..24fd97425b11 100644
--- a/AnkiDroid/src/main/res/values-pt-rPT/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-pt-rPT/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Apagar baralho filtrado %s e devolver fichas aos seus baralhos originais?</string>
     <string name="no_tts_available_message">Nenhuma língua disponível para o sistema de conversão de texto para fala</string>
     <string name="tts_no_tts">Não falar</string>
-    <string name="unused_strings">\n\nFicheiros não utilizados:\n</string>
     <string name="reposition_card_dialog_title">Reposicionar a nova ficha</string>
     <string name="reposition_card_not_new_error">Apenas novas fichas podem ser reposicionadas.</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">A verificar multimédia&#8230;</string>
     <string name="check_media_acknowledge">Multimédia verificada</string>
     <string name="check_media_invalid">Ficheiros com codificação inválida: %d</string>
-    <string name="check_media_unused">Ficheiros na pasta de multimédia mas não usados por quaisquer fichas: %d</string>
-    <string name="check_media_nohave">Ficheiros usados nas fichas, mas não presentes na pasta de multimédia: %d</string>
     <string name="check_media_no_unused_missing">Nenhum ficheiro inútil ou em falta foi encontrado.</string>
-    <string name="check_media_db_updated">Base de dados de multimédia reconstruida</string>
     <string name="check_media_delete_unused">Eliminar não utilizados</string>
     <string name="delete_media_message">A apagar ficheiros de multimédia&#8230;</string>
     <string name="delete_media_result_title">Resultado da remoção</string>
diff --git a/AnkiDroid/src/main/res/values-ro/03-dialogs.xml b/AnkiDroid/src/main/res/values-ro/03-dialogs.xml
index 7144344fef25..99d5f8edc323 100644
--- a/AnkiDroid/src/main/res/values-ro/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ro/03-dialogs.xml
@@ -56,7 +56,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Nu vorbi</string>
-    <string name="unused_strings">\n\nUnused files:\n</string>
     <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -115,10 +114,7 @@
     <string name="check_media_message">Checking media&#8230;</string>
     <string name="check_media_acknowledge">Media checked</string>
     <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_unused">Files in media folder but not used by any cards: %d</string>
-    <string name="check_media_nohave">Files used on cards but not in media folder: %d</string>
     <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_db_updated">Media database rebuilt</string>
     <string name="check_media_delete_unused">Delete unused</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-ru/03-dialogs.xml b/AnkiDroid/src/main/res/values-ru/03-dialogs.xml
index 28b0cf2e1fbb..840e47a8922c 100644
--- a/AnkiDroid/src/main/res/values-ru/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ru/03-dialogs.xml
@@ -57,7 +57,6 @@
     <string name="delete_cram_deck_message">Удалить отфильтрованную колоду %s и отправить все карточки обратно в оригинальные колоды?</string>
     <string name="no_tts_available_message">Синтез речи недоступен</string>
     <string name="tts_no_tts">Не произносить</string>
-    <string name="unused_strings">\n\nНеиспользуемые файлы:\n</string>
     <string name="reposition_card_dialog_title">Переместить новую карточку</string>
     <string name="reposition_card_not_new_error">Можно переместить только новые карточки</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -118,10 +117,7 @@
     <string name="check_media_message">Медиафайлы проверяются&#8230;</string>
     <string name="check_media_acknowledge">Медиафайлы проверены</string>
     <string name="check_media_invalid">Файлы с недопустимой кодировкой: %d</string>
-    <string name="check_media_unused">Медиафайлы, не прикреплённые к карточкам: %d</string>
-    <string name="check_media_nohave">Ссылок на отсутствующие медиафайлы: %d</string>
     <string name="check_media_no_unused_missing">Неиспользуемые и отсутствующие файлы не найдены.</string>
-    <string name="check_media_db_updated">База данных медиафайлов перестроена</string>
     <string name="check_media_delete_unused">Удалить неиспользуемые</string>
     <string name="delete_media_message">Медиафайлы 
 удаляются&#8230;</string>
diff --git a/AnkiDroid/src/main/res/values-sat/03-dialogs.xml b/AnkiDroid/src/main/res/values-sat/03-dialogs.xml
index f7ceb31bad39..bd2817550f81 100644
--- a/AnkiDroid/src/main/res/values-sat/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sat/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">ᱯᱷᱤᱞᱴᱟᱨ ᱟᱠᱟᱫ ᱰᱮᱠ %s ᱵᱚᱫᱚᱞ ᱢᱮ ᱟᱨ ᱡᱚᱛᱚ ᱠᱟᱨᱰ ᱟᱠᱚᱣᱟᱜ ᱚᱨᱡᱤᱱᱤᱭᱟᱞ ᱰᱮᱠ ᱨᱮ ᱵᱚᱫᱚᱞ ᱢᱮ?</string>
     <string name="no_tts_available_message">text-to-speech ᱯᱟᱹᱨᱥᱤ ᱵᱟᱱᱩᱜᱼᱟ ᱾</string>
     <string name="tts_no_tts">ᱟᱞᱚᱢ ᱨᱚᱲᱟ</string>
-    <string name="unused_strings">\n\nUnused ᱯᱟᱹᱤᱞ:\n</string>
     <string name="reposition_card_dialog_title">ᱱᱟᱶᱟ ᱠᱟᱰ ᱥᱛᱷᱟᱱᱚᱱᱛᱚᱨ ᱯᱮ</string>
     <string name="reposition_card_not_new_error">ᱠᱷᱟᱹᱞᱤ ᱱᱟᱶᱟ ᱠᱟᱰ ᱜᱮ ᱥᱛᱷᱟᱱᱚᱱᱛᱚᱨ ᱫᱟᱲᱮᱭᱟᱜᱟᱢ</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">ᱢᱮᱰᱤᱭᱟ ᱧᱮᱞ ᱵᱤᱰᱟᱣᱜ ᱠᱟᱱᱟ&#8230;</string>
     <string name="check_media_acknowledge">ᱢᱮᱰᱤᱭᱟ ᱧᱮᱞᱮᱱᱟ</string>
     <string name="check_media_invalid">ᱨᱚᱫ ᱨᱮ ᱵᱟᱲ ᱫᱟᱱᱟᱲ ᱪᱤᱱᱦᱟ: %d</string>
-    <string name="check_media_unused">ᱨᱮᱫ ᱫᱚ ᱢᱮᱰᱤᱭᱟ ᱯᱚᱴᱚᱢ ᱨᱮ ᱢᱮᱱᱟᱜᱟ ᱦᱮᱞᱮ ᱚᱠᱟ ᱠᱟᱰ ᱨᱮ ᱵᱟᱭ ᱵᱮᱵᱽᱷᱟᱨ ᱠᱟᱱᱟ: %d</string>
-    <string name="check_media_nohave">ᱨᱮᱫ ᱠᱟᱰ ᱨᱮ ᱢᱮᱱᱟᱜᱼᱟ ᱦᱮᱞᱮ ᱢᱮᱰᱤᱭᱟ ᱯᱚᱴᱚᱢ ᱨᱮ ᱵᱟᱹᱱᱩᱜᱼᱟ: %d</string>
     <string name="check_media_no_unused_missing">ᱵᱟᱝ ᱵᱮᱵᱦᱟᱨᱟᱜ ᱨᱮᱫ ᱵᱟᱭ ᱧᱟᱢᱞᱮᱱᱟ</string>
-    <string name="check_media_db_updated">ᱢᱮᱰᱤᱭᱟ ᱥᱟᱫᱠᱷᱤᱭᱟᱽ ᱵᱟᱹᱭᱥᱟᱹᱣ ᱫᱩᱦᱲᱟᱛᱮᱭᱟᱨ</string>
     <string name="check_media_delete_unused">ᱵᱟᱝ ᱵᱮᱵᱷᱟᱨ ᱚᱠ ᱜᱮᱫ ᱜᱤᱰᱤ ᱢᱮ</string>
     <string name="delete_media_message">ᱢᱤᱰᱤᱭᱟ ᱜᱮᱫ ᱜᱤᱰᱤᱜ ᱠᱟᱱᱟ&#8230;</string>
     <string name="delete_media_result_title">ᱜᱮᱫ ᱜᱤᱰᱤ‌ ᱛᱮᱞᱟ</string>
diff --git a/AnkiDroid/src/main/res/values-sc/03-dialogs.xml b/AnkiDroid/src/main/res/values-sc/03-dialogs.xml
index b3ac11dcbd44..ff464bc9927e 100644
--- a/AnkiDroid/src/main/res/values-sc/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sc/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Iscantzellare su matzu filtradu %s e torrare a imbiare totu sas cartas a sos matzos originale issoro?</string>
     <string name="no_tts_available_message">Non b\'est a disponimentu peruna limba de sìntesi vocale</string>
     <string name="tts_no_tts">Non chistiones</string>
-    <string name="unused_strings">\n\nDocumentos no impreados:\n</string>
     <string name="reposition_card_dialog_title">Torra a positzionare sa carta noa</string>
     <string name="reposition_card_not_new_error">Petzi sas cartas noas si podent torrare a positzionare</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -117,10 +116,7 @@
     <string name="check_media_message">Vetifichende sos mèdios&#8230;</string>
     <string name="check_media_acknowledge">Mèdios verificados</string>
     <string name="check_media_invalid">Documentos cun una codìfica non vàlida: %d</string>
-    <string name="check_media_unused">Documentos in sa cartella de sos mèdios ma chi non benint impreados dae peruna carta: %d</string>
-    <string name="check_media_nohave">Documentos impreados in sas cartas ma chi mancant in sa cartella de sos mèdios: %d</string>
     <string name="check_media_no_unused_missing">Perunu documentu no impreadu o chi manchet agatadu</string>
-    <string name="check_media_db_updated">Base de datos multimediales torrada a fraigare</string>
     <string name="check_media_delete_unused">Iscantzella sos no impreados</string>
     <string name="delete_media_message">Iscantzellende mèdios&#8230;</string>
     <string name="delete_media_result_title">Resurtadu de s\'iscantzelladura</string>
diff --git a/AnkiDroid/src/main/res/values-sk/03-dialogs.xml b/AnkiDroid/src/main/res/values-sk/03-dialogs.xml
index f58ec4fd4187..d51bbc6ced8e 100644
--- a/AnkiDroid/src/main/res/values-sk/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sk/03-dialogs.xml
@@ -57,7 +57,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Žiaden TTS jazyk nie je k dispozícii</string>
     <string name="tts_no_tts">Nehovoriť</string>
-    <string name="unused_strings">\n\nNepoužívaných súborov:\n</string>
     <string name="reposition_card_dialog_title">Premiestniť novú kartičku</string>
     <string name="reposition_card_not_new_error">Len pri nových kartách je možné zmeniť pozíciu (premiestniť)</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -118,10 +117,7 @@
     <string name="check_media_message">Kontrola multimédií&#8230;</string>
     <string name="check_media_acknowledge">Multimédiá skontrolované</string>
     <string name="check_media_invalid">Súbory s neplatným kódovaním: %d</string>
-    <string name="check_media_unused">Súborý v multimediálnom priečinku nepoužívané žiadnymi kartičkami: %d</string>
-    <string name="check_media_nohave">Použité súbory na kartičkách, ktoré nie sú v priečinku multimédií: %d</string>
     <string name="check_media_no_unused_missing">Neboli nájdené žiadne nepoužívané alebo chýbajúce súbory</string>
-    <string name="check_media_db_updated">Databáza multimédií bola opravená</string>
     <string name="check_media_delete_unused">Vymazať nepoužívané</string>
     <string name="delete_media_message">Médiá sa vymazávajú&#8230;</string>
     <string name="delete_media_result_title">Výsledok vymazania</string>
diff --git a/AnkiDroid/src/main/res/values-sl/03-dialogs.xml b/AnkiDroid/src/main/res/values-sl/03-dialogs.xml
index c3bdfbe1a911..7521d91d69ec 100644
--- a/AnkiDroid/src/main/res/values-sl/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sl/03-dialogs.xml
@@ -57,7 +57,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Noben jezik pretvorbe besedila v govor ni na voljo</string>
     <string name="tts_no_tts">Bodite tiho</string>
-    <string name="unused_strings">\n\nNeuporabljene datoteke:\n</string>
     <string name="reposition_card_dialog_title">Prestavi novo kartico</string>
     <string name="reposition_card_not_new_error">Prerazporedite lahko samo nove kartice.</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -118,10 +117,7 @@
     <string name="check_media_message">Preverjanje predstavnosti &#8230;</string>
     <string name="check_media_acknowledge">Predstavnost preverjena</string>
     <string name="check_media_invalid">Datoteke z neveljavnim kodiranjem: %d</string>
-    <string name="check_media_unused">Datoteke v mapi predstavnosti, vendar jih ne uporablja nobena kartica: %d</string>
-    <string name="check_media_nohave">Datoteke uporabljene na karticah, vendar se ne nahajajo v mapi predstavnosti: %d</string>
     <string name="check_media_no_unused_missing">Neuporabljenih ali manjkajočih datotek ni bilo mogoče najti</string>
-    <string name="check_media_db_updated">Pod. zbirka predstavnosti izgrajena</string>
     <string name="check_media_delete_unused">Izbriši neuporabljeno</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-sq/03-dialogs.xml b/AnkiDroid/src/main/res/values-sq/03-dialogs.xml
index e222cc65ad0e..278dde3d432d 100644
--- a/AnkiDroid/src/main/res/values-sq/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sq/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Nuk ka gjuhë tekst-në-fjalë të disponueshme</string>
     <string name="tts_no_tts">mos fol</string>
-    <string name="unused_strings">\n\nSkedarët e papërdorur:\n</string>
     <string name="reposition_card_dialog_title">Rivendosni kartën e re</string>
     <string name="reposition_card_not_new_error">Vetëm kartat e reja mund të ripozicionohen</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Po kontrollon median&#8230;</string>
     <string name="check_media_acknowledge">Media e kontrolluar</string>
     <string name="check_media_invalid">Skedarët me kodim të pavlefshëm: %d</string>
-    <string name="check_media_unused">Skedarët në dosjen e medias por që nuk përdoren nga asnjë kartë: %d</string>
-    <string name="check_media_nohave">Skedarët e përdorur në karta por jo në dosjen e medias: %d</string>
     <string name="check_media_no_unused_missing">Nuk u gjet asnjë skedar i papërdorur ose i munguar</string>
-    <string name="check_media_db_updated">Baza e të dhënave mediatike është rindërtuar</string>
     <string name="check_media_delete_unused">Fshije të papërdorur</string>
     <string name="delete_media_message">Po fshin median&#8230;</string>
     <string name="delete_media_result_title">Rezultati i fshirjes</string>
diff --git a/AnkiDroid/src/main/res/values-sr/03-dialogs.xml b/AnkiDroid/src/main/res/values-sr/03-dialogs.xml
index 15749d8b0b58..9b37e016c3f1 100644
--- a/AnkiDroid/src/main/res/values-sr/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sr/03-dialogs.xml
@@ -56,7 +56,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Функција претварања текста у говор није доступна</string>
     <string name="tts_no_tts">Не изговарај</string>
-    <string name="unused_strings">\n\nUnused files:\n</string>
     <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -115,10 +114,7 @@
     <string name="check_media_message">Проверавање медијске датотеке&#8230;</string>
     <string name="check_media_acknowledge">Медије проверене</string>
     <string name="check_media_invalid">Кодирање датотеке је нетачан: %d</string>
-    <string name="check_media_unused">Датотеке у фасциклу за медију које немају картицу која их користи: %d</string>
-    <string name="check_media_nohave">Датотеке у картицама које нису у фасциклу за медију: %d</string>
     <string name="check_media_no_unused_missing">Нема некоришћених или непостојећи датотека.</string>
-    <string name="check_media_db_updated">База за медије обновљена.</string>
     <string name="check_media_delete_unused">Избриши некоришћених</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-ss/03-dialogs.xml b/AnkiDroid/src/main/res/values-ss/03-dialogs.xml
index 4f39a0bafe0a..d156c86298d1 100644
--- a/AnkiDroid/src/main/res/values-ss/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ss/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="unused_strings">\n\nUnused files:\n</string>
     <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Checking media&#8230;</string>
     <string name="check_media_acknowledge">Media checked</string>
     <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_unused">Files in media folder but not used by any cards: %d</string>
-    <string name="check_media_nohave">Files used on cards but not in media folder: %d</string>
     <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_db_updated">Media database rebuilt</string>
     <string name="check_media_delete_unused">Delete unused</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-sv/03-dialogs.xml b/AnkiDroid/src/main/res/values-sv/03-dialogs.xml
index 99587138a3c8..07e243b3eade 100644
--- a/AnkiDroid/src/main/res/values-sv/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sv/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Ta bort filtrerad kortlek %s och skicka alla kort tillbaks till deras ursprungliga kortlek?</string>
     <string name="no_tts_available_message">Det finns inget språk för text-till-tal</string>
     <string name="tts_no_tts">Tala inte</string>
-    <string name="unused_strings">\n\nOanvända filer:\n</string>
     <string name="reposition_card_dialog_title">Ompositionera nytt kort</string>
     <string name="reposition_card_not_new_error">Endast nya kort kan ompositioneras</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Kontrollerar media&#8230;</string>
     <string name="check_media_acknowledge">Media kontrollerat</string>
     <string name="check_media_invalid">Filer med ogiltig kodning: %d</string>
-    <string name="check_media_unused">Filer i mediamapp som inte används i kort: %d</string>
-    <string name="check_media_nohave">Filer som används på kort med saknas i mediamapp: %d</string>
     <string name="check_media_no_unused_missing">Inga oanvända eller saknade filer upptäckta.</string>
-    <string name="check_media_db_updated">Mediadatabasen återskapad.</string>
     <string name="check_media_delete_unused">Radera oanvända</string>
     <string name="delete_media_message">Tar bort media&#8230;</string>
     <string name="delete_media_result_title">Raderingsresultat</string>
diff --git a/AnkiDroid/src/main/res/values-sw/03-dialogs.xml b/AnkiDroid/src/main/res/values-sw/03-dialogs.xml
index 4f39a0bafe0a..d156c86298d1 100644
--- a/AnkiDroid/src/main/res/values-sw/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sw/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="unused_strings">\n\nUnused files:\n</string>
     <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Checking media&#8230;</string>
     <string name="check_media_acknowledge">Media checked</string>
     <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_unused">Files in media folder but not used by any cards: %d</string>
-    <string name="check_media_nohave">Files used on cards but not in media folder: %d</string>
     <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_db_updated">Media database rebuilt</string>
     <string name="check_media_delete_unused">Delete unused</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-ta/03-dialogs.xml b/AnkiDroid/src/main/res/values-ta/03-dialogs.xml
index 06be64c5c069..1c31150d8f24 100644
--- a/AnkiDroid/src/main/res/values-ta/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ta/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">வடிகட்டப்பட்ட டெக்கை %sஐ நீக்கி, எல்லா கார்டுகளையும் அவற்றின் அசல் டெக்குகளுக்கு அனுப்பவா?</string>
     <string name="no_tts_available_message">உரையிலிருந்து பேச்சு மொழி இல்லை</string>
     <string name="tts_no_tts">பேசாதே</string>
-    <string name="unused_strings">\n\nபயன்படுத்தப்படாத கோப்புகள்:\n</string>
     <string name="reposition_card_dialog_title">புதிய அட்டையை மாற்றவும்</string>
     <string name="reposition_card_not_new_error">புதிய அட்டைகளை மட்டுமே இடமாற்றம் செய்ய முடியும்</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">மீடியாவைச் சரிபார்க்கிறது&#8230;</string>
     <string name="check_media_acknowledge">மீடியா சோதனை செய்தது</string>
     <string name="check_media_invalid">தவறான குறியாக்கம் கொண்ட கோப்புகள்: %d</string>
-    <string name="check_media_unused">மீடியா கோப்புறையில் உள்ள கோப்புகள் ஆனால் எந்தக் கார்டுகளாலும் பயன்படுத்தப்படவில்லை: %d</string>
-    <string name="check_media_nohave">கார்டுகளில் பயன்படுத்தப்படும் கோப்புகள் ஆனால் மீடியா கோப்புறையில் இல்லை: %d</string>
     <string name="check_media_no_unused_missing">பயன்படுத்தப்படாத அல்லது விடுபட்ட கோப்புகள் எதுவும் இல்லை</string>
-    <string name="check_media_db_updated">மீடியா தரவுத்தளம் மீண்டும் கட்டமைக்கப்பட்டது</string>
     <string name="check_media_delete_unused">பயன்படுத்தப்படாததை நீக்கு</string>
     <string name="delete_media_message">மீடியாவை நீக்குகிறது&#8230;</string>
     <string name="delete_media_result_title">நீக்குதல் முடிவு</string>
diff --git a/AnkiDroid/src/main/res/values-te/03-dialogs.xml b/AnkiDroid/src/main/res/values-te/03-dialogs.xml
index e67edd9944d9..576d855c592e 100644
--- a/AnkiDroid/src/main/res/values-te/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-te/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">ఫిల్టర్ చేసిన డెక్ %sని తొలగించి, అన్ని కార్డ్‌లను వాటి అసలు డెక్‌లకు తిరిగి పంపాలా?</string>
     <string name="no_tts_available_message">టెక్స్ట్-టు-స్పీచ్ లాంగ్వేజ్ అందుబాటులో లేదు</string>
     <string name="tts_no_tts">మాట్లాడకండి</string>
-    <string name="unused_strings">\n\nఉపయోగించని ఫైళ్లు:\n</string>
     <string name="reposition_card_dialog_title">కొత్త కార్డును భర్తీ చేయండి</string>
     <string name="reposition_card_not_new_error">కొత్త కార్డ్‌లను మాత్రమే రీపోజిషన్ చేయవచ్చు</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">మీడియాను తనిఖీ చేస్తోంది&#8230;</string>
     <string name="check_media_acknowledge">మీడియా తనిఖీ చేయబడింది</string>
     <string name="check_media_invalid">చెల్లని ఎన్కోడింగ్ ఫైల్లు: %d</string>
-    <string name="check_media_unused">మీడియా ఫోల్డర్లోని ఫైళ్ళు కానీ ఏ కార్డులు ఉపయోగించరు: %d</string>
-    <string name="check_media_nohave">మీడియా ఫోల్డర్లో కానీ కార్డులలో ఉపయోగించబడే ఫైళ్ళు: %d</string>
     <string name="check_media_no_unused_missing">ఉపయోగించని లేదా తప్పిపోయిన ఫైల్లు కనుగొనబడలేదు</string>
-    <string name="check_media_db_updated">మీడియా డేటాబేస్ పునర్నిర్మించబడింది</string>
     <string name="check_media_delete_unused">ఉపయోగించనిది తొలగించండి</string>
     <string name="delete_media_message">మీడియాను తీసివేస్తోంది&#8230;</string>
     <string name="delete_media_result_title">తొలగింపు ఫలితం</string>
diff --git a/AnkiDroid/src/main/res/values-tg/03-dialogs.xml b/AnkiDroid/src/main/res/values-tg/03-dialogs.xml
index 6565167a5adc..395014fd7a15 100644
--- a/AnkiDroid/src/main/res/values-tg/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-tg/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="unused_strings">\n\nUnused files:\n</string>
     <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Checking media&#8230;</string>
     <string name="check_media_acknowledge">Media checked</string>
     <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_unused">Files in media folder but not used by any cards: %d</string>
-    <string name="check_media_nohave">Files used on cards but not in media folder: %d</string>
     <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_db_updated">Media database rebuilt</string>
     <string name="check_media_delete_unused">Delete unused</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-tgl/03-dialogs.xml b/AnkiDroid/src/main/res/values-tgl/03-dialogs.xml
index fa874d1856f6..eb34ddd44aca 100644
--- a/AnkiDroid/src/main/res/values-tgl/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-tgl/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Walang available na wika sa teksto-sa-salita</string>
     <string name="tts_no_tts">Huwag kang magsalita</string>
-    <string name="unused_strings">\n\nUnused files:\n</string>
     <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Sinusuri ang media&#8230;</string>
     <string name="check_media_acknowledge">Nasuring media</string>
     <string name="check_media_invalid">Mga file na may di-wasting pag-encode: %d</string>
-    <string name="check_media_unused">Mga file sa folder ng media ngunit hindi ginagamit ng anumang mga kard: %d</string>
-    <string name="check_media_nohave">Mga file na ginamit sa mga kard ngunit hindi sa folder ng media: %d</string>
     <string name="check_media_no_unused_missing">Walang nagamit na nakitang mga nawawalang file</string>
-    <string name="check_media_db_updated">Itinayo muli ang database ng media</string>
     <string name="check_media_delete_unused">Tanggalin ang hindi ginagamit</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-th/03-dialogs.xml b/AnkiDroid/src/main/res/values-th/03-dialogs.xml
index 4161bf4b46ec..ecb2c3a28ce2 100644
--- a/AnkiDroid/src/main/res/values-th/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-th/03-dialogs.xml
@@ -54,7 +54,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="unused_strings">\n\nUnused files:\n</string>
     <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -109,10 +108,7 @@
     <string name="check_media_message">Checking media&#8230;</string>
     <string name="check_media_acknowledge">Media checked</string>
     <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_unused">Files in media folder but not used by any cards: %d</string>
-    <string name="check_media_nohave">Files used on cards but not in media folder: %d</string>
     <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_db_updated">Media database rebuilt</string>
     <string name="check_media_delete_unused">Delete unused</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-ti/03-dialogs.xml b/AnkiDroid/src/main/res/values-ti/03-dialogs.xml
index 4f39a0bafe0a..d156c86298d1 100644
--- a/AnkiDroid/src/main/res/values-ti/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ti/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="unused_strings">\n\nUnused files:\n</string>
     <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Checking media&#8230;</string>
     <string name="check_media_acknowledge">Media checked</string>
     <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_unused">Files in media folder but not used by any cards: %d</string>
-    <string name="check_media_nohave">Files used on cards but not in media folder: %d</string>
     <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_db_updated">Media database rebuilt</string>
     <string name="check_media_delete_unused">Delete unused</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-tn/03-dialogs.xml b/AnkiDroid/src/main/res/values-tn/03-dialogs.xml
index 4f39a0bafe0a..d156c86298d1 100644
--- a/AnkiDroid/src/main/res/values-tn/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-tn/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="unused_strings">\n\nUnused files:\n</string>
     <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Checking media&#8230;</string>
     <string name="check_media_acknowledge">Media checked</string>
     <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_unused">Files in media folder but not used by any cards: %d</string>
-    <string name="check_media_nohave">Files used on cards but not in media folder: %d</string>
     <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_db_updated">Media database rebuilt</string>
     <string name="check_media_delete_unused">Delete unused</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-tr/03-dialogs.xml b/AnkiDroid/src/main/res/values-tr/03-dialogs.xml
index afb1f2ce69df..82a58537911e 100644
--- a/AnkiDroid/src/main/res/values-tr/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-tr/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">%s filtreli destesi silinip bütün kartlar orjinal destelerine gönderilsin mi?</string>
     <string name="no_tts_available_message">Mevcut metin okuma dili yok</string>
     <string name="tts_no_tts">Konuşma</string>
-    <string name="unused_strings">\n\nKullanılmayan dosyalar:\n</string>
     <string name="reposition_card_dialog_title">Yeni kartın yerini değiştir</string>
     <string name="reposition_card_not_new_error">Yalnızca yeni kartların yeri değiştirilebilir</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Medya kontrol ediliyor&#8230;</string>
     <string name="check_media_acknowledge">Medya kontrol edildi</string>
     <string name="check_media_invalid">Geçersiz kodlamalı dosyalar: %d</string>
-    <string name="check_media_unused">Medya klasöründe olup hiçbir kartta kullanılmayan dosyalar: %d</string>
-    <string name="check_media_nohave">Kartlarda kullanılıp medya klasöründe olmayan dosyalar: %d</string>
     <string name="check_media_no_unused_missing">Kullanılmayan veya eksik dosya bulunmuyor.</string>
-    <string name="check_media_db_updated">Medya veritabanı yeniden oluşturuldu.</string>
     <string name="check_media_delete_unused">Kullanılmayanları sil</string>
     <string name="delete_media_message">Medya siliniyor&#8230;</string>
     <string name="delete_media_result_title">Silme sonuçları</string>
diff --git a/AnkiDroid/src/main/res/values-ts/03-dialogs.xml b/AnkiDroid/src/main/res/values-ts/03-dialogs.xml
index 4f39a0bafe0a..d156c86298d1 100644
--- a/AnkiDroid/src/main/res/values-ts/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ts/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="unused_strings">\n\nUnused files:\n</string>
     <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Checking media&#8230;</string>
     <string name="check_media_acknowledge">Media checked</string>
     <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_unused">Files in media folder but not used by any cards: %d</string>
-    <string name="check_media_nohave">Files used on cards but not in media folder: %d</string>
     <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_db_updated">Media database rebuilt</string>
     <string name="check_media_delete_unused">Delete unused</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-tt/03-dialogs.xml b/AnkiDroid/src/main/res/values-tt/03-dialogs.xml
index 54ac21319da2..c2a26a0dd82a 100644
--- a/AnkiDroid/src/main/res/values-tt/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-tt/03-dialogs.xml
@@ -54,7 +54,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="unused_strings">\n\nUnused files:\n</string>
     <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -109,10 +108,7 @@
     <string name="check_media_message">Checking media&#8230;</string>
     <string name="check_media_acknowledge">Media checked</string>
     <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_unused">Files in media folder but not used by any cards: %d</string>
-    <string name="check_media_nohave">Files used on cards but not in media folder: %d</string>
     <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_db_updated">Media database rebuilt</string>
     <string name="check_media_delete_unused">Delete unused</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-ug/03-dialogs.xml b/AnkiDroid/src/main/res/values-ug/03-dialogs.xml
index b7361cfcc174..f160f85e607c 100644
--- a/AnkiDroid/src/main/res/values-ug/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ug/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">سۈزۈلگەن دەستە %s نى ئۆچۈرۈپ، ھەممە كارتىنى ئەسلىدىكى دەستىگە قايتۇرامدۇ؟</string>
     <string name="no_tts_available_message">بۇ تىلدا ئىشلەتكىلى بولىدىغان تېكىستتىن ئاۋازغا موتورى يوق</string>
     <string name="tts_no_tts">سۆزلىمە</string>
-    <string name="unused_strings">\n\nئىشلىتىلمىگەن ھۆججەت:\n</string>
     <string name="reposition_card_dialog_title">يېڭى كارتىنى قايتا تەرتىپلە</string>
     <string name="reposition_card_not_new_error">پەقەت يېڭى كارتىنىڭ ئورنىنىلا يۆتكىگىلى بولىدۇ</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">ۋاسىتە تەكشۈرۈۋاتىدۇ&#8230;</string>
     <string name="check_media_acknowledge">ۋاسىتە تەكشۈرۈلدى</string>
     <string name="check_media_invalid">كودلىنىشى ئىناۋەتسىز ھۆججەت: %d</string>
-    <string name="check_media_unused">ھۆججەت ۋاسىتە قىسقۇچتا ئەمما ھېچقانداق كارتا ئىشلەتمەيدۇ: %d</string>
-    <string name="check_media_nohave">كارتىدا ئىشلىتىلگەن ئەمما ۋاسىتە قىسقۇچتا يوق ھۆججەت: %d</string>
     <string name="check_media_no_unused_missing">ئىشلىتىلمىگەن ياكى يوقالغان ھېچقانداق ھۆججەت بايقالمىدى</string>
-    <string name="check_media_db_updated">ۋاسىتە ساندانى قايتا قۇرۇلدى</string>
     <string name="check_media_delete_unused">ئىشلىتىلمىگەننى ئۆچۈر</string>
     <string name="delete_media_message">ۋاسىتە ئۆچۈرۈۋاتىدۇ&#8230;</string>
     <string name="delete_media_result_title">ئۆچۈرۈش نەتىجىسى</string>
diff --git a/AnkiDroid/src/main/res/values-uk/03-dialogs.xml b/AnkiDroid/src/main/res/values-uk/03-dialogs.xml
index 038612166c38..7f872318bebb 100644
--- a/AnkiDroid/src/main/res/values-uk/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-uk/03-dialogs.xml
@@ -57,7 +57,6 @@
     <string name="delete_cram_deck_message">Видалити фільтровану колоду %s і повернути всі картки до оригінальних колод?</string>
     <string name="no_tts_available_message">Відсутня мова для перетворення тексту в мовлення</string>
     <string name="tts_no_tts">Не говорити</string>
-    <string name="unused_strings">\n\nНевикористані файли:\n</string>
     <string name="reposition_card_dialog_title">Перемістити нову картку</string>
     <string name="reposition_card_not_new_error">Можна перемістити тільки нові картки</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -118,10 +117,7 @@
     <string name="check_media_message">Перевіряємо мультимедіа&#8230;</string>
     <string name="check_media_acknowledge">Перевірено мультимедіа</string>
     <string name="check_media_invalid">Файли з неправильним кодуванням: %d</string>
-    <string name="check_media_unused">Медіафайли не використані жодною з карток: %d</string>
-    <string name="check_media_nohave">Файли використані в картках, але не в медіапапці: %d</string>
     <string name="check_media_no_unused_missing">Не знайдено жодних невикористаних чи відсутніх фалів</string>
-    <string name="check_media_db_updated">Базу даних медіафайлів відновлено</string>
     <string name="check_media_delete_unused">Видалити невикористане</string>
     <string name="delete_media_message">Видалення медіа&#8230;</string>
     <string name="delete_media_result_title">Результат видалення</string>
diff --git a/AnkiDroid/src/main/res/values-ur/03-dialogs.xml b/AnkiDroid/src/main/res/values-ur/03-dialogs.xml
index db8645588a28..e770abefa4b9 100644
--- a/AnkiDroid/src/main/res/values-ur/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ur/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">فلٹر شدہ ڈیک %s کو حذف کریں اور تمام کارڈز کو ان کے اصل ڈیک پر واپس بھیجیں؟</string>
     <string name="no_tts_available_message">متن سے تقریر کی کوئی زبان دستیاب نہیں ہے۔</string>
     <string name="tts_no_tts">مت بولو</string>
-    <string name="unused_strings">\n\nغیر استعمال شدہ فائلیں:\n</string>
     <string name="reposition_card_dialog_title">نئے کارڈ کی جگہ</string>
     <string name="reposition_card_not_new_error">صرف نئے کارڈز کی جگہ تبدیل کی جا سکتی ہے۔</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">میڈیا کو چیک کیا جا رہا ہے&#8230;</string>
     <string name="check_media_acknowledge">میڈیا چیک کیا</string>
     <string name="check_media_invalid">غلط انکوڈنگ والی فائلیں: %d</string>
-    <string name="check_media_unused">فائلیں میڈیا فولڈر میں ہیں لیکن کسی بھی کارڈ کے ذریعے استعمال نہیں کی گئی: %d</string>
-    <string name="check_media_nohave">کارڈز پر استعمال ہونے والی فائلیں لیکن میڈیا فولڈر میں نہیں: %d</string>
     <string name="check_media_no_unused_missing">کوئی غیر استعمال شدہ یا گم شدہ فائلیں نہیں ملی</string>
-    <string name="check_media_db_updated">میڈیا ڈیٹا بیس کو دوبارہ بنایا گیا</string>
     <string name="check_media_delete_unused">غیر استعمال شدہ کو حذف کریں</string>
     <string name="delete_media_message">میڈیا کو حذف کیا جا رہا ہے&#8230;</string>
     <string name="delete_media_result_title">حذف کرنے کا نتیجہ</string>
diff --git a/AnkiDroid/src/main/res/values-uz/03-dialogs.xml b/AnkiDroid/src/main/res/values-uz/03-dialogs.xml
index 454b6066f43c..d5eb04aa619a 100644
--- a/AnkiDroid/src/main/res/values-uz/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-uz/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="unused_strings">\n\nUnused files:\n</string>
     <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Checking media&#8230;</string>
     <string name="check_media_acknowledge">Media checked</string>
     <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_unused">Files in media folder but not used by any cards: %d</string>
-    <string name="check_media_nohave">Files used on cards but not in media folder: %d</string>
     <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_db_updated">Media database rebuilt</string>
     <string name="check_media_delete_unused">Delete unused</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-ve/03-dialogs.xml b/AnkiDroid/src/main/res/values-ve/03-dialogs.xml
index 4f39a0bafe0a..d156c86298d1 100644
--- a/AnkiDroid/src/main/res/values-ve/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ve/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="unused_strings">\n\nUnused files:\n</string>
     <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Checking media&#8230;</string>
     <string name="check_media_acknowledge">Media checked</string>
     <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_unused">Files in media folder but not used by any cards: %d</string>
-    <string name="check_media_nohave">Files used on cards but not in media folder: %d</string>
     <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_db_updated">Media database rebuilt</string>
     <string name="check_media_delete_unused">Delete unused</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-vi/03-dialogs.xml b/AnkiDroid/src/main/res/values-vi/03-dialogs.xml
index 9dbfa521e073..33a83f0beafa 100644
--- a/AnkiDroid/src/main/res/values-vi/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-vi/03-dialogs.xml
@@ -54,7 +54,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Không có ngôn ngữ chuyển-văn-bản-thành-lời</string>
     <string name="tts_no_tts">Đừng phát âm</string>
-    <string name="unused_strings">\n\nUnused files:\n</string>
     <string name="reposition_card_dialog_title">Đặt lại vị trí thẻ mới</string>
     <string name="reposition_card_not_new_error">Chỉ thẻ mới có thể được định vị lại</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -109,10 +108,7 @@
     <string name="check_media_message">Đang kiểm tra tệp đa phương tiện&#8230;</string>
     <string name="check_media_acknowledge">Đã kiểm tệp đa phương tiện</string>
     <string name="check_media_invalid">Các tệp với mã hoá không hợp lệ: %d</string>
-    <string name="check_media_unused">Tệp trong thư mục đa phương tiện nhưng không được dùng bởi thẻ nào: %d</string>
-    <string name="check_media_nohave">Các tệp dùng trong thẻ mà không có trong thư mục đa phương tiện: %d</string>
     <string name="check_media_no_unused_missing">Không thấy tệp chưa dùng hoặc thất lạc nào</string>
-    <string name="check_media_db_updated">Đã dựng lại CSDL đa phương tiện</string>
     <string name="check_media_delete_unused">Xoá tệp chưa dùng</string>
     <string name="delete_media_message">Đang xóa phương tiện&#8230;</string>
     <string name="delete_media_result_title">Kết quả xóa</string>
diff --git a/AnkiDroid/src/main/res/values-wo/03-dialogs.xml b/AnkiDroid/src/main/res/values-wo/03-dialogs.xml
index 4161bf4b46ec..ecb2c3a28ce2 100644
--- a/AnkiDroid/src/main/res/values-wo/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-wo/03-dialogs.xml
@@ -54,7 +54,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="unused_strings">\n\nUnused files:\n</string>
     <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -109,10 +108,7 @@
     <string name="check_media_message">Checking media&#8230;</string>
     <string name="check_media_acknowledge">Media checked</string>
     <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_unused">Files in media folder but not used by any cards: %d</string>
-    <string name="check_media_nohave">Files used on cards but not in media folder: %d</string>
     <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_db_updated">Media database rebuilt</string>
     <string name="check_media_delete_unused">Delete unused</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-xh/03-dialogs.xml b/AnkiDroid/src/main/res/values-xh/03-dialogs.xml
index 4f39a0bafe0a..d156c86298d1 100644
--- a/AnkiDroid/src/main/res/values-xh/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-xh/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="unused_strings">\n\nUnused files:\n</string>
     <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Checking media&#8230;</string>
     <string name="check_media_acknowledge">Media checked</string>
     <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_unused">Files in media folder but not used by any cards: %d</string>
-    <string name="check_media_nohave">Files used on cards but not in media folder: %d</string>
     <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_db_updated">Media database rebuilt</string>
     <string name="check_media_delete_unused">Delete unused</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-yue/03-dialogs.xml b/AnkiDroid/src/main/res/values-yue/03-dialogs.xml
index b732fb4dbb82..cd4f0bfd2441 100644
--- a/AnkiDroid/src/main/res/values-yue/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-yue/03-dialogs.xml
@@ -54,7 +54,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="unused_strings">\n\nUnused files:\n</string>
     <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -109,10 +108,7 @@
     <string name="check_media_message">Checking media&#8230;</string>
     <string name="check_media_acknowledge">Media checked</string>
     <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_unused">Files in media folder but not used by any cards: %d</string>
-    <string name="check_media_nohave">Files used on cards but not in media folder: %d</string>
     <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_db_updated">Media database rebuilt</string>
     <string name="check_media_delete_unused">Delete unused</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml b/AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml
index c17353e03451..96a0ed0bfb51 100644
--- a/AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml
@@ -54,7 +54,6 @@
     <string name="delete_cram_deck_message">删除筛选过的牌组 %s 并将所有卡片发回原牌组？</string>
     <string name="no_tts_available_message">没有可用的文字转语音（TTS）语言</string>
     <string name="tts_no_tts">不要朗读</string>
-    <string name="unused_strings">\n\n未使用的文件：\n</string>
     <string name="reposition_card_dialog_title">更改新卡位置</string>
     <string name="reposition_card_not_new_error">只有新卡牌可被更改位置</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -109,10 +108,7 @@
     <string name="check_media_message">正在检查媒体文件&#8230;</string>
     <string name="check_media_acknowledge">媒体文件检查完毕</string>
     <string name="check_media_invalid">编码无效的文件：%d</string>
-    <string name="check_media_unused">存在于媒体文件夹中但未被用于任何卡牌的文件：%d</string>
-    <string name="check_media_nohave">被用于一些卡牌，但不存在于媒体文件夹中的文件：%d</string>
     <string name="check_media_no_unused_missing">没有发现未使用或缺失的文件</string>
-    <string name="check_media_db_updated">媒体数据库已重建</string>
     <string name="check_media_delete_unused">删除未使用的文件</string>
     <string name="delete_media_message">正在删除媒体&#8230;</string>
     <string name="delete_media_result_title">填空结果</string>
diff --git a/AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml b/AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml
index be77351ac564..82b00eaf7b2d 100644
--- a/AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml
@@ -96,7 +96,7 @@
     <string name="gestures_summ">为回答或编辑卡片等动作指定手势。</string>
     <string name="gestures_corner_touch" maxLength="41">9 点触摸</string>
     <string name="gestures_corner_touch_summary">允许屏幕边缘的触摸手势</string>
-    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">显示键盘快捷键</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">全屏导航抽屉</string>
     <string name="gestures_fullscreen_nav_drawer_summary">从屏幕上的任何地方向右滑动时打开导航抽屉</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">无</string>
diff --git a/AnkiDroid/src/main/res/values-zh-rTW/03-dialogs.xml b/AnkiDroid/src/main/res/values-zh-rTW/03-dialogs.xml
index 765786a4051d..c852d47ec2b2 100644
--- a/AnkiDroid/src/main/res/values-zh-rTW/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-zh-rTW/03-dialogs.xml
@@ -54,7 +54,6 @@
     <string name="delete_cram_deck_message">刪除篩選過的牌組 %s 並將所有卡片發回原牌組？</string>
     <string name="no_tts_available_message">沒有可用的朗讀語言</string>
     <string name="tts_no_tts">不要發音</string>
-    <string name="unused_strings">\n\nUnused files:\n</string>
     <string name="reposition_card_dialog_title">變更新卡片位置</string>
     <string name="reposition_card_not_new_error">只有新卡片可以變更位置</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -109,10 +108,7 @@
     <string name="check_media_message">正在檢查媒體&#8230;</string>
     <string name="check_media_acknowledge">媒體已檢查</string>
     <string name="check_media_invalid">使用無效編碼的檔案：%d</string>
-    <string name="check_media_unused">存在媒體資料夾內卻沒被任何卡片使用的檔案：%d</string>
-    <string name="check_media_nohave">卡片有用到卻不再媒體資料夾內的檔案：%d</string>
     <string name="check_media_no_unused_missing">沒有發現任何未使用或是遺失的檔案</string>
-    <string name="check_media_db_updated">重建媒體資料庫</string>
     <string name="check_media_delete_unused">刪除未使用的</string>
     <string name="delete_media_message">刪除媒體中&#8230;</string>
     <string name="delete_media_result_title">克漏字結果</string>
diff --git a/AnkiDroid/src/main/res/values-zu/03-dialogs.xml b/AnkiDroid/src/main/res/values-zu/03-dialogs.xml
index 4f39a0bafe0a..d156c86298d1 100644
--- a/AnkiDroid/src/main/res/values-zu/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-zu/03-dialogs.xml
@@ -55,7 +55,6 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="unused_strings">\n\nUnused files:\n</string>
     <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
     <plurals name="reposition_card_dialog_acknowledge">
@@ -112,10 +111,7 @@
     <string name="check_media_message">Checking media&#8230;</string>
     <string name="check_media_acknowledge">Media checked</string>
     <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_unused">Files in media folder but not used by any cards: %d</string>
-    <string name="check_media_nohave">Files used on cards but not in media folder: %d</string>
     <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_db_updated">Media database rebuilt</string>
     <string name="check_media_delete_unused">Delete unused</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>

From 1d24177bf8f775fd8b6757660431c46ad9b1f993 Mon Sep 17 00:00:00 2001
From: Mike Hardy <github@mikehardy.net>
Date: Mon, 10 Feb 2025 14:51:58 +0000
Subject: [PATCH 040/200] Bumped version to 2.21alpha12

---
 AnkiDroid/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AnkiDroid/build.gradle b/AnkiDroid/build.gradle
index 9028decd10b8..ea75cd815017 100644
--- a/AnkiDroid/build.gradle
+++ b/AnkiDroid/build.gradle
@@ -85,8 +85,8 @@ android {
         //
         // This ensures the correct ordering between the various types of releases (dev < alpha < beta < release) which is
         // needed for upgrades to be offered correctly.
-        versionCode=22100111
-        versionName="2.21alpha11"
+        versionCode=22100112
+        versionName="2.21alpha12"
         minSdk libs.versions.minSdk.get().toInteger()
 
         // After #13695: change .tests_emulator.yml

From c77e4ff2a37ccc23ab3df305a2d02d625a4a2595 Mon Sep 17 00:00:00 2001
From: lukstbit <52494258+lukstbit@users.noreply.github.com>
Date: Mon, 10 Feb 2025 19:07:58 +0200
Subject: [PATCH 041/200] Allow fine tuning the unbury action in congrats
 screen

Follows desktop code to present the user with a dialog to
select what to unbury based on the info returned for the
congrats screen.

See https://github.com/ankitects/anki/blob/acaeee91fa853e4a7a78dcddbb832d009ec3529a/qt/aqt/overview.py#L151-L174
---
 .../java/com/ichi2/anki/pages/CongratsPage.kt | 69 ++++++++++++++++---
 1 file changed, 61 insertions(+), 8 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/pages/CongratsPage.kt b/AnkiDroid/src/main/java/com/ichi2/anki/pages/CongratsPage.kt
index 17b2dd02ba46..514a214247bc 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/pages/CongratsPage.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/pages/CongratsPage.kt
@@ -27,6 +27,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import anki.collection.OpChanges
+import anki.scheduler.UnburyDeckRequest
 import com.google.android.material.appbar.MaterialToolbar
 import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.CollectionManager.withCol
@@ -49,6 +50,9 @@ import com.ichi2.anki.utils.TIME_MINUTE
 import com.ichi2.libanki.ChangeManager
 import com.ichi2.libanki.DeckId
 import com.ichi2.libanki.undoableOp
+import com.ichi2.utils.listItemsAndMessage
+import com.ichi2.utils.negativeButton
+import com.ichi2.utils.show
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -91,9 +95,36 @@ class CongratsPage :
                     .show()
             }.launchIn(lifecycleScope)
 
-        viewModel.openStudyOptions
-            .onEach { openStudyOptionsAndFinish() }
-            .launchIn(lifecycleScope)
+        viewModel.unburyState
+            .onEach { state ->
+                when (state) {
+                    UnburyState.OpenStudy -> openStudyOptionsAndFinish()
+                    UnburyState.SelectMode -> {
+                        val unburyOptions =
+                            mutableListOf(
+                                TR.studyingManuallyBuriedCards(),
+                                TR.studyingBuriedSiblings(),
+                                TR.studyingAllBuriedCards(),
+                            )
+                        AlertDialog.Builder(requireContext()).show {
+                            negativeButton(R.string.dialog_cancel)
+                            listItemsAndMessage(
+                                TR.studyingWhatWouldYouLikeToUnbury(),
+                                unburyOptions,
+                            ) { _, position ->
+                                val mode =
+                                    when (position) {
+                                        0 -> UnburyDeckRequest.Mode.USER_ONLY
+                                        1 -> UnburyDeckRequest.Mode.SCHED_ONLY
+                                        2 -> UnburyDeckRequest.Mode.ALL
+                                        else -> error("Unhandled unbury option: ${unburyOptions[position]}")
+                                    }
+                                viewModel.onUnburyModeSelected(mode)
+                            }
+                        }
+                    }
+                }
+            }.launchIn(lifecycleScope)
 
         viewModel.deckOptionsDestination
             .flowWithLifecycle(lifecycle)
@@ -112,7 +143,7 @@ class CongratsPage :
             }
         }
 
-        setFragmentResultListener(CustomStudyAction.REQUEST_KEY) { requestKey, bundle ->
+        setFragmentResultListener(CustomStudyAction.REQUEST_KEY) { _, bundle ->
             when (CustomStudyAction.fromBundle(bundle)) {
                 CustomStudyAction.CUSTOM_STUDY_SESSION,
                 CustomStudyAction.EXTEND_STUDY_LIMITS,
@@ -210,18 +241,34 @@ class CongratsViewModel :
     ViewModel(),
     OnErrorListener {
     override val onError = MutableSharedFlow<String>()
-    val openStudyOptions = MutableSharedFlow<Boolean>()
+    val unburyState = MutableSharedFlow<UnburyState>()
     val deckOptionsDestination = MutableSharedFlow<DeckOptionsDestination>()
 
     fun onUnbury() {
         launchCatchingIO {
-            undoableOp {
-                sched.unburyDeck(decks.getCurrentId())
+            // https://github.com/ankitects/anki/blob/acaeee91fa853e4a7a78dcddbb832d009ec3529a/qt/aqt/overview.py#L154
+            val congratsInfo = withCol { sched.congratulationsInfo() }
+            if (congratsInfo.haveSchedBuried && congratsInfo.haveUserBuried) {
+                unburyState.emit(UnburyState.SelectMode)
+                return@launchCatchingIO
             }
-            openStudyOptions.emit(true)
+            unburyAndStudy(UnburyDeckRequest.Mode.ALL)
+        }
+    }
+
+    fun onUnburyModeSelected(mode: UnburyDeckRequest.Mode) {
+        launchCatchingIO {
+            unburyAndStudy(mode)
         }
     }
 
+    private suspend fun unburyAndStudy(mode: UnburyDeckRequest.Mode) {
+        undoableOp {
+            sched.unburyDeck(decks.getCurrentId(), mode)
+        }
+        unburyState.emit(UnburyState.OpenStudy)
+    }
+
     fun onDeckOptions() {
         launchCatchingIO {
             val deckId = withCol { decks.getCurrentId() }
@@ -242,3 +289,9 @@ class DeckOptionsDestination(
             DeckOptions.getIntent(context, deckId)
         }
 }
+
+sealed class UnburyState {
+    data object OpenStudy : UnburyState()
+
+    data object SelectMode : UnburyState()
+}

From c5ecff9d9cdcd827ec0acf041913ed501d19ed20 Mon Sep 17 00:00:00 2001
From: Anoop <xenonoxidee@gmail.com>
Date: Wed, 12 Feb 2025 20:19:04 +0530
Subject: [PATCH 042/200] Fix : Deck Picker Arrow doesn't rotate on expanding
 and collapsing the deck.

---
 .../src/main/java/com/ichi2/anki/widgets/DeckAdapter.kt   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/widgets/DeckAdapter.kt b/AnkiDroid/src/main/java/com/ichi2/anki/widgets/DeckAdapter.kt
index 18ef2e7b2385..a6a59b4be68f 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/widgets/DeckAdapter.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/widgets/DeckAdapter.kt
@@ -36,6 +36,7 @@ import com.ichi2.libanki.DeckId
 import com.ichi2.libanki.sched.DeckNode
 import kotlinx.coroutines.runBlocking
 import net.ankiweb.rsdroid.RustCleanup
+import timber.log.Timber
 
 /**
  * A [RecyclerView.Adapter] used to show the list of decks inside [com.ichi2.anki.DeckPicker].
@@ -153,7 +154,10 @@ class DeckAdapter(
             deckLayout.setPaddingRelative(startPadding, 0, endPadding, 0)
         }
         if (node.children.isNotEmpty()) {
-            holder.deckExpander.setOnClickListener { onDeckChildrenToggled(node.did) }
+            holder.deckExpander.setOnClickListener {
+                onDeckChildrenToggled(node.did)
+                notifyItemChanged(position) // Ensure UI updates
+            }
         } else {
             holder.deckExpander.isClickable = false
             holder.deckExpander.setOnClickListener(null)
@@ -201,9 +205,11 @@ class DeckAdapter(
             if (node.collapsed) {
                 expander.setImageDrawable(expandImage)
                 expander.contentDescription = expander.context.getString(R.string.expand)
+                Timber.d("Deck Collapsed")
             } else {
                 expander.setImageDrawable(collapseImage)
                 expander.contentDescription = expander.context.getString(R.string.collapse)
+                Timber.d("Deck Expanded")
             }
         } else {
             expander.visibility = View.INVISIBLE

From c3142aeb5c7dbcfd70306ccceb534f6efe7a24d1 Mon Sep 17 00:00:00 2001
From: Ashish Yadav <48384865+criticalAY@users.noreply.github.com>
Date: Thu, 6 Feb 2025 21:51:09 +0530
Subject: [PATCH 043/200] refactor: format indent for card browser xml

---
 .../res/layout/browser_options_dialog.xml     | 56 +++++++++----------
 1 file changed, 25 insertions(+), 31 deletions(-)

diff --git a/AnkiDroid/src/main/res/layout/browser_options_dialog.xml b/AnkiDroid/src/main/res/layout/browser_options_dialog.xml
index 65ffac30b619..578a2b9dc278 100644
--- a/AnkiDroid/src/main/res/layout/browser_options_dialog.xml
+++ b/AnkiDroid/src/main/res/layout/browser_options_dialog.xml
@@ -2,92 +2,90 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools">
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-    <LinearLayout
+        <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:layout_margin="8dp">
 
-        <TextView
+            <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/toggle_cards_notes"
             android:textStyle="bold"
             android:layout_marginHorizontal="16dp" />
 
-        <RadioGroup
+            <RadioGroup
             android:id="@+id/select_browser_mode"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:layout_marginHorizontal="16dp">
 
-            <RadioButton
+                <RadioButton
                 android:id="@+id/select_cards_mode"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/show_cards" />
 
-            <RadioButton
+                <RadioButton
                 android:id="@+id/select_notes_mode"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/show_notes" />
+            </RadioGroup>
+        </LinearLayout>
 
-        </RadioGroup>
-    </LinearLayout>
-
-    <LinearLayout
+        <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:layout_margin="8dp">
 
-        <TextView
+            <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/card_browser_truncate"
             android:textStyle="bold"
             android:layout_marginHorizontal="16dp" />
 
-        <CheckBox
+            <CheckBox
             android:id="@+id/truncate_checkbox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/card_browser_truncate"
             android:layout_marginHorizontal="16dp" />
 
-        <TextView
+            <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/truncate_content_help"
             android:textColor="?android:attr/textColorSecondary"
             android:layout_marginHorizontal="16dp" />
+        </LinearLayout>
 
-    </LinearLayout>
-
-    <LinearLayout
+        <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:layout_margin="8dp">
 
-        <com.ichi2.ui.FixedTextView
+            <com.ichi2.ui.FixedTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/browse_manage_columns_main_heading"
             android:textStyle="bold"
             android:layout_marginHorizontal="16dp" />
 
-        <!-- full width to increase touch target size on tablets -->
-        <com.google.android.material.button.MaterialButton
+            <!-- full width to increase touch target size on tablets -->
+            <com.google.android.material.button.MaterialButton
             android:id="@+id/manage_columns_button"
             style="@style/Widget.Material3.Button.TextButton"
             android:layout_width="match_parent"
@@ -98,23 +96,22 @@
             android:layout_marginHorizontal="16dp"
             android:singleLine="true"
             android:text="@string/browse_manage_columns" />
+        </LinearLayout>
 
-    </LinearLayout>
-
-    <LinearLayout
+        <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:layout_margin="8dp">
 
-        <TextView
+            <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/menu_flag"
             android:textStyle="bold"
             android:layout_marginHorizontal="16dp" />
 
-        <LinearLayout
+            <LinearLayout
             android:gravity="center"
             android:minHeight="?attr/listPreferredItemHeightSmall"
             android:id="@+id/action_rename_flag"
@@ -124,20 +121,17 @@
             android:orientation="horizontal"
             android:layout_height="match_parent">
 
-            <ImageView
+                <ImageView
                 android:layout_width="wrap_content"
                 android:src="@drawable/ic_flag_transparent"
                 android:layout_height="match_parent"/>
 
-            <com.ichi2.ui.FixedTextView
+                <com.ichi2.ui.FixedTextView
                 android:layout_marginStart="4dp"
                 android:layout_width="match_parent"
                 android:text="@string/rename_flag"
                 android:layout_height="wrap_content"/>
+            </LinearLayout>
         </LinearLayout>
-
-      </LinearLayout>
-
     </LinearLayout>
-
 </ScrollView>

From 7d31c3e573cdc46caecda5569c87e3a5d7283045 Mon Sep 17 00:00:00 2001
From: Ashish Yadav <48384865+criticalAY@users.noreply.github.com>
Date: Thu, 6 Feb 2025 21:52:34 +0530
Subject: [PATCH 044/200] feat: add new browsing category in dialog xml file

---
 .../res/layout/browser_options_dialog.xml     | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/AnkiDroid/src/main/res/layout/browser_options_dialog.xml b/AnkiDroid/src/main/res/layout/browser_options_dialog.xml
index 578a2b9dc278..fc706929b477 100644
--- a/AnkiDroid/src/main/res/layout/browser_options_dialog.xml
+++ b/AnkiDroid/src/main/res/layout/browser_options_dialog.xml
@@ -71,6 +71,45 @@
             android:layout_marginHorizontal="16dp" />
         </LinearLayout>
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_marginBottom="8dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                tools:text="Browsing"
+                android:textStyle="bold"
+                android:layout_marginHorizontal="16dp" />
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/default_search_input_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                app:expandedHintEnabled="false"
+                app:endIconMode="clear_text"
+                android:layout_marginHorizontal="16dp"
+                tools:hint="Default search text">
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/default_search_text"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    tools:hint="eg. 'deck:current'"
+                    android:inputType="text" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <CheckBox
+                android:id="@+id/ignore_accents_checkbox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="16dp"
+                tools:text="Ignore accents in search (slower)"/>
+        </LinearLayout>
+
         <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

From 2ffad67b07a9cc13d3d7b6def6eeeeec14f05db2 Mon Sep 17 00:00:00 2001
From: Ashish Yadav <48384865+criticalAY@users.noreply.github.com>
Date: Thu, 6 Feb 2025 22:04:27 +0530
Subject: [PATCH 045/200] feat: add new browsing preference option in the
 option dialog

---
 .../anki/browser/CardBrowserViewModel.kt      | 52 ++++++++++++++++++-
 .../anki/dialogs/BrowserOptionsDialog.kt      | 28 ++++++++++
 .../java/com/ichi2/anki/utils/ext/String.kt   | 44 ++++++++++++++++
 .../src/main/java/com/ichi2/libanki/Config.kt | 10 +++-
 .../res/layout/browser_options_dialog.xml     |  1 +
 5 files changed, 132 insertions(+), 3 deletions(-)
 create mode 100644 AnkiDroid/src/main/java/com/ichi2/anki/utils/ext/String.kt

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserViewModel.kt b/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserViewModel.kt
index 5a6ca4dd7356..24a22b37acca 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserViewModel.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserViewModel.kt
@@ -26,6 +26,7 @@ import androidx.lifecycle.viewmodel.initializer
 import androidx.lifecycle.viewmodel.viewModelFactory
 import anki.collection.OpChanges
 import anki.collection.OpChangesWithCount
+import anki.config.ConfigKey
 import anki.search.BrowserColumns
 import anki.search.BrowserRow
 import com.ichi2.anki.AnkiDroidApp
@@ -46,6 +47,7 @@ import com.ichi2.anki.model.CardsOrNotes.NOTES
 import com.ichi2.anki.model.SortType
 import com.ichi2.anki.pages.CardInfoDestination
 import com.ichi2.anki.preferences.SharedPreferencesProvider
+import com.ichi2.anki.utils.ext.normalizeForSearch
 import com.ichi2.annotations.NeedsTest
 import com.ichi2.libanki.Card
 import com.ichi2.libanki.CardId
@@ -93,6 +95,7 @@ import kotlin.math.min
 @NeedsTest("columIndex1/2 config is not not updated on init")
 @NeedsTest("13442: selected deck is not changed, as this affects the reviewer")
 @NeedsTest("search is called after launch()")
+@NeedsTest("default search text updated on init")
 class CardBrowserViewModel(
     private val lastDeckIdRepository: LastDeckIdRepository,
     private val cacheDir: File,
@@ -180,6 +183,10 @@ class CardBrowserViewModel(
         MutableStateFlow(sharedPrefs().getBoolean("isTruncated", false))
     val isTruncated get() = flowOfIsTruncated.value
 
+    var shouldIgnoreAccents: Boolean = false
+
+    var defaultBrowserSearch: String? = null
+
     private val _selectedRows: MutableSet<CardOrNoteId> = Collections.synchronizedSet(LinkedHashSet())
 
     // immutable accessor for _selectedRows
@@ -209,6 +216,12 @@ class CardBrowserViewModel(
     val lastDeckId: DeckId?
         get() = lastDeckIdRepository.lastDeckId
 
+    private suspend fun initDefaultSearch() =
+        withCol {
+            shouldIgnoreAccents = config.getBool(ConfigKey.Bool.IGNORE_ACCENTS_IN_SEARCH)
+            defaultBrowserSearch = config.getString(ConfigKey.String.DEFAULT_SEARCH_TEXT)
+        }
+
     suspend fun setDeckId(deckId: DeckId) {
         Timber.i("setting deck: %d", deckId)
         lastDeckIdRepository.lastDeckId = deckId
@@ -328,6 +341,17 @@ class CardBrowserViewModel(
             }.launchIn(viewModelScope)
 
         viewModelScope.launch {
+            initDefaultSearch()
+            // Prioritize intent-based search
+            if (searchTerms.isEmpty()) {
+                val defaultSearchText = withCol { config.getString(ConfigKey.String.DEFAULT_SEARCH_TEXT) }
+
+                Timber.d("Default search term text: $defaultSearchText")
+                if (defaultSearchText.isNotEmpty()) {
+                    searchTerms = defaultSearchText
+                }
+            }
+
             val initialDeckId = if (selectAllDecks) ALL_DECKS_ID else getInitialDeck()
             // PERF: slightly inefficient if the source was lastDeckId
             setDeckId(initialDeckId)
@@ -457,6 +481,22 @@ class CardBrowserViewModel(
         }
     }
 
+    fun setIgnoreAccents(value: Boolean) {
+        Timber.d("Setting ignore accent in search to: $value")
+        viewModelScope.launch {
+            shouldIgnoreAccents = value
+            withCol { config.setBool(ConfigKey.Bool.IGNORE_ACCENTS_IN_SEARCH, value) }
+        }
+    }
+
+    fun setDefaultSearchText(text: String) {
+        Timber.d("Setting default search text to: $text")
+        viewModelScope.launch {
+            defaultBrowserSearch = text
+            withCol { config.setString(ConfigKey.String.DEFAULT_SEARCH_TEXT, text) }
+        }
+    }
+
     fun selectAll() {
         if (_selectedRows.addAll(cards)) {
             Timber.d("selecting all: %d item(s)", cards.size)
@@ -898,8 +938,16 @@ class CardBrowserViewModel(
             Timber.d("skipping duplicate search: forceRefresh is false")
             return
         }
-        searchTerms = searchQuery
-        launchSearchForCards()
+        searchTerms =
+            if (shouldIgnoreAccents) {
+                searchQuery.normalizeForSearch()
+            } else {
+                searchQuery
+            }
+
+        viewModelScope.launch {
+            launchSearchForCards()
+        }
     }
 
     /**
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/BrowserOptionsDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/BrowserOptionsDialog.kt
index c8e29061ba37..ef2e95bb3b00 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/BrowserOptionsDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/BrowserOptionsDialog.kt
@@ -25,11 +25,15 @@ import android.widget.CheckBox
 import android.widget.LinearLayout
 import android.widget.RadioButton
 import android.widget.RadioGroup
+import android.widget.TextView
 import androidx.annotation.IdRes
 import androidx.appcompat.app.AppCompatDialogFragment
 import androidx.core.os.bundleOf
 import androidx.fragment.app.activityViewModels
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.textfield.TextInputEditText
+import com.google.android.material.textfield.TextInputLayout
+import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.R
 import com.ichi2.anki.browser.BrowserColumnSelectionFragment
 import com.ichi2.anki.browser.CardBrowserViewModel
@@ -61,6 +65,16 @@ class BrowserOptionsDialog : AppCompatDialogFragment() {
         if (newTruncate != isTruncated) {
             viewModel.setTruncated(newTruncate)
         }
+
+        val newIgnoreAccent = dialogView.findViewById<CheckBox>(R.id.ignore_accents_checkbox).isChecked
+        if (newIgnoreAccent != viewModel.shouldIgnoreAccents) {
+            viewModel.setIgnoreAccents(newIgnoreAccent)
+        }
+
+        val newSearchValue = dialogView.findViewById<TextInputEditText>(R.id.default_search_text).text?.toString() ?: ""
+        if (newSearchValue != viewModel.defaultBrowserSearch) {
+            viewModel.setDefaultSearchText(newSearchValue)
+        }
     }
 
     private val cardsOrNotes by lazy {
@@ -105,6 +119,20 @@ class BrowserOptionsDialog : AppCompatDialogFragment() {
             openColumnManager()
         }
 
+        dialogView.findViewById<CheckBox>(R.id.ignore_accents_checkbox).apply {
+            text = TR.preferencesIgnoreAccentsInSearch()
+            isChecked = viewModel.shouldIgnoreAccents
+        }
+
+        dialogView.findViewById<TextInputLayout>(R.id.default_search_input_layout).hint = TR.preferencesDefaultSearchText()
+
+        dialogView.findViewById<TextView>(R.id.browsing_text_view).text = TR.preferencesBrowsing()
+
+        dialogView.findViewById<TextInputEditText>(R.id.default_search_text).apply {
+            hint = TR.preferencesDefaultSearchTextExample()
+            setText(viewModel.defaultBrowserSearch ?: "")
+        }
+
         return MaterialAlertDialogBuilder(requireContext()).run {
             this.setView(dialogView)
             this.setTitle(getString(R.string.browser_options_dialog_heading))
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/utils/ext/String.kt b/AnkiDroid/src/main/java/com/ichi2/anki/utils/ext/String.kt
new file mode 100644
index 000000000000..2791c82e082a
--- /dev/null
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/utils/ext/String.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2024 Ashish Yadav <mailtoashish693@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.ichi2.anki.utils.ext
+
+import java.text.Normalizer
+import java.util.regex.Pattern
+
+private val DIACRITICAL_MARKS_PATTERN = Pattern.compile("\\p{InCombiningDiacriticalMarks}+")
+
+/**
+ * Normalizes the given string by removing diacritical marks (accents) to enable accent-insensitive searches.
+ *
+ * This method uses Unicode normalization in **NFD (Normalization Form Decomposition)** mode, which separates
+ * base characters from their diacritical marks. Then, it removes all combining diacritical marks using a regex.
+ *
+ * Example usage:
+ * ```
+ * val input = "café naïve résumé"
+ * val normalized = input.normalizeForSearch()
+ * println(normalized) // Output: "cafe naive resume"
+ * ```
+ *
+ * @receiver The input string that may contain accented characters.
+ * @return A new string with accents removed.
+ */
+fun String.normalizeForSearch(): String {
+    val normalized = Normalizer.normalize(this, Normalizer.Form.NFD)
+    return DIACRITICAL_MARKS_PATTERN.matcher(normalized).replaceAll("")
+}
diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/Config.kt b/AnkiDroid/src/main/java/com/ichi2/libanki/Config.kt
index 5760c6c4705d..01be7ce71b41 100644
--- a/AnkiDroid/src/main/java/com/ichi2/libanki/Config.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/libanki/Config.kt
@@ -20,7 +20,6 @@ import anki.config.ConfigKey
 import com.google.protobuf.kotlin.toByteStringUtf8
 import com.ichi2.libanki.utils.NotInLibAnki
 import kotlinx.serialization.SerializationException
-import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import net.ankiweb.rsdroid.Backend
 import net.ankiweb.rsdroid.exceptions.BackendNotFoundException
@@ -66,6 +65,15 @@ class Config(
         backend.setConfigBool(key, value, false)
     }
 
+    fun getString(key: ConfigKey.String): String = backend.getConfigString(key)
+
+    fun setString(
+        key: ConfigKey.String,
+        value: String,
+    ) {
+        backend.setConfigString(key, value, false)
+    }
+
     @NotInLibAnki
     inline fun <reified T> get(
         key: String,
diff --git a/AnkiDroid/src/main/res/layout/browser_options_dialog.xml b/AnkiDroid/src/main/res/layout/browser_options_dialog.xml
index fc706929b477..99e9d476d708 100644
--- a/AnkiDroid/src/main/res/layout/browser_options_dialog.xml
+++ b/AnkiDroid/src/main/res/layout/browser_options_dialog.xml
@@ -78,6 +78,7 @@
             android:orientation="vertical">
 
             <TextView
+                android:id="@+id/browsing_text_view"
                 android:layout_marginBottom="8dp"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"

From 981557546a59edf84c2616c5936f2e131d6eac6c Mon Sep 17 00:00:00 2001
From: Ashish Yadav <48384865+criticalAY@users.noreply.github.com>
Date: Thu, 6 Feb 2025 22:11:34 +0530
Subject: [PATCH 046/200] test: unit test for string normalization

---
 .../anki/browser/StringNormalizationTest.kt   | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 AnkiDroid/src/test/java/com/ichi2/anki/browser/StringNormalizationTest.kt

diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/browser/StringNormalizationTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/browser/StringNormalizationTest.kt
new file mode 100644
index 000000000000..a134684cdf0d
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/browser/StringNormalizationTest.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2025 Ashish Yadav <mailtoashish693@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.ichi2.anki.browser
+
+import com.ichi2.anki.utils.ext.normalizeForSearch
+import org.junit.Assert.assertEquals
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.CsvSource
+
+class StringNormalizationTest {
+    @ParameterizedTest
+    @CsvSource(
+        "café Ábaco naïve résumé, cafe Abaco naive resume",
+        "élégant déjà vu, elegant deja vu",
+        "hello world, hello world",
+        "'', ''",
+        "1234!@# café, 1234!@# cafe",
+    )
+    fun `test normalizeForSearch`(
+        input: String,
+        expected: String,
+    ) {
+        assertEquals(expected, input.normalizeForSearch())
+    }
+}

From 94e4b47dd3e854d25150175a2bbeed013430b8a5 Mon Sep 17 00:00:00 2001
From: AnkiDroid Translations <ankidroid@ankidroid.org>
Date: Thu, 13 Feb 2025 22:55:41 +0000
Subject: [PATCH 047/200] Updated strings from Crowdin

---
 AnkiDroid/src/main/res/values-es-rAR/01-core.xml     |  8 ++++----
 AnkiDroid/src/main/res/values-es-rAR/02-strings.xml  |  2 +-
 .../src/main/res/values-es-rAR/10-preferences.xml    |  8 ++++----
 AnkiDroid/src/main/res/values-es-rES/01-core.xml     | 10 +++++-----
 AnkiDroid/src/main/res/values-es-rES/02-strings.xml  |  6 +++---
 .../src/main/res/values-es-rES/07-cardbrowser.xml    | 12 ++++++------
 .../src/main/res/values-es-rES/10-preferences.xml    |  8 ++++----
 AnkiDroid/src/main/res/values-ja/02-strings.xml      |  2 +-
 AnkiDroid/src/main/res/values-ja/10-preferences.xml  |  2 +-
 AnkiDroid/src/main/res/values-pt-rBR/01-core.xml     |  2 +-
 AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml  |  2 +-
 AnkiDroid/src/main/res/values-pt-rBR/03-dialogs.xml  |  6 +++---
 .../src/main/res/values-pt-rPT/10-preferences.xml    |  2 +-
 13 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/AnkiDroid/src/main/res/values-es-rAR/01-core.xml b/AnkiDroid/src/main/res/values-es-rAR/01-core.xml
index fc6903591017..1c38340f8293 100644
--- a/AnkiDroid/src/main/res/values-es-rAR/01-core.xml
+++ b/AnkiDroid/src/main/res/values-es-rAR/01-core.xml
@@ -129,7 +129,7 @@
     <string name="empty_deck">Este mazo está vacío</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Búsqueda de Mazo</string>
     <string name="invalid_deck_name">Nombre de mazo inválido</string>
-    <string name="studyoptions_congrats_finished">Congratulations! You have finished for today.</string>
+    <string name="studyoptions_congrats_finished">¡Felicitaciones! Has finalizado por hoy.</string>
     <string name="studyoptions_congrats_next_due_in" comment="The param will be replaced with \'The next card will be ready in X time\'">¡El mazo ha terminado por ahora! %s</string>
     <string name="studyoptions_no_cards_due">Aún no hay tarjetas programadas.</string>
     <string name="sd_card_not_mounted">El almacenamiento del dispositivo no se encuentra montado</string>
@@ -181,9 +181,9 @@
     <string name="sync_conflict_title_new">Seleccionar colección a mantener</string>
     <string name="sync_conflict_replace_title">Reemplazar colección</string>
     <!-- Generic errors -->
-    <string name="error__etc__cannot_write_to_or_create_file">Cannot write to or create file %s</string>
+    <string name="error__etc__cannot_write_to_or_create_file">No se puede editar o crear el archivo %s</string>
     <string name="directory_inaccessible_after_uninstall" comment="Dialog title if AnkiDroid can\'t access the collection once the app is installed">Colección inaccesible</string>
-    <string name="directory_inaccessible_after_uninstall_summary" comment="the parameter is the path to the AnkiDroid folder. Typically /storage/emulated/0/AnkiDroid">No podemos acceder a tu colección después de desinstalar AnkiDroid debido a un cambio en la política de Play Store\n\nTus datos están seguros y pueden ser restaurados. Están ubicados en\n%s\n\nSelecciona una opción debajo para restaurar:</string>
+    <string name="directory_inaccessible_after_uninstall_summary" comment="the parameter is the path to the AnkiDroid folder. Typically /storage/emulated/0/AnkiDroid">No podemos acceder a tu colección después de desinstalar AnkiDroid debido a un cambio en la política de la Play Store\n\nTus datos están seguros y pueden ser restaurados. Están ubicados en\n%s\n\nSelecciona una opción para restaurar:</string>
     <string name="directory_revoked_after_inactivity" comment="the first parameter is WRITE_EXTERNAL_STORAGE the second parameter is the path to the AnkiDroid folder. Typically /storage/emulated/0/AnkiDroid">Android ha eliminado el permiso %1$s de AnkiDroid debido a la inactividad de la aplicación.\n\nTus datos están seguros y pueden ser restaurados. Está ubicado en\n%2$s\n\nSeleccione una de las opciones siguientes para restaurar:</string>
     <string name="restore_data_from_ankiweb">Restaurar desde AnkiWeb (recomendado)</string>
     <string name="install_non_play_store_ankidroid_recommended">Restaurar acceso a la carpeta (recomendado)</string>
@@ -199,5 +199,5 @@
     <string name="image_occlusion">Imagen oculta</string>
     <string name="remove_account" comment="open a website to start the deletion of an AnkiWeb account">Quitar cuenta</string>
     <!-- Instant Note Editor -->
-    <string name="instant_card" comment="This does not need to be translated literally, translate the concept of quickly adding a Cloze note with a popup. Used in the Android system context menu/share dialog.">Instant card</string>
+    <string name="instant_card" comment="This does not need to be translated literally, translate the concept of quickly adding a Cloze note with a popup. Used in the Android system context menu/share dialog.">Tarjeta instantánea</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-es-rAR/02-strings.xml b/AnkiDroid/src/main/res/values-es-rAR/02-strings.xml
index 0a6c45396b8a..13d992bcd7fd 100644
--- a/AnkiDroid/src/main/res/values-es-rAR/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-es-rAR/02-strings.xml
@@ -301,7 +301,7 @@
     <string name="show_notes" comment="Label for toggle notes button in BrowserOptionsDialog">Notas</string>
     <string name="toggle_cards_notes">Cambiar tarjetas/notas</string>
     <string name="truncate_content_help">Limita la altura de cada fila del navegador de tal manera que solo muestra las primeras 3 líneas de contenido</string>
-    <string name="browser_options_dialog_heading">Browser options</string>
+    <string name="browser_options_dialog_heading">Opciones del explorador</string>
     <string name="audio_saved">Grabación guardada</string>
     <string name="deleting_selected_notes">Eliminando notas seleccionadas</string>
     <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Toca una voz para escucharla
diff --git a/AnkiDroid/src/main/res/values-es-rAR/10-preferences.xml b/AnkiDroid/src/main/res/values-es-rAR/10-preferences.xml
index 1812f53607ca..6aa6a9ae2784 100644
--- a/AnkiDroid/src/main/res/values-es-rAR/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-es-rAR/10-preferences.xml
@@ -97,7 +97,7 @@
     <string name="gestures_summ">Asignar gestos a acciones tales como contestar o editar tarjetas.</string>
     <string name="gestures_corner_touch" maxLength="41">Toque de 9 puntos</string>
     <string name="gestures_corner_touch_summary">Permitir gestos táctiles en las esquinas de pantalla</string>
-    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Mostrar atajos del teclado</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Panel de navegación a pantalla completa</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Abrir el panel de navegación cuando se desliza a la derecha desde cualquier lugar de la pantalla</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Ninguno</string>
@@ -367,9 +367,9 @@ Puedes restaurar una colección desde una copia de seguridad en el menú de la l
     <string name="ignore_display_cutout" maxLength="41">Ignorar el recorte de la pantalla</string>
     <string name="hide_answer_buttons" maxLength="41">Ocultar botones de respuesta</string>
     <string name="hide_hard_and_easy" maxLength="41">Ocultar los botones \"Difícil\" y \"Fácil\"</string>
-    <string name="reviewer_frame_style" maxLength="41">Frame style</string>
-    <string name="reviewer_frame_style_card" maxLength="41" comment="Style name of the \'Card\' card frame of the Reviewer">Card</string>
-    <string name="reviewer_frame_style_box" maxLength="41" comment="Style name of the \'Box\' card frame of the Reviewer">Box</string>
+    <string name="reviewer_frame_style" maxLength="41">Estilo del marco</string>
+    <string name="reviewer_frame_style_card" maxLength="41" comment="Style name of the \'Card\' card frame of the Reviewer">Tarjeta</string>
+    <string name="reviewer_frame_style_box" maxLength="41" comment="Style name of the \'Box\' card frame of the Reviewer">Caja</string>
     <!--Keyboard shortcuts dialog-->
     <string name="open_settings" comment="Description of the shortcut that opens the app settings">Abrir la configuración</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-es-rES/01-core.xml b/AnkiDroid/src/main/res/values-es-rES/01-core.xml
index 0ecdd219b035..9b184b6e9d0d 100644
--- a/AnkiDroid/src/main/res/values-es-rES/01-core.xml
+++ b/AnkiDroid/src/main/res/values-es-rES/01-core.xml
@@ -62,7 +62,7 @@
     </plurals>
     <plurals name="reviewer_window_title_hours_new">
         <item quantity="one">%1$d hora %2$d restante</item>
-        <item quantity="other">%1$d horas %2$d restante</item>
+        <item quantity="other">%1$d horas %2$d restantes</item>
     </plurals>
     <plurals name="reviewer_window_title_days_new">
         <item quantity="one">%1$d día %2$dh restante</item>
@@ -129,7 +129,7 @@
     <string name="empty_deck">Este mazo está vacío</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Búsqueda de Mazo</string>
     <string name="invalid_deck_name">Nombre de mazo no válido</string>
-    <string name="studyoptions_congrats_finished">Congratulations! You have finished for today.</string>
+    <string name="studyoptions_congrats_finished">¡Felicitaciones! Has finalizado por hoy.</string>
     <string name="studyoptions_congrats_next_due_in" comment="The param will be replaced with \'The next card will be ready in X time\'">¡El mazo ha terminado por ahora! %s</string>
     <string name="studyoptions_no_cards_due">Todavía no hay ninguna tarjeta pendiente.</string>
     <string name="sd_card_not_mounted">Almacenamiento del dispositivo no montado</string>
@@ -181,9 +181,9 @@
     <string name="sync_conflict_title_new">Selecciona la colección a mantener</string>
     <string name="sync_conflict_replace_title">Reemplazar colección</string>
     <!-- Generic errors -->
-    <string name="error__etc__cannot_write_to_or_create_file">Cannot write to or create file %s</string>
+    <string name="error__etc__cannot_write_to_or_create_file">No se puede editar o crear el archivo %s</string>
     <string name="directory_inaccessible_after_uninstall" comment="Dialog title if AnkiDroid can\'t access the collection once the app is installed">Colección inaccesible</string>
-    <string name="directory_inaccessible_after_uninstall_summary" comment="the parameter is the path to the AnkiDroid folder. Typically /storage/emulated/0/AnkiDroid">No podemos acceder a tu colección después de desinstalar AnkiDroid debido a un cambio en la política de Play Store\n\nTus datos están seguros y pueden ser restaurados. Están ubicados en\n%s\n\nSelecciona una opción debajo para restaurar:</string>
+    <string name="directory_inaccessible_after_uninstall_summary" comment="the parameter is the path to the AnkiDroid folder. Typically /storage/emulated/0/AnkiDroid">No podemos acceder a tu colección después de desinstalar AnkiDroid debido a un cambio en la política de la Play Store\n\nTus datos están seguros y pueden ser restaurados. Están ubicados en\n%s\n\nSelecciona una opción para restaurar:</string>
     <string name="directory_revoked_after_inactivity" comment="the first parameter is WRITE_EXTERNAL_STORAGE the second parameter is the path to the AnkiDroid folder. Typically /storage/emulated/0/AnkiDroid">Android ha eliminado el permiso %1$s de AnkiDroid debido a la inactividad de la aplicación.\n\nTus datos están seguros y pueden ser restaurados. Está ubicado en\n%2$s\n\nSeleccione una de las opciones siguientes para restaurar:</string>
     <string name="restore_data_from_ankiweb">Restaurar desde AnkiWeb (recomendado)</string>
     <string name="install_non_play_store_ankidroid_recommended">Restaurar acceso a la carpeta (recomendado)</string>
@@ -199,5 +199,5 @@
     <string name="image_occlusion">Imagen oculta</string>
     <string name="remove_account" comment="open a website to start the deletion of an AnkiWeb account">Quitar cuenta</string>
     <!-- Instant Note Editor -->
-    <string name="instant_card" comment="This does not need to be translated literally, translate the concept of quickly adding a Cloze note with a popup. Used in the Android system context menu/share dialog.">Instant card</string>
+    <string name="instant_card" comment="This does not need to be translated literally, translate the concept of quickly adding a Cloze note with a popup. Used in the Android system context menu/share dialog.">Tarjeta instantánea</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-es-rES/02-strings.xml b/AnkiDroid/src/main/res/values-es-rES/02-strings.xml
index 58b0c40c2df8..aacde7fae3f3 100644
--- a/AnkiDroid/src/main/res/values-es-rES/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-es-rES/02-strings.xml
@@ -87,8 +87,8 @@
         <item quantity="one">+%d enterrada</item>
         <item quantity="other">+%d enterradas</item>
     </plurals>
-    <string name="studyoptions_total_new_label">Total new cards</string>
-    <string name="studyoptions_total_label">Total cards</string>
+    <string name="studyoptions_total_new_label">Total de tarjetas nuevas</string>
+    <string name="studyoptions_total_label">Total de tarjetas</string>
     <!-- Card editor -->
     <string name="cardeditor_title_edit_card" maxLength="28">Editar nota</string>
     <string name="discard">Borrar </string>
@@ -301,7 +301,7 @@
     <string name="show_notes" comment="Label for toggle notes button in BrowserOptionsDialog">Notas</string>
     <string name="toggle_cards_notes">Cambiar tarjetas/notas</string>
     <string name="truncate_content_help">Limita la altura de cada fila del navegador de tal manera que solo muestra las primeras 3 líneas de contenido</string>
-    <string name="browser_options_dialog_heading">Browser options</string>
+    <string name="browser_options_dialog_heading">Opciones del explorador</string>
     <string name="audio_saved">Grabación guardada</string>
     <string name="deleting_selected_notes">Eliminando notas seleccionadas</string>
     <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Toca una voz para escucharla
diff --git a/AnkiDroid/src/main/res/values-es-rES/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-es-rES/07-cardbrowser.xml
index 172c40c560ec..031dcbaa45ed 100644
--- a/AnkiDroid/src/main/res/values-es-rES/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-es-rES/07-cardbrowser.xml
@@ -112,10 +112,10 @@
     <string name="edit_tags_dialog" comment="Description of the shortcut that opens the edit tags dialog">Editar diálogo de etiquetas</string>
     <string name="show_order_dialog" comment="Description of the shortcut that shows the order dialog">Mostrar diálogo de orden</string>
     <!-- Manage columns dialog -->
-    <string name="browse_manage_columns_main_heading">Columns</string>
-    <string name="browse_manage_columns">Manage columns</string>
-    <string name="user_active_columns">Active</string>
-    <string name="user_potential_columns">Available</string>
-    <string name="include_column">Include column</string>
-    <string name="exclude_column">Exclude column</string>
+    <string name="browse_manage_columns_main_heading">Columnas</string>
+    <string name="browse_manage_columns">Administrar columnas</string>
+    <string name="user_active_columns">Activas</string>
+    <string name="user_potential_columns">Disponibles</string>
+    <string name="include_column">Incluir columna</string>
+    <string name="exclude_column">Excluir columna</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-es-rES/10-preferences.xml b/AnkiDroid/src/main/res/values-es-rES/10-preferences.xml
index 65d807bcc812..f3e26035f378 100644
--- a/AnkiDroid/src/main/res/values-es-rES/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-es-rES/10-preferences.xml
@@ -97,7 +97,7 @@
     <string name="gestures_summ">Asignar gestos a acciones tales como contestar o editar tarjetas.</string>
     <string name="gestures_corner_touch" maxLength="41">Toque de 9 puntos</string>
     <string name="gestures_corner_touch_summary">Permitir gestos táctiles en las esquinas de pantalla</string>
-    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Mostrar atajos del teclado</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Panel de navegación a pantalla completa</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Abrir el cajón de navegación cuando se desliza a la derecha desde cualquier lugar de la pantalla</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Ninguno</string>
@@ -367,9 +367,9 @@ Puedes restaurar una colección desde una copia de seguridad en el menú de la l
     <string name="ignore_display_cutout" maxLength="41">Ignorar el recorte de la pantalla</string>
     <string name="hide_answer_buttons" maxLength="41">Ocultar botones de respuesta</string>
     <string name="hide_hard_and_easy" maxLength="41">Ocultar los botones \"Difícil\" y \"Fácil\"</string>
-    <string name="reviewer_frame_style" maxLength="41">Frame style</string>
-    <string name="reviewer_frame_style_card" maxLength="41" comment="Style name of the \'Card\' card frame of the Reviewer">Card</string>
-    <string name="reviewer_frame_style_box" maxLength="41" comment="Style name of the \'Box\' card frame of the Reviewer">Box</string>
+    <string name="reviewer_frame_style" maxLength="41">Estilo del marco</string>
+    <string name="reviewer_frame_style_card" maxLength="41" comment="Style name of the \'Card\' card frame of the Reviewer">Tarjeta</string>
+    <string name="reviewer_frame_style_box" maxLength="41" comment="Style name of the \'Box\' card frame of the Reviewer">Caja</string>
     <!--Keyboard shortcuts dialog-->
     <string name="open_settings" comment="Description of the shortcut that opens the app settings">Abrir la configuración</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ja/02-strings.xml b/AnkiDroid/src/main/res/values-ja/02-strings.xml
index d5dea8d5876e..48fbc26cdeb5 100644
--- a/AnkiDroid/src/main/res/values-ja/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ja/02-strings.xml
@@ -57,7 +57,7 @@
     <string name="add_new_filter_tags">タグフィルター / 新規タグ追加</string>
     <string name="add_tag" maxLength="28">タグを追加</string>
     <string name="check_all_tags" maxLength="28">すべて選択 / 選択をすべて解除</string>
-    <string name="filter_tags" maxLength="28">フィルター (前方一致検索)</string>
+    <string name="filter_tags" maxLength="28">タグを検索</string>
     <string name="no_tags">まだタグが一つも作成されていません</string>
     <string name="updated_version">バージョン%sにアップデートしました</string>
     <!-- Reviewer.kt -->
diff --git a/AnkiDroid/src/main/res/values-ja/10-preferences.xml b/AnkiDroid/src/main/res/values-ja/10-preferences.xml
index 3b4b74818d36..abb319252764 100644
--- a/AnkiDroid/src/main/res/values-ja/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ja/10-preferences.xml
@@ -96,7 +96,7 @@
     <string name="gestures_summ">回答やカード編集などの操作にジェスチャーを割り当てます</string>
     <string name="gestures_corner_touch" maxLength="41">タップを９種類にする</string>
     <string name="gestures_corner_touch_summary">カード画面内を縦３ × 横３の９エリアに区別して各エリアにタップジェスチャーを割り当てられます</string>
-    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">キーボードショートカットを表示</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">どこでもドロワー</string>
     <string name="gestures_fullscreen_nav_drawer_summary">アプリ画面上のどこからでも、右向きにスワイプするとナビゲーションドロワーが開きます</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">なし</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rBR/01-core.xml b/AnkiDroid/src/main/res/values-pt-rBR/01-core.xml
index 0d7aa8ec63dd..3e14a7429cac 100644
--- a/AnkiDroid/src/main/res/values-pt-rBR/01-core.xml
+++ b/AnkiDroid/src/main/res/values-pt-rBR/01-core.xml
@@ -129,7 +129,7 @@
     <string name="empty_deck">Este baralho está vazio</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Pesquisar baralho</string>
     <string name="invalid_deck_name">Nome do baralho inválido</string>
-    <string name="studyoptions_congrats_finished">Congratulations! You have finished for today.</string>
+    <string name="studyoptions_congrats_finished">Parabéns! Você terminou por hoje.</string>
     <string name="studyoptions_congrats_next_due_in" comment="The param will be replaced with \'The next card will be ready in X time\'">Baralho finalizado por enquanto! %s</string>
     <string name="studyoptions_no_cards_due">Sem cartões pendentes por enquanto.</string>
     <string name="sd_card_not_mounted">Armazenamento do dispositivo não montado</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml b/AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml
index 568390a8f950..4483e073dbff 100644
--- a/AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml
@@ -84,7 +84,7 @@
     <!-- Custom study options -->
     <string name="custom_study_limit_tags">Limitar a tags específicas</string>
     <plurals name="studyoptions_buried_count">
-        <item quantity="one">+%d enterrado</item>
+        <item quantity="one">+%d oculto</item>
         <item quantity="other">+%d buried</item>
     </plurals>
     <string name="studyoptions_total_new_label">Total new cards</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rBR/03-dialogs.xml b/AnkiDroid/src/main/res/values-pt-rBR/03-dialogs.xml
index 0300e2b06777..af3c604e648e 100644
--- a/AnkiDroid/src/main/res/values-pt-rBR/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-pt-rBR/03-dialogs.xml
@@ -50,9 +50,9 @@
     <string name="delete_deck_title">Excluir baralho?</string>
     <plurals name="delete_deck_message">
         <item quantity="one">Excluir todas as cartas em %1$s? Ele contém %2$d cartão</item>
-        <item quantity="other">Excluir todas as cartas em %1$s? Ele contém %2$d cartões</item>
+        <item quantity="other">Excluir todos os cartões em %1$s? Ele contém %2$d cartões</item>
     </plurals>
-    <string name="delete_cram_deck_message">Excluir baralho filtrado %s e enviar todas as cartas de volta para seus baralhos originais?</string>
+    <string name="delete_cram_deck_message">Excluir baralho filtrado %s e enviar todos os cartões de volta para seus baralhos originais?</string>
     <string name="no_tts_available_message">Nenhum idioma de texto para fala disponível</string>
     <string name="tts_no_tts">Não fale</string>
     <string name="reposition_card_dialog_title">Reposicionar novo cartão</string>
@@ -124,7 +124,7 @@
     <string name="tags_dialog_option_new_cards">Novos</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Pendentes</string>
     <!-- Empty cards -->
-    <string name="emtpy_cards_finding">Buscando cards vazios&#8230;</string>
+    <string name="emtpy_cards_finding">Buscando cartões vazios&#8230;</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Não foi possível obter permissão de microfone.</string>
     <string name="multimedia_editor_failed">Falha ao abrir o Editor de Multimídia</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rPT/10-preferences.xml b/AnkiDroid/src/main/res/values-pt-rPT/10-preferences.xml
index 4d3b51d376a2..c2cb83f98fd0 100644
--- a/AnkiDroid/src/main/res/values-pt-rPT/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-pt-rPT/10-preferences.xml
@@ -97,7 +97,7 @@
     <string name="gestures_summ">Atribuir gestos a ações tais como responder e editar fichas.</string>
     <string name="gestures_corner_touch" maxLength="41">Toque de 9 pontos</string>
     <string name="gestures_corner_touch_summary">Permitir gestos de toque nos cantos da tela</string>
-    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Mostrar teclas de atalho do teclado</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Painel de navegação no ecrã completo</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Abrir painel de navegação quando desliza para a direita de qualquer ponto do ecrã</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Nenhum</string>

From 4db4dfb15c18aa39edf70bab0414d391d5e39702 Mon Sep 17 00:00:00 2001
From: lukstbit <52494258+lukstbit@users.noreply.github.com>
Date: Tue, 11 Feb 2025 11:27:54 +0200
Subject: [PATCH 048/200]  Enable feature complete repositioning of new cards

Allows the same options and shows the same ui(almost) like desktop does.
---
 .../main/java/com/ichi2/anki/CardBrowser.kt   |  67 ++++++----
 .../anki/browser/CardBrowserViewModel.kt      |  39 ++++--
 .../anki/browser/RepositionCardFragment.kt    | 121 ++++++++++++++++++
 .../java/com/ichi2/libanki/sched/Scheduler.kt |   4 +
 .../res/layout/fragment_reposition_card.xml   |  88 +++++++++++++
 AnkiDroid/src/main/res/values/03-dialogs.xml  |   6 -
 .../src/main/res/values/sentence-case.xml     |   2 +-
 .../java/com/ichi2/anki/CardBrowserTest.kt    |  88 ++++++++++++-
 8 files changed, 368 insertions(+), 47 deletions(-)
 create mode 100644 AnkiDroid/src/main/java/com/ichi2/anki/browser/RepositionCardFragment.kt
 create mode 100644 AnkiDroid/src/main/res/layout/fragment_reposition_card.xml

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt b/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt
index bc1f66ad7fd3..a09b793278d5 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt
@@ -68,6 +68,8 @@ import com.ichi2.anki.browser.CardBrowserViewModel.SearchState.Searching
 import com.ichi2.anki.browser.CardOrNoteId
 import com.ichi2.anki.browser.ColumnHeading
 import com.ichi2.anki.browser.PreviewerIdsFile
+import com.ichi2.anki.browser.RepositionCardFragment
+import com.ichi2.anki.browser.RepositionCardFragment.Companion.REQUEST_REPOSITION_NEW_CARDS
 import com.ichi2.anki.browser.RepositionCardsRequest.ContainsNonNewCardsError
 import com.ichi2.anki.browser.RepositionCardsRequest.RepositionData
 import com.ichi2.anki.browser.SaveSearchResult
@@ -83,7 +85,6 @@ import com.ichi2.anki.dialogs.DeckSelectionDialog
 import com.ichi2.anki.dialogs.DeckSelectionDialog.Companion.newInstance
 import com.ichi2.anki.dialogs.DeckSelectionDialog.DeckSelectionListener
 import com.ichi2.anki.dialogs.DeckSelectionDialog.SelectableDeck
-import com.ichi2.anki.dialogs.IntegerDialog
 import com.ichi2.anki.dialogs.SimpleMessageDialog
 import com.ichi2.anki.dialogs.tags.TagsDialog
 import com.ichi2.anki.dialogs.tags.TagsDialogFactory
@@ -447,6 +448,14 @@ open class CardBrowser :
 
         setupFlows()
         registerOnForgetHandler { viewModel.queryAllSelectedCardIds() }
+        supportFragmentManager.setFragmentResultListener(REQUEST_REPOSITION_NEW_CARDS, this) { _, bundle ->
+            repositionCardsNoValidation(
+                position = bundle.getInt(RepositionCardFragment.ARG_POSITION),
+                step = bundle.getInt(RepositionCardFragment.ARG_STEP),
+                shuffle = bundle.getBoolean(RepositionCardFragment.ARG_RANDOM),
+                shift = bundle.getBoolean(RepositionCardFragment.ARG_SHIFT),
+            )
+        }
     }
 
     override fun setupBackPressedCallbacks() {
@@ -1311,19 +1320,19 @@ open class CardBrowser :
                     return@launchCatchingTask
                 }
                 is RepositionData -> {
-                    // TODO: This dialog is missing:
-                    // Randomize order
-                    // Shift position of existing cards
+                    val top = repositionCardsResult.queueTop
+                    val bottom = repositionCardsResult.queueBottom
+                    if (top == null || bottom == null) {
+                        showSnackbar(R.string.something_wrong)
+                        return@launchCatchingTask
+                    }
                     val repositionDialog =
-                        IntegerDialog().apply {
-                            setArgs(
-                                title = this@CardBrowser.getString(R.string.reposition_card_dialog_title),
-                                prompt = TR.browsingStartPosition(),
-                                content = repositionCardsResult.toHumanReadableContent(),
-                                digits = 5,
-                            )
-                            setCallbackRunnable(::repositionCardsNoValidation)
-                        }
+                        RepositionCardFragment.newInstance(
+                            queueTop = top,
+                            queueBottom = bottom,
+                            random = repositionCardsResult.random,
+                            shift = repositionCardsResult.shift,
+                        )
                     showDialogFragment(repositionDialog)
                 }
             }
@@ -1370,18 +1379,26 @@ open class CardBrowser :
     }
 
     @VisibleForTesting
-    fun repositionCardsNoValidation(position: Int) =
-        launchCatchingTask {
-            val count = withProgress { viewModel.repositionSelectedRows(position) }
-            showSnackbar(
-                resources.getQuantityString(
-                    R.plurals.reposition_card_dialog_acknowledge,
-                    count,
-                    count,
-                ),
-                Snackbar.LENGTH_SHORT,
-            )
-        }
+    fun repositionCardsNoValidation(
+        position: Int,
+        step: Int,
+        shuffle: Boolean,
+        shift: Boolean,
+    ) = launchCatchingTask {
+        val count =
+            withProgress {
+                viewModel.repositionSelectedRows(
+                    position = position,
+                    step = step,
+                    shuffle = shuffle,
+                    shift = shift,
+                )
+            }
+        showSnackbar(
+            TR.browsingChangedNewPosition(count),
+            Snackbar.LENGTH_SHORT,
+        )
+    }
 
     private fun onPreview() {
         launchCatchingTask {
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserViewModel.kt b/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserViewModel.kt
index 24a22b37acca..f4a8064d1d41 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserViewModel.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserViewModel.kt
@@ -727,6 +727,7 @@ class CardBrowserViewModel(
     /**
      * Obtains data to be displayed to the user then sent to [repositionSelectedRows]
      */
+    @NeedsTest("verify behavior for repositioning with 'Randomize order'")
     suspend fun prepareToRepositionCards(): RepositionCardsRequest {
         val selectedCardIds = queryAllSelectedCardIds()
         // Only new cards may be repositioned (If any non-new found show error dialog and return false)
@@ -737,17 +738,22 @@ class CardBrowserViewModel(
         // query obtained from Anki Desktop
         // https://github.com/ankitects/anki/blob/1fb1cbbf85c48a54c05cb4442b1b424a529cac60/qt/aqt/operations/scheduling.py#L117
         try {
-            val (min, max) =
-                withCol {
-                    db.query("select min(due), max(due) from cards where type=? and odid=0", CardType.New.code).use {
-                        it.moveToNext()
-                        return@withCol Pair(max(0, it.getInt(0)), it.getInt(1))
-                    }
-                }
-            return RepositionData(
-                min = min,
-                max = max,
-            )
+            return withCol {
+                val (min, max) =
+                    db
+                        .query("select min(due), max(due) from cards where type=? and odid=0", CardType.New.code)
+                        .use {
+                            it.moveToNext()
+                            Pair(max(0, it.getInt(0)), it.getInt(1))
+                        }
+                val defaults = sched.repositionDefaults()
+                RepositionData(
+                    min = min,
+                    max = max,
+                    random = defaults.random,
+                    shift = defaults.shift,
+                )
+            }
         } catch (e: Exception) {
             // TODO: Remove this once we've verified no production errors
             Timber.w(e, "getting min/max position")
@@ -763,11 +769,16 @@ class CardBrowserViewModel(
      * @see [com.ichi2.libanki.sched.Scheduler.sortCards]
      * @return the number of cards which were repositioned
      */
-    suspend fun repositionSelectedRows(position: Int): Int {
+    suspend fun repositionSelectedRows(
+        position: Int,
+        step: Int,
+        shuffle: Boolean,
+        shift: Boolean,
+    ): Int {
         val ids = queryAllSelectedCardIds()
         Timber.d("repositioning %d cards to %d", ids.size, position)
         return undoableOp {
-            sched.sortCards(cids = ids, position, step = 1, shuffle = false, shift = true)
+            sched.sortCards(cids = ids, position, step = step, shuffle = shuffle, shift = shift)
         }.count
     }
 
@@ -1149,6 +1160,8 @@ sealed class RepositionCardsRequest {
     class RepositionData(
         val min: Int?,
         val max: Int?,
+        val random: Boolean = false,
+        val shift: Boolean = false,
     ) : RepositionCardsRequest() {
         val queueTop: Int?
         val queueBottom: Int?
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/browser/RepositionCardFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/browser/RepositionCardFragment.kt
new file mode 100644
index 000000000000..f2de06fef111
--- /dev/null
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/browser/RepositionCardFragment.kt
@@ -0,0 +1,121 @@
+/****************************************************************************************
+ * Copyright (c) 2025 lukstbit <52494258+lukstbit@users.noreply.github.com>             *
+ *                                                                                      *
+ * This program is free software; you can redistribute it and/or modify it under        *
+ * the terms of the GNU General Public License as published by the Free Software        *
+ * Foundation; either version 3 of the License, or (at your option) any later           *
+ * version.                                                                             *
+ *                                                                                      *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY      *
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A      *
+ * PARTICULAR PURPOSE. See the GNU General Public License for more details.             *
+ *                                                                                      *
+ * You should have received a copy of the GNU General Public License along with         *
+ * this program.  If not, see <http://www.gnu.org/licenses/>.                           *
+ ****************************************************************************************/
+package com.ichi2.anki.browser
+
+import android.app.Dialog
+import android.os.Bundle
+import android.widget.CheckBox
+import android.widget.TextView
+import androidx.appcompat.app.AlertDialog
+import androidx.core.os.bundleOf
+import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.setFragmentResult
+import com.google.android.material.textfield.TextInputEditText
+import com.google.android.material.textfield.TextInputLayout
+import com.ichi2.anki.CardBrowser
+import com.ichi2.anki.CollectionManager.TR
+import com.ichi2.anki.R
+import com.ichi2.anki.ui.internationalization.toSentenceCase
+import com.ichi2.utils.create
+import com.ichi2.utils.customView
+import com.ichi2.utils.negativeButton
+import com.ichi2.utils.positiveButton
+import com.ichi2.utils.textAsIntOrNull
+import com.ichi2.utils.title
+
+/**
+ * Follows desktop implementation to show the same ui with all the options to reposition new
+ * (currently selected) cards in [CardBrowser].
+ * See https://github.com/ankitects/anki/blob/44e01ea063e6d1b812ace9c001f7ba4a8ccf4479/qt/aqt/forms/reposition.ui#L14
+ * See https://github.com/ankitects/anki/blob/1fb1cbbf85c48a54c05cb4442b1b424a529cac60/qt/aqt/operations/scheduling.py#L107
+ */
+class RepositionCardFragment : DialogFragment() {
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val dialogView = layoutInflater.inflate(R.layout.fragment_reposition_card, null)
+        dialogView.findViewById<TextView>(R.id.queue_limits_label).text =
+            """
+            ${TR.browsingQueueTop(requireArguments().getInt(ARG_QUEUE_TOP))}
+            ${TR.browsingQueueTop(requireArguments().getInt(ARG_QUEUE_BOTTOM))} 
+            """.trimIndent()
+        dialogView.findViewById<TextInputLayout>(R.id.start_input_layout).hint =
+            TR.browsingStartPosition().removeSuffix(":")
+        dialogView.findViewById<TextInputLayout>(R.id.step_input_layout).hint =
+            TR.browsingStep().removeSuffix(":")
+        val randomCheck =
+            dialogView.findViewById<CheckBox>(R.id.randomize_order_check)?.apply {
+                text = TR.browsingRandomizeOrder()
+                isChecked = requireArguments().getBoolean(ARG_RANDOM)
+            } ?: error("Unexpected missing random checkbox!")
+        val shiftPositionCheck =
+            dialogView.findViewById<CheckBox>(R.id.shift_position_check)?.apply {
+                text = TR.browsingShiftPositionOfExistingCards()
+                isChecked = requireArguments().getBoolean(ARG_SHIFT)
+            } ?: error("Unexpected missing shift position checkbox!")
+        val title =
+            TR
+                .browsingRepositionNewCards()
+                .toSentenceCase(requireContext(), R.string.sentence_reposition_new_cards)
+        return AlertDialog.Builder(requireContext()).create {
+            title(text = title)
+            customView(dialogView)
+            negativeButton(R.string.dialog_cancel)
+            positiveButton(R.string.dialog_ok) {
+                val position =
+                    dialogView
+                        .findViewById<TextInputEditText>(R.id.start_input)
+                        .textAsIntOrNull() ?: return@positiveButton
+                val step =
+                    dialogView
+                        .findViewById<TextInputEditText>(R.id.step_input)
+                        ?.textAsIntOrNull() ?: return@positiveButton
+                setFragmentResult(
+                    REQUEST_REPOSITION_NEW_CARDS,
+                    bundleOf(
+                        ARG_POSITION to position,
+                        ARG_STEP to step,
+                        ARG_RANDOM to randomCheck.isChecked,
+                        ARG_SHIFT to shiftPositionCheck.isChecked,
+                    ),
+                )
+            }
+        }
+    }
+
+    companion object {
+        const val REQUEST_REPOSITION_NEW_CARDS = "request_repositions_new_cards"
+        private const val ARG_QUEUE_TOP = "arg_queue_top"
+        private const val ARG_QUEUE_BOTTOM = "arg_queue_bottom"
+        const val ARG_POSITION = "arg_position"
+        const val ARG_STEP = "arg_step"
+        const val ARG_RANDOM = "arg_random"
+        const val ARG_SHIFT = "arg_shift"
+
+        fun newInstance(
+            queueTop: Int,
+            queueBottom: Int,
+            random: Boolean,
+            shift: Boolean,
+        ) = RepositionCardFragment().apply {
+            arguments =
+                bundleOf(
+                    ARG_QUEUE_TOP to queueTop,
+                    ARG_QUEUE_BOTTOM to queueBottom,
+                    ARG_RANDOM to random,
+                    ARG_SHIFT to shift,
+                )
+        }
+    }
+}
diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/sched/Scheduler.kt b/AnkiDroid/src/main/java/com/ichi2/libanki/sched/Scheduler.kt
index c0cb9303f98f..dad3ee8d6510 100644
--- a/AnkiDroid/src/main/java/com/ichi2/libanki/sched/Scheduler.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/libanki/sched/Scheduler.kt
@@ -33,6 +33,7 @@ import anki.scheduler.CongratsInfoResponse
 import anki.scheduler.CustomStudyDefaultsResponse
 import anki.scheduler.CustomStudyRequest
 import anki.scheduler.QueuedCards
+import anki.scheduler.RepositionDefaultsResponse
 import anki.scheduler.SchedTimingTodayResponse
 import anki.scheduler.SchedulingContext
 import anki.scheduler.SchedulingState
@@ -484,6 +485,9 @@ open class Scheduler(
     @CheckResult
     fun customStudyDefaults(deckId: DeckId): CustomStudyDefaultsResponse = col.backend.customStudyDefaults(deckId)
 
+    @CheckResult
+    fun repositionDefaults(): RepositionDefaultsResponse = col.backend.repositionDefaults()
+
     /**
      * @return Number of new card in current deck and its descendants. Capped at [REPORT_LIMIT]
      */
diff --git a/AnkiDroid/src/main/res/layout/fragment_reposition_card.xml b/AnkiDroid/src/main/res/layout/fragment_reposition_card.xml
new file mode 100644
index 000000000000..334ea67ab908
--- /dev/null
+++ b/AnkiDroid/src/main/res/layout/fragment_reposition_card.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="16dp"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/queue_limits_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_marginStart="4dp"
+        app:layout_constraintHorizontal_bias="0.0"
+        tools:text="Queue top: 1\nQueue bottom: 1656546754"/>
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/start_input_layout"
+        android:imeOptions="actionDone"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="24dp"
+        android:paddingEnd="24dp"
+        android:layout_marginTop="8dp"
+        app:errorEnabled="true"
+        app:layout_constraintTop_toBottomOf="@id/queue_limits_label">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/start_input"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:drawablePadding="8dp"
+            android:singleLine="true"
+            android:inputType="number"
+            android:text="0"
+            android:maxLines="1"
+            tools:ignore="HardcodedText" />
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/step_input_layout"
+        android:imeOptions="actionDone"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="24dp"
+        android:paddingEnd="24dp"
+        android:layout_marginTop="8dp"
+        app:errorEnabled="true"
+        app:layout_constraintTop_toBottomOf="@id/start_input_layout"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/step_input"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:drawablePadding="8dp"
+            android:singleLine="true"
+            android:inputType="number"
+            android:text="1"
+            android:maxLines="1"
+            tools:ignore="HardcodedText" />
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <CheckBox
+        android:id="@+id/randomize_order_check"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:checked="false"
+        tools:text="Randomize order"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/step_input_layout"/>
+
+    <CheckBox
+        android:id="@+id/shift_position_check"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:checked="false"
+        tools:text="Shift position of existing cards"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/randomize_order_check"/>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/AnkiDroid/src/main/res/values/03-dialogs.xml b/AnkiDroid/src/main/res/values/03-dialogs.xml
index aa70ba3bab57..25a5547f826b 100644
--- a/AnkiDroid/src/main/res/values/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values/03-dialogs.xml
@@ -30,13 +30,7 @@
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
 
-    <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
-
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d card repositioned</item>
-        <item quantity="other">%d cards repositioned</item>
-    </plurals>
     <string name="reset_card_dialog_title">Reset card progress</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d card reset</item>
diff --git a/AnkiDroid/src/main/res/values/sentence-case.xml b/AnkiDroid/src/main/res/values/sentence-case.xml
index 63653a540e91..e739a67cbff3 100644
--- a/AnkiDroid/src/main/res/values/sentence-case.xml
+++ b/AnkiDroid/src/main/res/values/sentence-case.xml
@@ -43,5 +43,5 @@ undoActionUndone()
     <string name="sentence_custom_study">Custom study</string>
     <string name="sentence_empty_cards">Empty cards</string>
     <string name="tag_missing">Tag missing</string>
-
+    <string name="sentence_reposition_new_cards">Reposition new cards</string>
 </resources>
\ No newline at end of file
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt
index cf6721e2a995..5bcbcbe4cca0 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt
@@ -558,7 +558,7 @@ class CardBrowserTest : RobolectricTest() {
                 startsWith("New #\u20681\u2069"),
             )
 
-            b.viewModel.repositionSelectedRows(2)
+            b.viewModel.repositionSelectedRows(2, 1, shuffle = false, shift = false)
 
             assertThat(
                 "Position of checked card after reposition",
@@ -567,6 +567,90 @@ class CardBrowserTest : RobolectricTest() {
             )
         }
 
+    @Test
+    fun `reposition without shift has expected outcome`() =
+        runTest {
+            val browser = getBrowserWithNotes(5)
+            // without shifting when repositioning we end up with the same due if there's already a
+            // card with that value
+            // see https://docs.ankiweb.net/browsing.html#cards
+            browser.assertRepositionOutcomeFor(
+                selectedBrowserPosition = 3,
+                currentDuePosition = 4,
+                targetDuePosition = 1,
+                expectedCardsDuePositions = listOf(1, 2, 3, 1, 5),
+                shift = false,
+            )
+            browser.viewModel.selectNone()
+            // same due because we don't shift
+            browser.assertRepositionOutcomeFor(
+                selectedBrowserPosition = 4,
+                currentDuePosition = 5,
+                targetDuePosition = 1,
+                expectedCardsDuePositions = listOf(1, 2, 3, 1, 1),
+                shift = false,
+            )
+        }
+
+    @Test
+    fun `reposition with shift has expected outcome`() =
+        runTest {
+            val browser = getBrowserWithNotes(5)
+            browser.assertRepositionOutcomeFor(
+                selectedBrowserPosition = 4,
+                currentDuePosition = 5,
+                targetDuePosition = 2,
+                expectedCardsDuePositions = listOf(1, 3, 4, 5, 2),
+                shift = true,
+            )
+            browser.viewModel.selectNone()
+            // dues are shifted for new repositioning with shift
+            browser.assertRepositionOutcomeFor(
+                selectedBrowserPosition = 3,
+                currentDuePosition = 5,
+                targetDuePosition = 1,
+                expectedCardsDuePositions = listOf(2, 4, 5, 1, 3),
+                shift = true,
+            )
+        }
+
+    private suspend fun CardBrowser.assertRepositionOutcomeFor(
+        selectedBrowserPosition: Int,
+        currentDuePosition: Int,
+        targetDuePosition: Int,
+        expectedCardsDuePositions: List<Int>,
+        shift: Boolean,
+    ) {
+        selectRowsWithPositions(selectedBrowserPosition)
+        val card = getCheckedCard(this)
+
+        assertThat(
+            "Unexpected due for currently selected card",
+            card.getColumnHeaderText(CardBrowserColumn.DUE),
+            startsWith("New #\u2068$currentDuePosition\u2069"),
+        )
+
+        viewModel.repositionSelectedRows(targetDuePosition, 1, shuffle = false, shift = shift)
+        // with shift, moving to a position will not result in the same due as the cards with
+        // that position will be shifted
+        viewModel.cards.forEachIndexed { index, entry ->
+            assertThat(
+                "Unexpected due position at index: $index",
+                getDueHeaderText(entry.cardOrNoteId),
+                startsWith("New #\u2068${expectedCardsDuePositions[index]}\u2069"),
+            )
+        }
+    }
+
+    private fun getDueHeaderText(cardOrNoteId: Long): String? {
+        // There's currently a minimum of 2 columns
+        col.backend.setActiveBrowserColumns(listOf(CardBrowserColumn.DUE.ankiColumnKey, "answer"))
+        return col
+            .browserRowForId(cardOrNoteId)
+            .getCells(0)
+            .text
+    }
+
     @Test
     @Config(qualifiers = "en")
     @SuppressLint("DirectCalendarInstanceUsage")
@@ -625,7 +709,7 @@ class CardBrowserTest : RobolectricTest() {
                 equalTo("1"),
             )
 
-            b.repositionCardsNoValidation(2)
+            b.repositionCardsNoValidation(2, 1, shuffle = false, shift = false)
 
             assertThat(
                 "Position of checked card after reposition",

From 0cb4929c9c11baef437f0c29fdf0e037ca7dd9e5 Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Wed, 5 Feb 2025 17:24:03 -0300
Subject: [PATCH 049/200] refactor(MappableBinding): move reviewer stuff to a
 new class

---
 .../ichi2/anki/cardviewer/ViewerCommand.kt    |  21 +---
 .../ichi2/anki/reviewer/MappableBinding.kt    | 109 +-----------------
 .../ichi2/anki/reviewer/PeripheralKeymap.kt   |   8 +-
 .../ichi2/anki/reviewer/ReviewerBinding.kt    |  90 +++++++++++++++
 .../servicelayer/PreferenceUpgradeService.kt  |   4 +-
 .../ichi2/preferences/ControlPreference.kt    |  26 ++---
 .../ichi2/anki/ReviewerKeyboardInputTest.kt   |   6 +-
 .../com/ichi2/anki/ReviewerNoParamTest.kt     |   6 +-
 .../anki/cardviewer/GestureProcessorTest.kt   |   5 +-
 .../ichi2/anki/reviewer/BindingAndroidTest.kt |   5 +-
 .../anki/reviewer/MappableBindingTest.kt      |   2 +-
 .../UpgradeGesturesToControlsTest.kt          |   8 +-
 .../com/ichi2/ui/BindingPreferenceTest.kt     |  12 +-
 13 files changed, 133 insertions(+), 169 deletions(-)
 create mode 100644 AnkiDroid/src/main/java/com/ichi2/anki/reviewer/ReviewerBinding.kt

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/ViewerCommand.kt b/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/ViewerCommand.kt
index 08f9c73ae4d8..e8635969449f 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/ViewerCommand.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/ViewerCommand.kt
@@ -28,7 +28,7 @@ import com.ichi2.anki.reviewer.CardSide
 import com.ichi2.anki.reviewer.MappableBinding
 import com.ichi2.anki.reviewer.MappableBinding.Companion.fromPreference
 import com.ichi2.anki.reviewer.MappableBinding.Companion.toPreferenceString
-import com.ichi2.anki.reviewer.MappableBinding.Screen
+import com.ichi2.anki.reviewer.ReviewerBinding
 
 /** Abstraction: Discuss moving many of these to 'Reviewer'  */
 enum class ViewerCommand(
@@ -137,17 +137,6 @@ enum class ViewerCommand(
     // If we use the serialised format, then this adds additional coupling to the properties.
     val defaultValue: List<MappableBinding>
         get() {
-            // all of the default commands are currently for the Reviewer
-            fun keyCode(
-                keycode: Int,
-                side: CardSide,
-                modifierKeys: ModifierKeys = ModifierKeys.none(),
-            ) = keyCode(keycode, Screen.Reviewer(side), modifierKeys)
-
-            fun unicode(
-                c: Char,
-                side: CardSide,
-            ) = unicode(c, Screen.Reviewer(side))
             return when (this) {
                 FLIP_OR_ANSWER_EASE1 ->
                     listOf(
@@ -256,14 +245,14 @@ enum class ViewerCommand(
 
     private fun keyCode(
         keycode: Int,
-        screen: Screen,
+        side: CardSide,
         keys: ModifierKeys = ModifierKeys.none(),
-    ): MappableBinding = MappableBinding(keyCode(keys, keycode), screen)
+    ): ReviewerBinding = ReviewerBinding(keyCode(keys, keycode), side)
 
     private fun unicode(
         c: Char,
-        screen: Screen,
-    ): MappableBinding = MappableBinding(unicode(c), screen)
+        side: CardSide,
+    ): ReviewerBinding = ReviewerBinding(unicode(c), side)
 
     fun interface CommandProcessor {
         /**
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MappableBinding.kt b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MappableBinding.kt
index 25cc52924997..787a7ee37dc5 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MappableBinding.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MappableBinding.kt
@@ -19,10 +19,7 @@ package com.ichi2.anki.reviewer
 import android.content.Context
 import android.content.SharedPreferences
 import androidx.annotation.CheckResult
-import com.ichi2.anki.R
-import com.ichi2.anki.cardviewer.Gesture
 import com.ichi2.anki.cardviewer.ViewerCommand
-import com.ichi2.anki.reviewer.Binding.GestureInput
 import com.ichi2.anki.reviewer.Binding.KeyBinding
 import com.ichi2.utils.hash
 import timber.log.Timber
@@ -30,113 +27,23 @@ import java.util.Objects
 
 /**
  * Binding + additional contextual information
- * Also defines equality over bindings.
- * https://stackoverflow.com/questions/5453226/java-need-a-hash-map-where-one-supplies-a-function-to-do-the-hashing
  */
-class MappableBinding(
+open class MappableBinding(
     val binding: Binding,
-    val screen: Screen,
 ) {
     val isKey: Boolean get() = binding is KeyBinding
 
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (other == null) return false
+    override fun equals(other: Any?): Boolean = this === other || (other is MappableBinding && other.binding == binding)
 
-        val otherBinding = (other as MappableBinding).binding
-        if (binding != otherBinding) {
-            return false
-        }
-
-        return screen.screenEquals(other.screen)
-    }
-
-    override fun hashCode(): Int = Objects.hash(binding, screen.prefix)
-
-    fun toDisplayString(context: Context): String = screen.toDisplayString(context, binding)
-
-    fun toPreferenceString(): String? = screen.toPreferenceString(binding)
-
-    abstract class Screen private constructor(
-        val prefix: Char,
-    ) {
-        abstract fun toPreferenceString(binding: Binding): String?
+    override fun hashCode(): Int = Objects.hash(binding)
 
-        abstract fun toDisplayString(
-            context: Context,
-            binding: Binding,
-        ): String
+    open fun toDisplayString(context: Context): String = binding.toDisplayString(context)
 
-        abstract fun screenEquals(otherScreen: Screen): Boolean
-
-        class Reviewer(
-            val side: CardSide,
-        ) : Screen('r') {
-            override fun toPreferenceString(binding: Binding): String? {
-                if (!binding.isValid) {
-                    return null
-                }
-                val s = StringBuilder()
-                s.append(prefix)
-                s.append(binding.toString())
-                // don't serialise problematic bindings
-                if (s.isEmpty()) {
-                    return null
-                }
-                when (side) {
-                    CardSide.QUESTION -> s.append('0')
-                    CardSide.ANSWER -> s.append('1')
-                    CardSide.BOTH -> s.append('2')
-                }
-                return s.toString()
-            }
-
-            override fun toDisplayString(
-                context: Context,
-                binding: Binding,
-            ): String {
-                val formatString =
-                    when (side) {
-                        CardSide.QUESTION -> context.getString(R.string.display_binding_card_side_question)
-                        CardSide.ANSWER -> context.getString(R.string.display_binding_card_side_answer)
-                        CardSide.BOTH -> context.getString(R.string.display_binding_card_side_both) // intentionally no prefix
-                    }
-                return String.format(formatString, binding.toDisplayString(context))
-            }
-
-            override fun screenEquals(otherScreen: Screen): Boolean {
-                val other: Reviewer = otherScreen as? Reviewer ?: return false
-
-                return side === CardSide.BOTH ||
-                    other.side === CardSide.BOTH ||
-                    side === other.side
-            }
-
-            companion object {
-                fun fromString(s: String): MappableBinding {
-                    val binding = s.substring(0, s.length - 1)
-                    val b = Binding.fromString(binding)
-                    val side =
-                        when (s[s.length - 1]) {
-                            '0' -> CardSide.QUESTION
-                            '1' -> CardSide.ANSWER
-                            else -> CardSide.BOTH
-                        }
-                    return MappableBinding(b, Reviewer(side))
-                }
-            }
-        }
-    }
+    open fun toPreferenceString(): String? = binding.toString()
 
     companion object {
         const val PREF_SEPARATOR = '|'
 
-        @CheckResult
-        fun fromGesture(
-            gesture: Gesture,
-            screen: (CardSide) -> Screen,
-        ): MappableBinding = MappableBinding(GestureInput(gesture), screen(CardSide.BOTH))
-
         @CheckResult
         fun List<MappableBinding>.toPreferenceString(): String =
             this
@@ -151,7 +58,7 @@ class MappableBinding(
             return try {
                 // the prefix of the serialized
                 when (s[0]) {
-                    'r' -> Screen.Reviewer.fromString(s.substring(1))
+                    ReviewerBinding.PREFIX -> ReviewerBinding.fromString(s.substring(1))
                     else -> null
                 }
             } catch (e: Exception) {
@@ -194,7 +101,3 @@ class MappableBinding(
                 }.toMutableList()
     }
 }
-
-@Suppress("UnusedReceiverParameter")
-val ViewerCommand.screenBuilder: (CardSide) -> MappableBinding.Screen
-    get() = { it -> MappableBinding.Screen.Reviewer(it) }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/PeripheralKeymap.kt b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/PeripheralKeymap.kt
index 6b0081c26361..5330b06bedf0 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/PeripheralKeymap.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/PeripheralKeymap.kt
@@ -24,7 +24,6 @@ import com.ichi2.anki.preferences.sharedPrefs
 import com.ichi2.anki.reviewer.Binding.Companion.possibleKeyBindings
 import com.ichi2.anki.reviewer.CardSide.Companion.fromAnswer
 import com.ichi2.anki.reviewer.MappableBinding.Companion.fromPreference
-import com.ichi2.anki.reviewer.MappableBinding.Screen
 
 /** Accepts peripheral input, mapping via various keybinding strategies,
  * and converting them to commands for the Reviewer.  */
@@ -32,7 +31,7 @@ class PeripheralKeymap(
     reviewerUi: ReviewerUi,
     commandProcessor: ViewerCommand.CommandProcessor,
 ) {
-    private val keyMap: KeyMap = KeyMap(commandProcessor, reviewerUi) { Screen.Reviewer(it) }
+    private val keyMap: KeyMap = KeyMap(commandProcessor, reviewerUi)
     private var hasSetup = false
 
     fun setup() {
@@ -53,7 +52,7 @@ class PeripheralKeymap(
     ) {
         val bindings =
             fromPreference(preferences, command)
-                .filter { it.screen is Screen.Reviewer }
+                .filterIsInstance<ReviewerBinding>()
         for (b in bindings) {
             if (!b.isKey) {
                 continue
@@ -81,7 +80,6 @@ class PeripheralKeymap(
     class KeyMap(
         private val processor: ViewerCommand.CommandProcessor,
         private val reviewerUI: ReviewerUi,
-        private val screenBuilder: (CardSide) -> Screen,
     ) {
         val bindingMap = HashMap<MappableBinding, ViewerCommand>()
 
@@ -94,7 +92,7 @@ class PeripheralKeymap(
             val bindings = possibleKeyBindings(event!!)
             val side = fromAnswer(reviewerUI.isDisplayingAnswer)
             for (b in bindings) {
-                val binding = MappableBinding(b, screenBuilder(side))
+                val binding = ReviewerBinding(b, side)
                 val command = bindingMap[binding] ?: continue
                 ret = ret or processor.executeCommand(command, fromGesture = null)
             }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/ReviewerBinding.kt b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/ReviewerBinding.kt
new file mode 100644
index 000000000000..5add073f4bc3
--- /dev/null
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/ReviewerBinding.kt
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2025 Brayan Oliveira <brayandso.dev@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.ichi2.anki.reviewer
+
+import android.content.Context
+import androidx.annotation.CheckResult
+import com.ichi2.anki.R
+import com.ichi2.anki.cardviewer.Gesture
+import java.util.Objects
+
+class ReviewerBinding(
+    binding: Binding,
+    val side: CardSide,
+) : MappableBinding(binding) {
+    override fun equals(other: Any?): Boolean {
+        if (!super.equals(other)) return false
+        if (other !is ReviewerBinding) return false
+
+        return side === CardSide.BOTH ||
+            other.side === CardSide.BOTH ||
+            side === other.side
+    }
+
+    override fun hashCode(): Int = Objects.hash(binding, PREFIX)
+
+    override fun toPreferenceString(): String? {
+        if (!binding.isValid) {
+            return null
+        }
+        val s =
+            StringBuilder()
+                .append(PREFIX)
+                .append(binding.toString())
+        // don't serialise problematic bindings
+        if (s.isEmpty()) {
+            return null
+        }
+        when (side) {
+            CardSide.QUESTION -> s.append(QUESTION_SUFFIX)
+            CardSide.ANSWER -> s.append(ANSWER_SUFFIX)
+            CardSide.BOTH -> s.append(QUESTION_AND_ANSWER_SUFFIX)
+        }
+        return s.toString()
+    }
+
+    override fun toDisplayString(context: Context): String {
+        val formatString =
+            when (side) {
+                CardSide.QUESTION -> context.getString(R.string.display_binding_card_side_question)
+                CardSide.ANSWER -> context.getString(R.string.display_binding_card_side_answer)
+                CardSide.BOTH -> context.getString(R.string.display_binding_card_side_both) // intentionally no prefix
+            }
+        return String.format(formatString, binding.toDisplayString(context))
+    }
+
+    companion object {
+        const val PREFIX = 'r'
+        private const val QUESTION_SUFFIX = '0'
+        private const val ANSWER_SUFFIX = '1'
+        private const val QUESTION_AND_ANSWER_SUFFIX = '2'
+
+        fun fromString(s: String): MappableBinding {
+            val binding = s.substring(0, s.length - 1)
+            val b = Binding.fromString(binding)
+            val side =
+                when (s[s.length - 1]) {
+                    QUESTION_SUFFIX -> CardSide.QUESTION
+                    ANSWER_SUFFIX -> CardSide.ANSWER
+                    else -> CardSide.BOTH
+                }
+            return ReviewerBinding(b, side)
+        }
+
+        @CheckResult
+        fun fromGesture(gesture: Gesture): ReviewerBinding = ReviewerBinding(Binding.GestureInput(gesture), CardSide.BOTH)
+    }
+}
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/PreferenceUpgradeService.kt b/AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/PreferenceUpgradeService.kt
index f3df9c25cc91..aae5aaa9a14a 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/PreferenceUpgradeService.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/PreferenceUpgradeService.kt
@@ -50,7 +50,7 @@ import com.ichi2.anki.reviewer.CardSide
 import com.ichi2.anki.reviewer.FullScreenMode
 import com.ichi2.anki.reviewer.MappableBinding
 import com.ichi2.anki.reviewer.MappableBinding.Companion.toPreferenceString
-import com.ichi2.anki.reviewer.screenBuilder
+import com.ichi2.anki.reviewer.ReviewerBinding
 import com.ichi2.libanki.Consts
 import com.ichi2.utils.HashUtil.hashSetInit
 import timber.log.Timber
@@ -399,7 +399,7 @@ object PreferenceUpgradeService {
                 Timber.i("Moving preference from '%s' to '%s'", oldGesturePreferenceKey, command.preferenceKey)
 
                 // add to the binding_COMMANDNAME preference
-                val mappableBinding = MappableBinding(binding, command.screenBuilder(CardSide.BOTH))
+                val mappableBinding = ReviewerBinding(binding, CardSide.BOTH)
                 command.addBindingAtEnd(preferences, mappableBinding)
             }
         }
diff --git a/AnkiDroid/src/main/java/com/ichi2/preferences/ControlPreference.kt b/AnkiDroid/src/main/java/com/ichi2/preferences/ControlPreference.kt
index b1dc32c9263b..04e27d35e7b8 100644
--- a/AnkiDroid/src/main/java/com/ichi2/preferences/ControlPreference.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/preferences/ControlPreference.kt
@@ -33,10 +33,8 @@ import com.ichi2.anki.dialogs.WarningDisplay
 import com.ichi2.anki.preferences.sharedPrefs
 import com.ichi2.anki.reviewer.CardSide
 import com.ichi2.anki.reviewer.MappableBinding
-import com.ichi2.anki.reviewer.MappableBinding.Companion.fromGesture
 import com.ichi2.anki.reviewer.MappableBinding.Companion.toPreferenceString
-import com.ichi2.anki.reviewer.MappableBinding.Screen
-import com.ichi2.anki.reviewer.screenBuilder
+import com.ichi2.anki.reviewer.ReviewerBinding
 import com.ichi2.anki.showThemedToast
 import com.ichi2.ui.AxisPicker
 import com.ichi2.ui.KeyPicker
@@ -75,9 +73,6 @@ class ControlPreference : ListPreference {
     @Suppress("unused")
     constructor(context: Context) : super(context)
 
-    val screenBuilder: (CardSide) -> Screen
-        get() = ViewerCommand.fromPreferenceKey(key).screenBuilder
-
     private fun refreshEntries() {
         val entryTitles: MutableList<CharSequence> = ArrayList()
         val entryIndices: MutableList<Int> = ArrayList()
@@ -125,11 +120,7 @@ class ControlPreference : ListPreference {
 
                     positiveButton(R.string.dialog_ok) {
                         val gesture = gesturePicker.getGesture() ?: return@positiveButton
-                        val mappableBinding =
-                            fromGesture(
-                                gesture,
-                                screenBuilder,
-                            )
+                        val mappableBinding = ReviewerBinding.fromGesture(gesture)
                         if (bindingIsUsedOnAnotherCommand(mappableBinding)) {
                             showDialogToReplaceBinding(mappableBinding, context.getString(R.string.binding_replace_gesture), it)
                         } else {
@@ -141,7 +132,7 @@ class ControlPreference : ListPreference {
                     customView(view = gesturePicker)
 
                     gesturePicker.onGestureChanged { gesture ->
-                        warnIfBindingIsUsed(fromGesture(gesture, screenBuilder), gesturePicker)
+                        warnIfBindingIsUsed(ReviewerBinding.fromGesture(gesture), gesturePicker)
                     }
                 }
             }
@@ -155,10 +146,7 @@ class ControlPreference : ListPreference {
                     // When the user presses a key
                     keyPicker.setBindingChangedListener { binding ->
                         val mappableBinding =
-                            MappableBinding(
-                                binding,
-                                screenBuilder(CardSide.BOTH),
-                            )
+                            ReviewerBinding(binding, CardSide.BOTH)
                         warnIfBindingIsUsed(mappableBinding, keyPicker)
                     }
 
@@ -166,7 +154,7 @@ class ControlPreference : ListPreference {
                         val binding = keyPicker.getBinding() ?: return@positiveButton
                         // Use CardSide.BOTH as placeholder just to check if binding exists
                         CardSideSelectionDialog.displayInstance(context) { side ->
-                            val mappableBinding = MappableBinding(binding, screenBuilder(side))
+                            val mappableBinding = ReviewerBinding(binding, side)
                             if (bindingIsUsedOnAnotherCommand(mappableBinding)) {
                                 showDialogToReplaceBinding(mappableBinding, context.getString(R.string.binding_replace_key), it)
                             } else {
@@ -204,10 +192,10 @@ class ControlPreference : ListPreference {
                 .create()
 
         axisPicker.setBindingChangedListener { binding ->
-            showToastIfBindingIsUsed(MappableBinding(binding, screenBuilder(CardSide.BOTH)))
+            showToastIfBindingIsUsed(ReviewerBinding(binding, CardSide.BOTH))
             // Use CardSide.BOTH as placeholder just to check if binding exists
             CardSideSelectionDialog.displayInstance(context) { side ->
-                val mappableBinding = MappableBinding(binding, screenBuilder(side))
+                val mappableBinding = ReviewerBinding(binding, side)
                 if (bindingIsUsedOnAnotherCommand(mappableBinding)) {
                     showDialogToReplaceBinding(mappableBinding, context.getString(R.string.binding_replace_key), dialog)
                 } else {
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerKeyboardInputTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerKeyboardInputTest.kt
index f02f6db6e00f..efcfab0e6516 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerKeyboardInputTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerKeyboardInputTest.kt
@@ -44,7 +44,7 @@ import com.ichi2.anki.cardviewer.ViewerCommand
 import com.ichi2.anki.reviewer.Binding.Companion.keyCode
 import com.ichi2.anki.reviewer.Binding.ModifierKeys
 import com.ichi2.anki.reviewer.CardSide
-import com.ichi2.anki.reviewer.MappableBinding
+import com.ichi2.anki.reviewer.ReviewerBinding
 import com.ichi2.libanki.Card
 import kotlinx.coroutines.Job
 import org.hamcrest.MatcherAssert.assertThat
@@ -182,7 +182,7 @@ class ReviewerKeyboardInputTest : RobolectricTest() {
     fun pressingZShouldUndoIfAvailable() {
         ViewerCommand.UNDO.addBinding(
             sharedPrefs(),
-            MappableBinding(keyCode(KEYCODE_Z, ModifierKeys.none()), MappableBinding.Screen.Reviewer(CardSide.BOTH)),
+            ReviewerBinding(keyCode(KEYCODE_Z, ModifierKeys.none()), CardSide.BOTH),
         )
         val underTest = KeyboardInputTestReviewer.displayingAnswer().withUndoAvailable(true)
         underTest.handleAndroidKeyPress(KEYCODE_Z)
@@ -193,7 +193,7 @@ class ReviewerKeyboardInputTest : RobolectricTest() {
     fun pressingZShouldNotUndoIfNotAvailable() {
         ViewerCommand.UNDO.addBinding(
             sharedPrefs(),
-            MappableBinding(keyCode(KEYCODE_Z, ModifierKeys.none()), MappableBinding.Screen.Reviewer(CardSide.BOTH)),
+            ReviewerBinding(keyCode(KEYCODE_Z, ModifierKeys.none()), CardSide.BOTH),
         )
         val underTest = KeyboardInputTestReviewer.displayingAnswer().withUndoAvailable(false)
         underTest.handleUnicodeKeyPress('z')
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerNoParamTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerNoParamTest.kt
index 3aa9480179c3..18bfe2817b04 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerNoParamTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerNoParamTest.kt
@@ -33,7 +33,7 @@ import com.ichi2.anki.reviewer.FullScreenMode
 import com.ichi2.anki.reviewer.FullScreenMode.Companion.setPreference
 import com.ichi2.anki.reviewer.MappableBinding
 import com.ichi2.anki.reviewer.MappableBinding.Companion.toPreferenceString
-import com.ichi2.anki.reviewer.MappableBinding.Screen
+import com.ichi2.anki.reviewer.ReviewerBinding
 import com.ichi2.libanki.Consts
 import com.ichi2.libanki.DeckId
 import com.ichi2.testutils.common.Flaky
@@ -316,9 +316,7 @@ class ReviewerNoParamTest : RobolectricTest() {
         val prefs = targetContext.sharedPrefs()
         ViewerCommand.FLIP_OR_ANSWER_EASE1.addBinding(
             prefs,
-            MappableBinding.fromGesture(gesture) {
-                Screen.Reviewer(it)
-            },
+            ReviewerBinding.fromGesture(gesture),
         )
     }
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/cardviewer/GestureProcessorTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/cardviewer/GestureProcessorTest.kt
index 721e9863ffe3..a82311dab705 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/cardviewer/GestureProcessorTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/cardviewer/GestureProcessorTest.kt
@@ -18,9 +18,8 @@ package com.ichi2.anki.cardviewer
 import android.content.SharedPreferences
 import android.view.ViewConfiguration
 import com.ichi2.anki.AnkiDroidApp
-import com.ichi2.anki.reviewer.MappableBinding
 import com.ichi2.anki.reviewer.MappableBinding.Companion.toPreferenceString
-import com.ichi2.anki.reviewer.screenBuilder
+import com.ichi2.anki.reviewer.ReviewerBinding
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.mockkStatic
@@ -53,7 +52,7 @@ class GestureProcessorTest : ViewerCommand.CommandProcessor {
     fun integrationTest() {
         val prefs = mockk<SharedPreferences>(relaxed = true)
         every { prefs.getString(ViewerCommand.SHOW_ANSWER.preferenceKey, null) } returns
-            listOf(MappableBinding.fromGesture(Gesture.TAP_CENTER, ViewerCommand.SHOW_ANSWER.screenBuilder))
+            listOf(ReviewerBinding.fromGesture(Gesture.TAP_CENTER))
                 .toPreferenceString()
         every { prefs.getBoolean("gestureCornerTouch", any()) } returns true
         sut.init(prefs)
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/BindingAndroidTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/BindingAndroidTest.kt
index 857c5d8ed7bd..97a4f7ae2f2a 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/BindingAndroidTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/BindingAndroidTest.kt
@@ -23,7 +23,6 @@ import com.ichi2.anki.cardviewer.Gesture
 import com.ichi2.anki.reviewer.Binding.ModifierKeys.Companion.alt
 import com.ichi2.anki.reviewer.Binding.ModifierKeys.Companion.ctrl
 import com.ichi2.anki.reviewer.Binding.ModifierKeys.Companion.shift
-import com.ichi2.anki.reviewer.MappableBinding.Screen.Reviewer
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -83,8 +82,8 @@ class BindingAndroidTest : RobolectricTest() {
         fst: Binding,
         snd: Binding,
     ) {
-        val first = MappableBinding(fst, Reviewer(CardSide.BOTH))
-        val second = MappableBinding(snd, Reviewer(CardSide.BOTH))
+        val first = ReviewerBinding(fst, CardSide.BOTH)
+        val second = ReviewerBinding(snd, CardSide.BOTH)
         assertEquals(first, second)
     }
 }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/MappableBindingTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/MappableBindingTest.kt
index 9a1f0235919f..6e118328bec3 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/MappableBindingTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/MappableBindingTest.kt
@@ -54,5 +54,5 @@ class MappableBindingTest {
     @Suppress("SameParameterValue")
     private fun unicodeCharacter(char: Char) = fromBinding(BindingTest.unicodeCharacter(char))
 
-    private fun fromBinding(binding: Binding): Any = MappableBinding(binding, MappableBinding.Screen.Reviewer(CardSide.BOTH))
+    private fun fromBinding(binding: Binding): Any = ReviewerBinding(binding, CardSide.BOTH)
 }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/servicemodel/UpgradeGesturesToControlsTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/servicemodel/UpgradeGesturesToControlsTest.kt
index ad5e6a628e6d..c0143e793589 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/servicemodel/UpgradeGesturesToControlsTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/servicemodel/UpgradeGesturesToControlsTest.kt
@@ -22,7 +22,7 @@ import com.ichi2.anki.cardviewer.ViewerCommand
 import com.ichi2.anki.reviewer.Binding.Companion.keyCode
 import com.ichi2.anki.reviewer.CardSide
 import com.ichi2.anki.reviewer.MappableBinding
-import com.ichi2.anki.reviewer.MappableBinding.Screen.Reviewer
+import com.ichi2.anki.reviewer.ReviewerBinding
 import com.ichi2.anki.servicelayer.PreferenceUpgradeService.PreferenceUpgrade.Companion.UPGRADE_VERSION_PREF_KEY
 import com.ichi2.anki.servicelayer.PreferenceUpgradeService.PreferenceUpgrade.UpgradeGesturesToControls
 import org.hamcrest.CoreMatchers.equalTo
@@ -88,7 +88,7 @@ class UpgradeGesturesToControlsTest(
         val binding = fromPreference.first()
 
         assertThat("should be a key binding", binding.isKey, equalTo(true))
-        assertThat("binding should match", binding, equalTo(MappableBinding(keyCode(testData.keyCode), Reviewer(CardSide.BOTH))))
+        assertThat("binding should match", binding, equalTo(ReviewerBinding(keyCode(testData.keyCode), CardSide.BOTH)))
     }
 
     @Test
@@ -203,8 +203,8 @@ class UpgradeGesturesToControlsTest(
         val oldCommandPreferenceStrings: HashMap<ViewerCommand, String> =
             hashMapOf(*UpgradeGesturesToControls().oldCommandValues.map { Pair(it.value, it.key.toString()) }.toTypedArray())
 
-        private val volume_up_binding = MappableBinding(keyCode(KEYCODE_VOLUME_UP), Reviewer(CardSide.BOTH))
-        private val volume_down_binding = MappableBinding(keyCode(KEYCODE_VOLUME_DOWN), Reviewer(CardSide.BOTH))
+        private val volume_up_binding = ReviewerBinding(keyCode(KEYCODE_VOLUME_UP), CardSide.BOTH)
+        private val volume_down_binding = ReviewerBinding(keyCode(KEYCODE_VOLUME_DOWN), CardSide.BOTH)
 
         @JvmStatic
         @ParameterizedRobolectricTestRunner.Parameters(name = "{index}: isValid({0})={1}")
diff --git a/AnkiDroid/src/test/java/com/ichi2/ui/BindingPreferenceTest.kt b/AnkiDroid/src/test/java/com/ichi2/ui/BindingPreferenceTest.kt
index e54da03ba4bf..a8d1d5d35943 100644
--- a/AnkiDroid/src/test/java/com/ichi2/ui/BindingPreferenceTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/ui/BindingPreferenceTest.kt
@@ -22,7 +22,7 @@ import com.ichi2.anki.reviewer.Binding
 import com.ichi2.anki.reviewer.CardSide
 import com.ichi2.anki.reviewer.MappableBinding
 import com.ichi2.anki.reviewer.MappableBinding.Companion.toPreferenceString
-import com.ichi2.anki.reviewer.MappableBinding.Screen.Reviewer
+import com.ichi2.anki.reviewer.ReviewerBinding
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -49,11 +49,11 @@ class BindingPreferenceTest {
 
     private fun getSampleBindings(): List<MappableBinding> =
         listOf(
-            MappableBinding(Binding.unicode('a'), Reviewer(CardSide.BOTH)),
-            MappableBinding(Binding.unicode(' '), Reviewer(CardSide.ANSWER)),
+            ReviewerBinding(Binding.unicode('a'), CardSide.BOTH),
+            ReviewerBinding(Binding.unicode(' '), CardSide.ANSWER),
             // this one is important: ensure that "|" as a unicode char can't be used
-            MappableBinding(Binding.unicode(Binding.FORBIDDEN_UNICODE_CHAR), Reviewer(CardSide.QUESTION)),
-            MappableBinding(Binding.gesture(Gesture.LONG_TAP), Reviewer(CardSide.BOTH)),
-            MappableBinding(Binding.keyCode(12), Reviewer(CardSide.BOTH)),
+            ReviewerBinding(Binding.unicode(Binding.FORBIDDEN_UNICODE_CHAR), CardSide.QUESTION),
+            ReviewerBinding(Binding.gesture(Gesture.LONG_TAP), CardSide.BOTH),
+            ReviewerBinding(Binding.keyCode(12), CardSide.BOTH),
         )
 }

From cb3b30a56c9461b30ead6232dc52ab2d7255b3e3 Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Wed, 5 Feb 2025 17:29:58 -0300
Subject: [PATCH 050/200] refactor: extract prefs dialog key to constant

---
 .../main/java/com/ichi2/anki/preferences/SettingsFragment.kt  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/SettingsFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/SettingsFragment.kt
index 14e0ff9652ba..3d9a117f99df 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/SettingsFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/SettingsFragment.kt
@@ -93,7 +93,7 @@ abstract class SettingsFragment :
             (preference as? DialogFragmentProvider)?.makeDialogFragment()
                 ?: return super.onDisplayPreferenceDialog(preference)
         Timber.d("displaying custom preference: ${dialogFragment::class.simpleName}")
-        dialogFragment.arguments = bundleOf("key" to preference.key)
+        dialogFragment.arguments = bundleOf(PREF_DIALOG_KEY to preference.key)
         dialogFragment.setTargetFragment(this, 0)
         dialogFragment.show(parentFragmentManager, "androidx.preference.PreferenceFragment.DIALOG")
     }
@@ -128,6 +128,8 @@ abstract class SettingsFragment :
     }
 
     companion object {
+        const val PREF_DIALOG_KEY = "key"
+
         /**
          * Converts a preference value to a numeric number that
          * can be reported to analytics, since analytics events only accept

From d0b71db60ab3090431bf72c2c7897629dfea453d Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Wed, 5 Feb 2025 19:13:26 -0300
Subject: [PATCH 051/200] refactor: allPreferences util

---
 .../preferences/ControlsSettingsFragment.kt     |  3 ++-
 .../CustomButtonsSettingsFragment.kt            |  2 +-
 .../ichi2/anki/preferences/PreferenceUtils.kt   | 17 +++++++++++++++++
 .../ichi2/anki/preferences/SettingsFragment.kt  | 16 ----------------
 4 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/ControlsSettingsFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/ControlsSettingsFragment.kt
index 7df837ebf0f0..e1917c16f950 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/ControlsSettingsFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/ControlsSettingsFragment.kt
@@ -37,7 +37,8 @@ class ControlsSettingsFragment : SettingsFragment() {
         val commands = ViewerCommand.entries.associateBy { it.preferenceKey }
         // set defaultValue in the prefs creation.
         // if a preference is empty, it has a value like "1/"
-        allPreferences()
+        preferenceScreen
+            .allPreferences()
             .filterIsInstance<ControlPreference>()
             .filter { pref -> pref.value == null }
             .forEach { pref -> pref.value = commands[pref.key]?.defaultValue?.toPreferenceString() }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/CustomButtonsSettingsFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/CustomButtonsSettingsFragment.kt
index 9e7ff851207c..c42d7d54f233 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/CustomButtonsSettingsFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/CustomButtonsSettingsFragment.kt
@@ -57,5 +57,5 @@ class CustomButtonsSettingsFragment : SettingsFragment() {
     }
 
     @VisibleForTesting(otherwise = VisibleForTesting.NONE)
-    fun allKeys(): HashSet<String> = allPreferences().mapTo(hashSetOf()) { it.key }
+    fun allKeys(): HashSet<String> = preferenceScreen.allPreferences().mapTo(hashSetOf()) { it.key }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/PreferenceUtils.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/PreferenceUtils.kt
index 72f095bc669b..5bfd6dd6d185 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/PreferenceUtils.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/PreferenceUtils.kt
@@ -20,7 +20,9 @@ import android.content.SharedPreferences
 import androidx.annotation.StringRes
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
+import androidx.preference.PreferenceGroup
 import androidx.preference.PreferenceManager
+import androidx.preference.PreferenceScreen
 
 fun SharedPreferences.get(key: String): Any? = all[key]
 
@@ -61,3 +63,18 @@ inline fun <reified T : Preference> PreferenceFragmentCompat.requirePreference(
 
 /** shorthand method to get the default [SharedPreferences] instance */
 fun Context.sharedPrefs(): SharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
+
+fun PreferenceScreen.allPreferences(): List<Preference> {
+    val allPreferences = mutableListOf<Preference>()
+    for (i in 0 until preferenceCount) {
+        val pref = getPreference(i)
+        if (pref is PreferenceGroup) {
+            for (j in 0 until pref.preferenceCount) {
+                allPreferences.add(pref.getPreference(j))
+            }
+        } else {
+            allPreferences.add(pref)
+        }
+    }
+    return allPreferences
+}
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/SettingsFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/SettingsFragment.kt
index 3d9a117f99df..d3f6baf203cd 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/SettingsFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/SettingsFragment.kt
@@ -21,7 +21,6 @@ import androidx.annotation.VisibleForTesting
 import androidx.annotation.XmlRes
 import androidx.core.os.bundleOf
 import androidx.preference.Preference
-import androidx.preference.PreferenceCategory
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceManager
 import androidx.preference.PreferenceManager.OnPreferenceTreeClickListener
@@ -112,21 +111,6 @@ abstract class SettingsFragment :
             .unregisterOnSharedPreferenceChangeListener(this)
     }
 
-    protected fun allPreferences(): List<Preference> {
-        val allPreferences = mutableListOf<Preference>()
-        for (i in 0 until preferenceScreen.preferenceCount) {
-            val pref = preferenceScreen.getPreference(i)
-            if (pref is PreferenceCategory) {
-                for (j in 0 until pref.preferenceCount) {
-                    allPreferences.add(pref.getPreference(j))
-                }
-            } else {
-                allPreferences.add(pref)
-            }
-        }
-        return allPreferences
-    }
-
     companion object {
         const val PREF_DIALOG_KEY = "key"
 

From f0f77a87d5838d7b15949119a72dca131aa9d55f Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Wed, 5 Feb 2025 19:17:58 -0300
Subject: [PATCH 052/200] feat: improve ControlPreference style

It is mostly a refactor because it generifies ControlPreference so it can be used in simple screens like the Previewer

but it also adds some icons to the control preference dialog
---
 .../ichi2/anki/cardviewer/ViewerCommand.kt    | 105 +++--
 .../preferences/ControlsSettingsFragment.kt   |  10 +-
 .../ichi2/anki/reviewer/MappableBinding.kt    |   2 +-
 .../ichi2/preferences/ControlPreference.kt    | 386 +++++++++---------
 .../preferences/ReviewerControlPreference.kt  |  75 ++++
 .../main/res/drawable/ic_remove_outline.xml   |   5 +
 .../src/main/res/drawable/ic_videogame.xml    |   5 +
 .../main/res/layout/control_preference.xml    |  64 +++
 .../layout/control_preference_list_item.xml   |  14 +
 .../src/main/res/values/10-preferences.xml    |   2 -
 .../src/main/res/xml/preferences_controls.xml |  98 ++---
 11 files changed, 457 insertions(+), 309 deletions(-)
 create mode 100644 AnkiDroid/src/main/java/com/ichi2/preferences/ReviewerControlPreference.kt
 create mode 100644 AnkiDroid/src/main/res/drawable/ic_remove_outline.xml
 create mode 100644 AnkiDroid/src/main/res/drawable/ic_videogame.xml
 create mode 100644 AnkiDroid/src/main/res/layout/control_preference.xml
 create mode 100644 AnkiDroid/src/main/res/layout/control_preference_list_item.xml

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/ViewerCommand.kt b/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/ViewerCommand.kt
index e8635969449f..981949961f96 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/ViewerCommand.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/ViewerCommand.kt
@@ -18,7 +18,6 @@ package com.ichi2.anki.cardviewer
 import android.content.SharedPreferences
 import android.view.KeyEvent
 import androidx.core.content.edit
-import com.ichi2.anki.R
 import com.ichi2.anki.reviewer.Binding.Companion.keyCode
 import com.ichi2.anki.reviewer.Binding.Companion.unicode
 import com.ichi2.anki.reviewer.Binding.ModifierKeys
@@ -31,60 +30,56 @@ import com.ichi2.anki.reviewer.MappableBinding.Companion.toPreferenceString
 import com.ichi2.anki.reviewer.ReviewerBinding
 
 /** Abstraction: Discuss moving many of these to 'Reviewer'  */
-enum class ViewerCommand(
-    val resourceId: Int,
-) {
-    SHOW_ANSWER(R.string.show_answer),
-    FLIP_OR_ANSWER_EASE1(R.string.answer_again),
-    FLIP_OR_ANSWER_EASE2(R.string.answer_hard),
-    FLIP_OR_ANSWER_EASE3(R.string.answer_good),
-    FLIP_OR_ANSWER_EASE4(R.string.answer_easy),
-    UNDO(R.string.undo),
-    REDO(R.string.redo),
-    EDIT(R.string.cardeditor_title_edit_card),
-    MARK(R.string.menu_mark_note),
-    BURY_CARD(R.string.menu_bury_card),
-    SUSPEND_CARD(R.string.menu_suspend_card),
-    DELETE(R.string.menu_delete_note),
-    PLAY_MEDIA(R.string.gesture_play),
-    EXIT(R.string.gesture_abort_learning),
-    BURY_NOTE(R.string.menu_bury_note),
-    SUSPEND_NOTE(R.string.menu_suspend_note),
-    TOGGLE_FLAG_RED(R.string.gesture_flag_red),
-    TOGGLE_FLAG_ORANGE(R.string.gesture_flag_orange),
-    TOGGLE_FLAG_GREEN(R.string.gesture_flag_green),
-    TOGGLE_FLAG_BLUE(R.string.gesture_flag_blue),
-    TOGGLE_FLAG_PINK(R.string.gesture_flag_pink),
-    TOGGLE_FLAG_TURQUOISE(R.string.gesture_flag_turquoise),
-    TOGGLE_FLAG_PURPLE(R.string.gesture_flag_purple),
-    UNSET_FLAG(R.string.gesture_flag_remove),
-    PAGE_UP(R.string.gesture_page_up),
-    PAGE_DOWN(R.string.gesture_page_down),
-    TAG(R.string.add_tag),
-    CARD_INFO(R.string.card_info_title),
-    ABORT_AND_SYNC(R.string.gesture_abort_sync),
-    RECORD_VOICE(R.string.record_voice),
-    SAVE_VOICE(R.string.save_voice),
-    REPLAY_VOICE(R.string.replay_voice),
-    TOGGLE_WHITEBOARD(R.string.gesture_toggle_whiteboard),
-    CLEAR_WHITEBOARD(R.string.clear_whiteboard),
-    CHANGE_WHITEBOARD_PEN_COLOR(R.string.title_whiteboard_editor),
-    SHOW_HINT(R.string.gesture_show_hint),
-    SHOW_ALL_HINTS(R.string.gesture_show_all_hints),
-    ADD_NOTE(R.string.menu_add_note),
-
-    // TODO: CollectionManager.TR.actionsSetDueDate()
-    RESCHEDULE_NOTE(R.string.card_editor_reschedule_card),
-    TOGGLE_AUTO_ADVANCE(R.string.toggle_auto_advance),
-    USER_ACTION_1(R.string.user_action_1),
-    USER_ACTION_2(R.string.user_action_2),
-    USER_ACTION_3(R.string.user_action_3),
-    USER_ACTION_4(R.string.user_action_4),
-    USER_ACTION_5(R.string.user_action_5),
-    USER_ACTION_6(R.string.user_action_6),
-    USER_ACTION_7(R.string.user_action_7),
-    USER_ACTION_8(R.string.user_action_8),
-    USER_ACTION_9(R.string.user_action_9),
+enum class ViewerCommand {
+    SHOW_ANSWER,
+    FLIP_OR_ANSWER_EASE1,
+    FLIP_OR_ANSWER_EASE2,
+    FLIP_OR_ANSWER_EASE3,
+    FLIP_OR_ANSWER_EASE4,
+    UNDO,
+    REDO,
+    EDIT,
+    MARK,
+    BURY_CARD,
+    SUSPEND_CARD,
+    DELETE,
+    PLAY_MEDIA,
+    EXIT,
+    BURY_NOTE,
+    SUSPEND_NOTE,
+    TOGGLE_FLAG_RED,
+    TOGGLE_FLAG_ORANGE,
+    TOGGLE_FLAG_GREEN,
+    TOGGLE_FLAG_BLUE,
+    TOGGLE_FLAG_PINK,
+    TOGGLE_FLAG_TURQUOISE,
+    TOGGLE_FLAG_PURPLE,
+    UNSET_FLAG,
+    PAGE_UP,
+    PAGE_DOWN,
+    TAG,
+    CARD_INFO,
+    ABORT_AND_SYNC,
+    RECORD_VOICE,
+    SAVE_VOICE,
+    REPLAY_VOICE,
+    TOGGLE_WHITEBOARD,
+    CLEAR_WHITEBOARD,
+    CHANGE_WHITEBOARD_PEN_COLOR,
+    SHOW_HINT,
+    SHOW_ALL_HINTS,
+    ADD_NOTE,
+    RESCHEDULE_NOTE,
+    TOGGLE_AUTO_ADVANCE,
+    USER_ACTION_1,
+    USER_ACTION_2,
+    USER_ACTION_3,
+    USER_ACTION_4,
+    USER_ACTION_5,
+    USER_ACTION_6,
+    USER_ACTION_7,
+    USER_ACTION_8,
+    USER_ACTION_9,
     ;
 
     companion object {
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/ControlsSettingsFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/ControlsSettingsFragment.kt
index e1917c16f950..0af409ed4e6f 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/ControlsSettingsFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/ControlsSettingsFragment.kt
@@ -25,6 +25,7 @@ import com.ichi2.anki.reviewer.MappableBinding.Companion.toPreferenceString
 import com.ichi2.anki.ui.internationalization.toSentenceCase
 import com.ichi2.annotations.NeedsTest
 import com.ichi2.preferences.ControlPreference
+import com.ichi2.preferences.ReviewerControlPreference
 
 class ControlsSettingsFragment : SettingsFragment() {
     override val preferenceResource: Int
@@ -39,9 +40,14 @@ class ControlsSettingsFragment : SettingsFragment() {
         // if a preference is empty, it has a value like "1/"
         preferenceScreen
             .allPreferences()
-            .filterIsInstance<ControlPreference>()
+            .filterIsInstance<ReviewerControlPreference>()
             .filter { pref -> pref.value == null }
-            .forEach { pref -> pref.value = commands[pref.key]?.defaultValue?.toPreferenceString() }
+            .forEach { pref ->
+                commands[pref.key]
+                    ?.defaultValue
+                    ?.toPreferenceString()
+                    ?.let { pref.value = it }
+            }
 
         setDynamicTitle()
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MappableBinding.kt b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MappableBinding.kt
index 787a7ee37dc5..818b8c27e8f3 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MappableBinding.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MappableBinding.kt
@@ -51,7 +51,7 @@ open class MappableBinding(
                 .joinToString(prefix = "1/", separator = PREF_SEPARATOR.toString())
 
         @CheckResult
-        fun fromString(s: String): MappableBinding? {
+        private fun fromString(s: String): MappableBinding? {
             if (s.isEmpty()) {
                 return null
             }
diff --git a/AnkiDroid/src/main/java/com/ichi2/preferences/ControlPreference.kt b/AnkiDroid/src/main/java/com/ichi2/preferences/ControlPreference.kt
index 04e27d35e7b8..b3c39f9ebf37 100644
--- a/AnkiDroid/src/main/java/com/ichi2/preferences/ControlPreference.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/preferences/ControlPreference.kt
@@ -1,5 +1,6 @@
 /*
  *  Copyright (c) 2021 David Allison <davidallisongithub@gmail.com>
+ *  Copyright (c) 2025 Brayan Oliveira <brayandso.dev@gmail.com>
  *
  *  This program is free software; you can redistribute it and/or modify it under
  *  the terms of the GNU General Public License as published by the Free Software
@@ -13,49 +14,49 @@
  *  You should have received a copy of the GNU General Public License along with
  *  this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package com.ichi2.preferences
 
-import android.annotation.SuppressLint
+import android.app.Dialog
 import android.content.Context
-import android.content.DialogInterface
+import android.os.Bundle
+import android.text.TextUtils
 import android.util.AttributeSet
+import android.view.View
+import android.widget.ArrayAdapter
+import android.widget.ListView
 import androidx.appcompat.app.AlertDialog
-import androidx.preference.ListPreference
+import androidx.core.view.isVisible
+import androidx.fragment.app.DialogFragment
+import androidx.preference.DialogPreference
+import androidx.preference.PreferenceFragmentCompat
 import com.ichi2.anki.R
-import com.ichi2.anki.cardviewer.GestureProcessor
-import com.ichi2.anki.cardviewer.ViewerCommand
-import com.ichi2.anki.dialogs.CardSideSelectionDialog
 import com.ichi2.anki.dialogs.GestureSelectionDialogUtils
 import com.ichi2.anki.dialogs.GestureSelectionDialogUtils.onGestureChanged
 import com.ichi2.anki.dialogs.KeySelectionDialogUtils
 import com.ichi2.anki.dialogs.WarningDisplay
-import com.ichi2.anki.preferences.sharedPrefs
-import com.ichi2.anki.reviewer.CardSide
+import com.ichi2.anki.preferences.SettingsFragment
+import com.ichi2.anki.preferences.allPreferences
+import com.ichi2.anki.preferences.requirePreference
+import com.ichi2.anki.reviewer.Binding
 import com.ichi2.anki.reviewer.MappableBinding
 import com.ichi2.anki.reviewer.MappableBinding.Companion.toPreferenceString
-import com.ichi2.anki.reviewer.ReviewerBinding
 import com.ichi2.anki.showThemedToast
 import com.ichi2.ui.AxisPicker
 import com.ichi2.ui.KeyPicker
+import com.ichi2.utils.create
 import com.ichi2.utils.customView
-import com.ichi2.utils.message
 import com.ichi2.utils.negativeButton
 import com.ichi2.utils.positiveButton
 import com.ichi2.utils.show
-import com.ichi2.utils.title
 
 /**
  * A preference which allows mapping of inputs to actions (example: keys -> commands)
  *
- * This is implemented as a List, the elements allow the user to either add, or
- * remove previously mapped keys
- *
- * Future:
- * * Allow mapping gestures here
- * * Allow maps other than the reviewer
+ * The user is allowed to either add or remove previously mapped keys
  */
-class ControlPreference : ListPreference {
+open class ControlPreference :
+    DialogPreference,
+    DialogFragmentProvider {
     @Suppress("unused")
     constructor(
         context: Context,
@@ -73,222 +74,207 @@ class ControlPreference : ListPreference {
     @Suppress("unused")
     constructor(context: Context) : super(context)
 
-    private fun refreshEntries() {
-        val entryTitles: MutableList<CharSequence> = ArrayList()
-        val entryIndices: MutableList<Int> = ArrayList()
-        // negative indices are "add"
-        entryTitles.add(context.getString(R.string.binding_add_key))
-        entryIndices.add(ADD_KEY_INDEX)
-        // Add a joystick/motion controller
-        entryTitles.add(context.getString(R.string.binding_add_axis))
-        entryIndices.add(ADD_AXIS_INDEX)
-        // Put "Add gesture" option if gestures are enabled
-        if (context.sharedPrefs().getBoolean(GestureProcessor.PREF_KEY, false)) {
-            entryTitles.add(context.getString(R.string.binding_add_gesture))
-            entryIndices.add(ADD_GESTURE_INDEX)
-        }
-        // 0 and above are "delete" actions for already mapped preferences
-        for ((i, binding) in MappableBinding.fromPreferenceString(value).withIndex()) {
-            entryTitles.add(context.getString(R.string.binding_remove_binding, binding.toDisplayString(context)))
-            entryIndices.add(i)
+    open fun getMappableBindings(): List<MappableBinding> = MappableBinding.fromPreferenceString(value)
+
+    protected open fun onKeySelected(binding: Binding): Unit = addBinding(binding)
+
+    protected open fun onAxisSelected(binding: Binding): Unit = addBinding(binding)
+
+    open val areGesturesEnabled: Boolean = false
+
+    protected open fun onGestureSelected(binding: Binding) = Unit
+
+    /** @return whether the binding is used in another action */
+    open fun warnIfUsed(
+        binding: Binding,
+        warningDisplay: WarningDisplay?,
+    ): Boolean {
+        val bindingPreference = getPreferenceAssignedTo(binding)
+        if (bindingPreference == null || bindingPreference == this) return false
+        val actionTitle = bindingPreference.title ?: ""
+        val warning = context.getString(R.string.bindings_already_bound, actionTitle)
+        if (warningDisplay != null) {
+            warningDisplay.setWarning(warning)
+        } else {
+            showThemedToast(context, warning, true)
         }
-        entries = entryTitles.toTypedArray()
-        entryValues = entryIndices.map { it.toString() }.toTypedArray()
+        return true
     }
 
-    override fun onClick() {
-        refreshEntries()
-        super.onClick()
-    }
+    var value: String?
+        get() = getPersistedString(null)
+        set(value) {
+            if (!TextUtils.equals(getPersistedString(null), value)) {
+                persistString(value)
+                notifyChanged()
+            }
+        }
 
-    /** The summary that appears on the preference */
-    override fun getSummary(): CharSequence =
-        MappableBinding
-            .fromPreferenceString(value)
-            .joinToString(", ") { it.toDisplayString(context) }
-
-    /** Called when an element is selected in the ListView */
-    @SuppressLint("CheckResult")
-    override fun callChangeListener(newValue: Any?): Boolean {
-        when (val index: Int = (newValue as String).toInt()) {
-            ADD_GESTURE_INDEX -> {
-                val actionName = title
-                AlertDialog.Builder(context).show {
-                    title(text = actionName.toString())
-
-                    val gesturePicker = GestureSelectionDialogUtils.getGesturePicker(context)
-
-                    positiveButton(R.string.dialog_ok) {
-                        val gesture = gesturePicker.getGesture() ?: return@positiveButton
-                        val mappableBinding = ReviewerBinding.fromGesture(gesture)
-                        if (bindingIsUsedOnAnotherCommand(mappableBinding)) {
-                            showDialogToReplaceBinding(mappableBinding, context.getString(R.string.binding_replace_gesture), it)
-                        } else {
-                            addBinding(mappableBinding)
-                            it.dismiss()
-                        }
-                    }
-                    negativeButton(R.string.dialog_cancel) { it.dismiss() }
-                    customView(view = gesturePicker)
-
-                    gesturePicker.onGestureChanged { gesture ->
-                        warnIfBindingIsUsed(ReviewerBinding.fromGesture(gesture), gesturePicker)
-                    }
-                }
+    override fun getSummary(): CharSequence = getMappableBindings().joinToString(", ") { it.toDisplayString(context) }
+
+    override fun makeDialogFragment(): DialogFragment = ControlPreferenceDialogFragment()
+
+    fun showGesturePickerDialog() {
+        AlertDialog.Builder(context).show {
+            setTitle(title)
+            setIcon(icon)
+            val gesturePicker = GestureSelectionDialogUtils.getGesturePicker(context)
+            positiveButton(R.string.dialog_ok) {
+                val gesture = gesturePicker.getGesture() ?: return@positiveButton
+                val binding = Binding.GestureInput(gesture)
+                onGestureSelected(binding)
+                it.dismiss()
             }
-            ADD_KEY_INDEX -> {
-                val actionName = title
-                AlertDialog.Builder(context).show {
-                    val keyPicker: KeyPicker = KeyPicker.inflate(context)
-                    customView(view = keyPicker.rootLayout)
-                    title(text = actionName.toString())
-
-                    // When the user presses a key
-                    keyPicker.setBindingChangedListener { binding ->
-                        val mappableBinding =
-                            ReviewerBinding(binding, CardSide.BOTH)
-                        warnIfBindingIsUsed(mappableBinding, keyPicker)
-                    }
-
-                    positiveButton(R.string.dialog_ok) {
-                        val binding = keyPicker.getBinding() ?: return@positiveButton
-                        // Use CardSide.BOTH as placeholder just to check if binding exists
-                        CardSideSelectionDialog.displayInstance(context) { side ->
-                            val mappableBinding = ReviewerBinding(binding, side)
-                            if (bindingIsUsedOnAnotherCommand(mappableBinding)) {
-                                showDialogToReplaceBinding(mappableBinding, context.getString(R.string.binding_replace_key), it)
-                            } else {
-                                addBinding(mappableBinding)
-                                it.dismiss()
-                            }
-                        }
-                    }
-                    negativeButton(R.string.dialog_cancel) { it.dismiss() }
-
-                    keyPicker.setKeycodeValidation(KeySelectionDialogUtils.disallowModifierKeyCodes())
-                }
+            negativeButton(R.string.dialog_cancel) { it.dismiss() }
+            customView(view = gesturePicker)
+            gesturePicker.onGestureChanged { gesture ->
+                warnIfUsedOrClearWarning(Binding.GestureInput(gesture), gesturePicker)
             }
-            ADD_AXIS_INDEX -> displayAddAxisDialog()
-            else -> {
-                val bindings: MutableList<MappableBinding> = MappableBinding.fromPreferenceString(value)
-                bindings.removeAt(index)
-                value = bindings.toPreferenceString()
+        }
+    }
+
+    fun showKeyPickerDialog() {
+        AlertDialog.Builder(context).show {
+            val keyPicker: KeyPicker = KeyPicker.inflate(context)
+            customView(view = keyPicker.rootLayout)
+            setTitle(title)
+            setIcon(icon)
+
+            // When the user presses a key
+            keyPicker.setBindingChangedListener { binding ->
+                warnIfUsedOrClearWarning(binding, keyPicker)
             }
+            positiveButton(R.string.dialog_ok) {
+                val binding = keyPicker.getBinding() ?: return@positiveButton
+                onKeySelected(binding)
+                it.dismiss()
+            }
+            negativeButton(R.string.dialog_cancel) { it.dismiss() }
+            keyPicker.setKeycodeValidation(KeySelectionDialogUtils.disallowModifierKeyCodes())
         }
-        // don't persist the value
-        return false
     }
 
-    @SuppressLint("CheckResult") // noAutoDismiss
-    private fun displayAddAxisDialog() {
-        val actionName = title
-        val axisPicker: AxisPicker = AxisPicker.inflate(context)
-        val dialog =
-            AlertDialog
-                .Builder(context)
-                .customView(view = axisPicker.rootLayout)
-                .title(text = actionName.toString())
-                .negativeButton(R.string.dialog_cancel) { it.dismiss() }
-                .create()
-
-        axisPicker.setBindingChangedListener { binding ->
-            showToastIfBindingIsUsed(ReviewerBinding(binding, CardSide.BOTH))
-            // Use CardSide.BOTH as placeholder just to check if binding exists
-            CardSideSelectionDialog.displayInstance(context) { side ->
-                val mappableBinding = ReviewerBinding(binding, side)
-                if (bindingIsUsedOnAnotherCommand(mappableBinding)) {
-                    showDialogToReplaceBinding(mappableBinding, context.getString(R.string.binding_replace_key), dialog)
-                } else {
-                    addBinding(mappableBinding)
-                    dialog.dismiss()
+    fun showAddAxisDialog() {
+        val axisPicker =
+            AxisPicker.inflate(context).apply {
+                setBindingChangedListener { binding ->
+                    warnIfUsedOrClearWarning(binding, warningDisplay = null)
+                    onAxisSelected(binding)
                 }
             }
+        AlertDialog.Builder(context).show {
+            customView(view = axisPicker.rootLayout)
+            setTitle(title)
+            setIcon(icon)
+            negativeButton(R.string.dialog_cancel) { it.dismiss() }
         }
-
-        dialog.show()
     }
 
-    /**
-     * Return if another command uses
-     */
-    private fun bindingIsUsedOnAnotherCommand(binding: MappableBinding): Boolean = getCommandWithBindingExceptThis(binding) != null
-
-    private fun warnIfBindingIsUsed(
-        binding: MappableBinding,
-        warningDisplay: WarningDisplay,
+    private fun warnIfUsedOrClearWarning(
+        binding: Binding,
+        warningDisplay: WarningDisplay?,
     ) {
-        getCommandWithBindingExceptThis(binding)?.let {
-            val name = context.getString(it.resourceId)
-            val warning = context.getString(R.string.bindings_already_bound, name)
-            warningDisplay.setWarning(warning)
-        } ?: warningDisplay.clearWarning()
+        if (!warnIfUsed(binding, warningDisplay)) {
+            warningDisplay?.clearWarning()
+        }
     }
 
-    /** Displays a warning to the user if the provided binding couldn't be used */
-    private fun showToastIfBindingIsUsed(binding: MappableBinding) {
-        val bindingCommand =
-            getCommandWithBindingExceptThis(binding)
-                ?: return
-
-        val commandName = context.getString(bindingCommand.resourceId)
-        val text = context.getString(R.string.bindings_already_bound, commandName)
-        showThemedToast(context, text, true)
+    fun removeMappableBinding(binding: MappableBinding) {
+        val bindings = getMappableBindings().toMutableList()
+        bindings.remove(binding)
+        value = bindings.toPreferenceString()
     }
 
-    /** @return command where the binding is mapped excluding the current command */
-    private fun getCommandWithBindingExceptThis(binding: MappableBinding): ViewerCommand? =
-        MappableBinding
-            .allMappings(context.sharedPrefs())
-            // filter to the commands which have a binding matching this one except this
-            .firstOrNull { x -> x.second.any { cmdBinding -> cmdBinding == binding } && x.first.preferenceKey != key }
-            ?.first
-
-    private fun addBinding(binding: MappableBinding) {
-        val bindings = MappableBinding.fromPreferenceString(value)
-        // by removing the binding, we ensure it's now at the start of the list
-        bindings.remove(binding)
-        bindings.add(0, binding)
+    private fun addBinding(binding: Binding) {
+        val newBinding = MappableBinding(binding)
+        getPreferenceAssignedTo(binding)?.removeMappableBinding(newBinding)
+        val bindings = getMappableBindings().toMutableList()
+        bindings.add(newBinding)
         value = bindings.toPreferenceString()
     }
 
     /**
-     * Remove binding from all control preferences other than this one
+     * Checks if any other [ControlPreference] in the `preferenceScreen`
+     * has the given [binding] assigned to.
      */
-    private fun clearBinding(binding: MappableBinding) {
-        for (command in ViewerCommand.entries) {
-            val commandPreference =
-                preferenceManager.findPreference<ControlPreference>(command.preferenceKey)
-                    ?: continue
-            val bindings = MappableBinding.fromPreferenceString(commandPreference.value)
+    protected fun getPreferenceAssignedTo(binding: Binding): ControlPreference? {
+        for (pref in preferenceManager.preferenceScreen.allPreferences()) {
+            if (pref !is ControlPreference) continue
+            val bindings = pref.getMappableBindings().map { it.binding }
             if (binding in bindings) {
-                bindings.remove(binding)
-                commandPreference.value = bindings.toPreferenceString()
+                return pref
             }
         }
+        return null
     }
+}
 
-    private fun showDialogToReplaceBinding(
-        binding: MappableBinding,
-        title: String,
-        parentDialog: DialogInterface,
-    ) {
-        val commandName = context.getString(getCommandWithBindingExceptThis(binding)!!.resourceId)
+class ControlPreferenceDialogFragment : DialogFragment() {
+    private lateinit var preference: ControlPreference
 
-        AlertDialog.Builder(context).show {
-            title(text = title)
-            message(text = context.getString(R.string.bindings_already_bound, commandName))
-            positiveButton(R.string.dialog_positive_replace) {
-                clearBinding(binding)
-                addBinding(binding)
-                parentDialog.dismiss()
+    @Suppress("DEPRECATION") // targetFragment
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val key =
+            requireNotNull(requireArguments().getString(SettingsFragment.PREF_DIALOG_KEY)) {
+                "ControlPreferenceDialogFragment must have a 'key' argument leading to its preference"
             }
+        preference = (targetFragment as PreferenceFragmentCompat).requirePreference(key)
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val view = requireActivity().layoutInflater.inflate(R.layout.control_preference, null)
+
+        setupAddBindingDialogs(view)
+        setupRemoveControlEntries(view)
+
+        return AlertDialog.Builder(requireContext()).create {
+            setTitle(preference.title)
+            setIcon(preference.icon)
+            customView(view, paddingTop = 24)
             negativeButton(R.string.dialog_cancel)
         }
     }
 
-    companion object {
-        private const val ADD_AXIS_INDEX = -3
-        private const val ADD_KEY_INDEX = -2
-        private const val ADD_GESTURE_INDEX = -1
+    private fun setupAddBindingDialogs(view: View) {
+        view.findViewById<View>(R.id.add_gesture).apply {
+            setOnClickListener {
+                preference.showGesturePickerDialog()
+                dismiss()
+            }
+            isVisible = preference.areGesturesEnabled
+        }
+
+        view.findViewById<View>(R.id.add_key).setOnClickListener {
+            preference.showKeyPickerDialog()
+            dismiss()
+        }
+
+        view.findViewById<View>(R.id.add_axis).setOnClickListener {
+            preference.showAddAxisDialog()
+            dismiss()
+        }
+    }
+
+    private fun setupRemoveControlEntries(view: View) {
+        val bindings = preference.getMappableBindings().toMutableList()
+        val listView = view.findViewById<ListView>(R.id.list_view)
+        if (bindings.isEmpty()) {
+            listView.isVisible = false
+            return
+        }
+        val titles =
+            bindings.map {
+                getString(R.string.binding_remove_binding, it.toDisplayString(requireContext()))
+            }
+        listView.apply {
+            adapter = ArrayAdapter(requireContext(), R.layout.control_preference_list_item, titles)
+            setOnItemClickListener { _, _, index, _ ->
+                bindings.removeAt(index)
+                preference.value = bindings.toPreferenceString()
+                dismiss()
+            }
+        }
     }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/preferences/ReviewerControlPreference.kt b/AnkiDroid/src/main/java/com/ichi2/preferences/ReviewerControlPreference.kt
new file mode 100644
index 000000000000..fd1d7506cd7a
--- /dev/null
+++ b/AnkiDroid/src/main/java/com/ichi2/preferences/ReviewerControlPreference.kt
@@ -0,0 +1,75 @@
+/*
+ *  Copyright (c) 2024 Brayan Oliveira <brayandso.dev@gmail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify it under
+ *  the terms of the GNU General Public License as published by the Free Software
+ *  Foundation; either version 3 of the License, or (at your option) any later
+ *  version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ *  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ *  PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with
+ *  this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.ichi2.preferences
+
+import android.content.Context
+import android.util.AttributeSet
+import com.ichi2.anki.cardviewer.GestureProcessor
+import com.ichi2.anki.dialogs.CardSideSelectionDialog
+import com.ichi2.anki.reviewer.Binding
+import com.ichi2.anki.reviewer.CardSide
+import com.ichi2.anki.reviewer.MappableBinding
+import com.ichi2.anki.reviewer.MappableBinding.Companion.toPreferenceString
+import com.ichi2.anki.reviewer.ReviewerBinding
+
+class ReviewerControlPreference : ControlPreference {
+    @Suppress("unused")
+    constructor(
+        context: Context,
+        attrs: AttributeSet?,
+        defStyleAttr: Int,
+        defStyleRes: Int,
+    ) : super(context, attrs, defStyleAttr, defStyleRes)
+
+    @Suppress("unused")
+    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr)
+
+    @Suppress("unused")
+    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
+
+    @Suppress("unused")
+    constructor(context: Context) : super(context)
+
+    override val areGesturesEnabled: Boolean
+        get() = sharedPreferences?.getBoolean(GestureProcessor.PREF_KEY, false) ?: false
+
+    override fun getMappableBindings() = MappableBinding.fromPreferenceString(value).toList()
+
+    override fun onKeySelected(binding: Binding) {
+        CardSideSelectionDialog.displayInstance(context) { side ->
+            addBinding(binding, side)
+        }
+    }
+
+    override fun onGestureSelected(binding: Binding) = addBinding(binding, CardSide.BOTH)
+
+    override fun onAxisSelected(binding: Binding) {
+        CardSideSelectionDialog.displayInstance(context) { side ->
+            addBinding(binding, side)
+        }
+    }
+
+    private fun addBinding(
+        binding: Binding,
+        side: CardSide,
+    ) {
+        val newBinding = ReviewerBinding(binding, side)
+        getPreferenceAssignedTo(binding)?.removeMappableBinding(newBinding)
+        val bindings = MappableBinding.fromPreferenceString(value).toMutableList()
+        bindings.add(newBinding)
+        value = bindings.toPreferenceString()
+    }
+}
diff --git a/AnkiDroid/src/main/res/drawable/ic_remove_outline.xml b/AnkiDroid/src/main/res/drawable/ic_remove_outline.xml
new file mode 100644
index 000000000000..2326cd6414a0
--- /dev/null
+++ b/AnkiDroid/src/main/res/drawable/ic_remove_outline.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="?attr/colorControlNormal" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M7,11v2h10v-2L7,11zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>
+    
+</vector>
diff --git a/AnkiDroid/src/main/res/drawable/ic_videogame.xml b/AnkiDroid/src/main/res/drawable/ic_videogame.xml
new file mode 100644
index 000000000000..6e78a4a0f20f
--- /dev/null
+++ b/AnkiDroid/src/main/res/drawable/ic_videogame.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="?attr/colorControlNormal" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M21,6L3,6c-1.1,0 -2,0.9 -2,2v8c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,8c0,-1.1 -0.9,-2 -2,-2zM11,13L8,13v3L6,16v-3L3,13v-2h3L6,8h2v3h3v2zM15.5,15c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM19.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S18.67,9 19.5,9s1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
+    
+</vector>
diff --git a/AnkiDroid/src/main/res/layout/control_preference.xml b/AnkiDroid/src/main/res/layout/control_preference.xml
new file mode 100644
index 000000000000..06c4cee8468c
--- /dev/null
+++ b/AnkiDroid/src/main/res/layout/control_preference.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    tools:context="com.ichi2.preferences.ControlPreference"
+    >
+
+    <com.ichi2.ui.FixedTextView
+        android:id="@+id/add_gesture"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="?attr/listPreferredItemHeight"
+        android:text="@string/binding_add_gesture"
+        android:gravity="center_vertical"
+        android:drawableStart="@drawable/ic_touch"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:drawablePadding="16dp"
+        android:background="?android:attr/selectableItemBackground"
+        android:clickable="true"
+        android:textAppearance="?attr/textAppearanceBodyLarge"
+        />
+
+    <com.ichi2.ui.FixedTextView
+        android:id="@+id/add_key"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="?attr/listPreferredItemHeight"
+        android:text="@string/binding_add_key"
+        android:drawableStart="@drawable/ic_keyboard"
+        android:gravity="center_vertical"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:drawablePadding="16dp"
+        android:background="?android:attr/selectableItemBackground"
+        android:clickable="true"
+        android:textAppearance="?attr/textAppearanceBodyLarge"
+        />
+
+    <com.ichi2.ui.FixedTextView
+        android:id="@+id/add_axis"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="?attr/listPreferredItemHeight"
+        android:text="@string/binding_add_axis"
+        android:drawableStart="@drawable/ic_videogame"
+        android:gravity="center_vertical"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:drawablePadding="16dp"
+        android:background="?android:attr/selectableItemBackground"
+        android:clickable="true"
+        android:textAppearance="?attr/textAppearanceBodyLarge"
+        />
+
+    <ListView
+        android:id="@+id/list_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:divider="@null"
+        />
+</LinearLayout>
\ No newline at end of file
diff --git a/AnkiDroid/src/main/res/layout/control_preference_list_item.xml b/AnkiDroid/src/main/res/layout/control_preference_list_item.xml
new file mode 100644
index 000000000000..5b88f37fd7b3
--- /dev/null
+++ b/AnkiDroid/src/main/res/layout/control_preference_list_item.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.ichi2.ui.FixedTextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:textAppearance="?attr/textAppearanceBodyLarge"
+    tools:text="Remove ‘\u2328 Space’"
+    android:drawableStart="@drawable/ic_remove_outline"
+    android:drawablePadding="16dp"
+    android:background="?selectableItemBackground" />
diff --git a/AnkiDroid/src/main/res/values/10-preferences.xml b/AnkiDroid/src/main/res/values/10-preferences.xml
index c90430f1c029..784263046efa 100644
--- a/AnkiDroid/src/main/res/values/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values/10-preferences.xml
@@ -251,9 +251,7 @@
 
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/xml/preferences_controls.xml b/AnkiDroid/src/main/res/xml/preferences_controls.xml
index 3cd8bbdec0c5..f620c1889083 100644
--- a/AnkiDroid/src/main/res/xml/preferences_controls.xml
+++ b/AnkiDroid/src/main/res/xml/preferences_controls.xml
@@ -58,65 +58,65 @@
         />
 
     <PreferenceCategory android:title="@string/answer_buttons">
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/show_answer_command_key"
             android:title="@string/show_answer"
             />
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/answer_again_command_key"
             android:title="@string/answer_again"
             />
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/answer_hard_command_key"
             android:title="@string/answer_hard"
             />
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/answer_good_command_key"
             android:title="@string/answer_good"
             />
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/answer_easy_command_key"
             android:title="@string/answer_easy"
             />
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/filter_by_flags">
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/flag_red_command_key"
             android:title="@string/gesture_flag_red"
             android:icon="@drawable/ic_flag_red"
             />
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/flag_orange_command_key"
             android:title="@string/gesture_flag_orange"
             android:icon="@drawable/ic_flag_orange"
             />
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/flag_green_command_key"
             android:title="@string/gesture_flag_green"
             android:icon="@drawable/ic_flag_green"
             />
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/flag_blue_command_key"
             android:title="@string/gesture_flag_blue"
             android:icon="@drawable/ic_flag_blue"
             />
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/flag_pink_command_key"
             android:title="@string/gesture_flag_pink"
             android:icon="@drawable/ic_flag_pink"
             />
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/flag_turquoise_command_key"
             android:title="@string/gesture_flag_turquoise"
             android:icon="@drawable/ic_flag_turquoise"
             />
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/flag_purple_command_key"
             android:title="@string/gesture_flag_purple"
             android:icon="@drawable/ic_flag_purple"
             />
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/remove_flag_command_key"
             android:title="@string/gesture_flag_remove"
             android:icon="@drawable/ic_flag_transparent"
@@ -124,22 +124,22 @@
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/card">
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/bury_card_command_key"
             android:title="@string/menu_bury_card"
             android:icon="@drawable/ic_flip_to_back_white"
             />
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/suspend_card_command_key"
             android:title="@string/menu_suspend_card"
             android:icon="@drawable/ic_suspend"
             />
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/reschedule_command_key"
             tools:title="Set due date"
             android:icon="@drawable/ic_reschedule"
             />
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/card_info_command_key"
             android:title="@string/card_info_title"
             android:icon="@drawable/ic_outline_info_24"
@@ -147,37 +147,37 @@
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/note">
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/bury_note_command_key"
             android:title="@string/menu_bury_note"
             android:icon="@drawable/ic_flip_to_back_white"
             />
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/suspend_note_command_key"
             android:title="@string/menu_suspend_note"
             android:icon="@drawable/ic_suspend"
             />
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/delete_command_key"
             android:title="@string/menu_delete_note"
             android:icon="@drawable/ic_delete_white"
             />
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/mark_command_key"
             android:title="@string/menu_mark_note"
             android:icon="@drawable/ic_star_border_white"
             />
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/edit_command_key"
             android:title="@string/cardeditor_title_edit_card"
             android:icon="@drawable/ic_popup_menu_item_editor"
             />
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/tag_command_key"
             android:title="@string/menu_edit_tags"
             android:icon="@drawable/ic_tag"
             />
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/add_note_command_key"
             android:title="@string/menu_add_note"
             android:icon="@drawable/ic_add"
@@ -185,22 +185,22 @@
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/navigation">
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/page_up_command_key"
             android:title="@string/gesture_page_up"
             android:icon="@drawable/ic_double_arrow_up"
             />
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/page_down_command_key"
             android:title="@string/gesture_page_down"
             android:icon="@drawable/ic_double_arrow_down"
             />
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/abort_command_key"
             android:title="@string/gesture_abort_learning"
             android:icon="@drawable/close_icon"
             />
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/abort_and_sync_command_key"
             android:title="@string/gesture_abort_sync"
             android:icon="@drawable/ic_sync"
@@ -208,39 +208,39 @@
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/media">
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/play_media_command_key"
             android:title="@string/gesture_play"
             android:icon="@drawable/ic_play_circle_white"
             />
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/record_voice_command_key"
             android:title="@string/record_voice"
             android:icon="@drawable/ic_action_mic"
             />
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/replay_voice_command_key"
             android:title="@string/replay_voice"
             app:icon="@drawable/ic_replay"
             />
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/save_voice_command_key"
             android:title="@string/save_voice"
             app:icon="@drawable/round_done_24"/>
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/pref_cat_whiteboard">
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/toggle_whiteboard_command_key"
             android:title="@string/gesture_toggle_whiteboard"
             android:icon="@drawable/ic_gesture_white"
             />
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/clear_whiteboard_command_key"
             android:title="@string/clear_whiteboard"
             android:icon="@drawable/ic_clear_white"
             />
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/change_whiteboard_pen_color_command_key"
             android:title="@string/title_whiteboard_editor"
             android:icon="@drawable/ic_color_lens_white_24dp"
@@ -248,27 +248,27 @@
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/misc">
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/undo_command_key"
             android:title="@string/undo"
             android:icon="@drawable/ic_undo_white"
             />
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/redo_command_key"
             android:title="@string/redo"
             android:icon="@drawable/ic_redo"
             />
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/toggle_auto_advance_command_key"
             android:title="@string/toggle_auto_advance"
             android:icon="@drawable/ic_fast_forward"
             />
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/show_hint_command_key"
             android:title="@string/gesture_show_hint"
             android:icon="@drawable/ic_lightbulb"
             />
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/show_all_hints_command_key"
             android:title="@string/gesture_show_all_hints"
             android:icon="@drawable/ic_lightbulb_stars"
@@ -281,47 +281,47 @@
         android:summary="@string/user_actions_summary"
         app:helpLink="@string/link_user_actions_help">
 
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/user_action_1_key"
             android:title="@string/user_action_1"
             android:icon="@drawable/user_action_1"
             />
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/user_action_2_key"
             android:title="@string/user_action_2"
             android:icon="@drawable/user_action_2"
             />
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/user_action_3_key"
             android:title="@string/user_action_3"
             android:icon="@drawable/user_action_3"
             />
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/user_action_4_key"
             android:title="@string/user_action_4"
             android:icon="@drawable/user_action_4"
             />
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/user_action_5_key"
             android:title="@string/user_action_5"
             android:icon="@drawable/user_action_5"
             />
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/user_action_6_key"
             android:title="@string/user_action_6"
             android:icon="@drawable/user_action_6"
             />
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/user_action_7_key"
             android:title="@string/user_action_7"
             android:icon="@drawable/user_action_7"
             />
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/user_action_8_key"
             android:title="@string/user_action_8"
             android:icon="@drawable/user_action_8"
             />
-        <com.ichi2.preferences.ControlPreference
+        <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/user_action_9_key"
             android:title="@string/user_action_9"
             android:icon="@drawable/user_action_9"

From fa5d801cc46759a0eb565edf8b64fbba4505ffa7 Mon Sep 17 00:00:00 2001
From: Sagar <sagar.0dev@gmail.com>
Date: Thu, 13 Feb 2025 19:23:37 +0530
Subject: [PATCH 053/200] Fixes #17970 - Pass DeckId to NoteEditor From
 Snackbar

---
 AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt b/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
index 0520ea2c1312..2c5b23793909 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
@@ -1603,8 +1603,8 @@ open class DeckPicker :
         dismissAllDialogFragments()
     }
 
-    fun addNote() {
-        val intent = NoteEditorLauncher.AddNote().toIntent(this)
+    fun addNote(did: DeckId? = null) {
+        val intent = NoteEditorLauncher.AddNote(did).toIntent(this)
         startActivity(intent)
     }
 
@@ -2137,7 +2137,7 @@ open class DeckPicker :
     ) {
         fun showEmptyDeckSnackbar() =
             showSnackbar(R.string.empty_deck) {
-                setAction(R.string.menu_add) { addNote() }
+                setAction(R.string.menu_add) { addNote(did) }
             }
 
         /** Check if we need to update the fragment or update the deck list */

From 53da14ede77552023d411488359fb9775220f01e Mon Sep 17 00:00:00 2001
From: Mike Hardy <github@mikehardy.net>
Date: Thu, 13 Feb 2025 21:31:04 -0500
Subject: [PATCH 054/200] build(deps): anki25.02

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9044d316534a..2e083f5c2872 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -59,7 +59,7 @@ androidxViewpager2 = "1.1.0"
 androidxWebkit = "1.12.1"
 # https://developer.android.com/jetpack/androidx/releases/work
 androidxWork = "2.10.0"
-ankiBackend = '0.1.49-anki25.01rc1'
+ankiBackend = '0.1.50-anki25.02'
 autoService = "1.1.1"
 autoServiceAnnotations = "1.1.1"
 colorpicker = "1.2.0"

From 748aecbf045b6c5efcd75f820e929e1db061f95a Mon Sep 17 00:00:00 2001
From: AnkiDroid Translations <ankidroid@ankidroid.org>
Date: Fri, 14 Feb 2025 00:08:53 +0000
Subject: [PATCH 055/200] Updated strings from Crowdin

---
 AnkiDroid/src/main/res/values-af/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-af/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-am/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-am/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-ar/03-dialogs.xml         | 9 ---------
 AnkiDroid/src/main/res/values-ar/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-az/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-az/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-be/03-dialogs.xml         | 7 -------
 AnkiDroid/src/main/res/values-be/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-bg/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-bg/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-bn/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-bn/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-ca/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-ca/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-ckb/03-dialogs.xml        | 5 -----
 AnkiDroid/src/main/res/values-ckb/10-preferences.xml    | 2 --
 AnkiDroid/src/main/res/values-cs/03-dialogs.xml         | 7 -------
 AnkiDroid/src/main/res/values-cs/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-da/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-da/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-de/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-de/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-el/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-el/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-eo/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-eo/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-es-rAR/03-dialogs.xml     | 5 -----
 AnkiDroid/src/main/res/values-es-rAR/10-preferences.xml | 2 --
 AnkiDroid/src/main/res/values-es-rES/03-dialogs.xml     | 5 -----
 AnkiDroid/src/main/res/values-es-rES/10-preferences.xml | 2 --
 AnkiDroid/src/main/res/values-et/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-et/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-eu/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-eu/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-fa/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-fa/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-fi/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-fi/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-fil/03-dialogs.xml        | 5 -----
 AnkiDroid/src/main/res/values-fil/10-preferences.xml    | 2 --
 AnkiDroid/src/main/res/values-fr/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-fr/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-fy/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-fy/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-ga/03-dialogs.xml         | 8 --------
 AnkiDroid/src/main/res/values-ga/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-gl/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-gl/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-got/03-dialogs.xml        | 5 -----
 AnkiDroid/src/main/res/values-got/10-preferences.xml    | 2 --
 AnkiDroid/src/main/res/values-gu/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-gu/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-heb/03-dialogs.xml        | 7 -------
 AnkiDroid/src/main/res/values-heb/10-preferences.xml    | 2 --
 AnkiDroid/src/main/res/values-hi/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-hi/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-hr/03-dialogs.xml         | 6 ------
 AnkiDroid/src/main/res/values-hr/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-hu/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-hu/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-hy/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-hy/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-ind/03-dialogs.xml        | 4 ----
 AnkiDroid/src/main/res/values-ind/10-preferences.xml    | 2 --
 AnkiDroid/src/main/res/values-is/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-is/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-it/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-it/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-iw/03-dialogs.xml         | 7 -------
 AnkiDroid/src/main/res/values-iw/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-ja/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-ja/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-jv/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-jv/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-ka/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-ka/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-kk/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-kk/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-km/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-km/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-kn/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-kn/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-ko/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-ko/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-ku/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-ku/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-ky/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-ky/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-lt/03-dialogs.xml         | 7 -------
 AnkiDroid/src/main/res/values-lt/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-lv/03-dialogs.xml         | 6 ------
 AnkiDroid/src/main/res/values-lv/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-mk/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-mk/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-ml/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-ml/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-mn/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-mn/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-mr/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-mr/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-ms/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-ms/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-my/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-my/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-nl/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-nl/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-nn/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-nn/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-no/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-no/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-or/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-or/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-pa/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-pa/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-pl/03-dialogs.xml         | 7 -------
 AnkiDroid/src/main/res/values-pl/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-pt-rBR/03-dialogs.xml     | 5 -----
 AnkiDroid/src/main/res/values-pt-rBR/10-preferences.xml | 2 --
 AnkiDroid/src/main/res/values-pt-rPT/03-dialogs.xml     | 5 -----
 AnkiDroid/src/main/res/values-pt-rPT/10-preferences.xml | 2 --
 AnkiDroid/src/main/res/values-ro/03-dialogs.xml         | 6 ------
 AnkiDroid/src/main/res/values-ro/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-ru/03-dialogs.xml         | 7 -------
 AnkiDroid/src/main/res/values-ru/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-sat/03-dialogs.xml        | 5 -----
 AnkiDroid/src/main/res/values-sat/10-preferences.xml    | 2 --
 AnkiDroid/src/main/res/values-sc/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-sc/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-sk/03-dialogs.xml         | 7 -------
 AnkiDroid/src/main/res/values-sk/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-sl/03-dialogs.xml         | 7 -------
 AnkiDroid/src/main/res/values-sl/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-sq/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-sq/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-sr/03-dialogs.xml         | 6 ------
 AnkiDroid/src/main/res/values-sr/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-ss/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-ss/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-sv/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-sv/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-sw/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-sw/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-ta/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-ta/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-te/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-te/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-tg/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-tg/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-tgl/03-dialogs.xml        | 5 -----
 AnkiDroid/src/main/res/values-tgl/10-preferences.xml    | 2 --
 AnkiDroid/src/main/res/values-th/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-th/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-ti/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-ti/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-tn/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-tn/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-tr/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-tr/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-ts/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-ts/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-tt/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-tt/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-ug/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-ug/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-uk/03-dialogs.xml         | 7 -------
 AnkiDroid/src/main/res/values-uk/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-ur/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-ur/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-uz/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-uz/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-ve/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-ve/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-vi/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-vi/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-wo/03-dialogs.xml         | 4 ----
 AnkiDroid/src/main/res/values-wo/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-xh/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-xh/10-preferences.xml     | 2 --
 AnkiDroid/src/main/res/values-yue/03-dialogs.xml        | 4 ----
 AnkiDroid/src/main/res/values-yue/10-preferences.xml    | 2 --
 AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml     | 4 ----
 AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml | 2 --
 AnkiDroid/src/main/res/values-zh-rTW/03-dialogs.xml     | 4 ----
 AnkiDroid/src/main/res/values-zh-rTW/10-preferences.xml | 2 --
 AnkiDroid/src/main/res/values-zu/03-dialogs.xml         | 5 -----
 AnkiDroid/src/main/res/values-zu/10-preferences.xml     | 2 --
 188 files changed, 675 deletions(-)

diff --git a/AnkiDroid/src/main/res/values-af/03-dialogs.xml b/AnkiDroid/src/main/res/values-af/03-dialogs.xml
index bedd2ec9b523..36ade9d632ef 100644
--- a/AnkiDroid/src/main/res/values-af/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-af/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Verwyder gefilterde pak %s en stuur alle kaarte terug na hul oorspronklike pakke?</string>
     <string name="no_tts_available_message">Geen teks-na-spraak taal beskikbaar nie</string>
     <string name="tts_no_tts">Moet nie praat nie</string>
-    <string name="reposition_card_dialog_title">Herposisioneer nuwe kaart</string>
     <string name="reposition_card_not_new_error">Slegs nuwe kaarte kan herposisioneer word</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d kaart herposisioneer</item>
-        <item quantity="other">%d kaarte herposisioneer</item>
-    </plurals>
     <string name="reset_card_dialog_title">Herstel kaart vordering</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d kaart herstel</item>
diff --git a/AnkiDroid/src/main/res/values-af/10-preferences.xml b/AnkiDroid/src/main/res/values-af/10-preferences.xml
index bc44eda2bc86..248b4b61f340 100644
--- a/AnkiDroid/src/main/res/values-af/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-af/10-preferences.xml
@@ -262,9 +262,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-am/03-dialogs.xml b/AnkiDroid/src/main/res/values-am/03-dialogs.xml
index bba24a6cda13..10a8ad3103bb 100644
--- a/AnkiDroid/src/main/res/values-am/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-am/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="reposition_card_dialog_title">የአዲስ ካርድ ቦታ መለወጫ</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">የ %d ካርድ ቦታ ተለውጧል</item>
-        <item quantity="other">የ %d ካርዶች ቦታ ተለውጧል</item>
-    </plurals>
     <string name="reset_card_dialog_title">Reset card progress</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d card reset</item>
diff --git a/AnkiDroid/src/main/res/values-am/10-preferences.xml b/AnkiDroid/src/main/res/values-am/10-preferences.xml
index e17a1240c9b2..aae58b25247e 100644
--- a/AnkiDroid/src/main/res/values-am/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-am/10-preferences.xml
@@ -262,9 +262,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-ar/03-dialogs.xml b/AnkiDroid/src/main/res/values-ar/03-dialogs.xml
index a624059dbaaa..d968bb324ef7 100644
--- a/AnkiDroid/src/main/res/values-ar/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ar/03-dialogs.xml
@@ -59,16 +59,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">لا يتوفر دعم تحويل النص إلى كلام لأي لغة</string>
     <string name="tts_no_tts">لا تنطق</string>
-    <string name="reposition_card_dialog_title">تغيير موضع البطاقة الجديدة</string>
     <string name="reposition_card_not_new_error">يمكن تغيير موضع البطاقات الجديدة فقط</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="zero">تم تغيير موضع %d بطاقة</item>
-        <item quantity="one">تم تغيير موضع %d بطاقة</item>
-        <item quantity="two">تم تغيير موضع %d بطاقة</item>
-        <item quantity="few">تم تغيير موضع %d بطاقات</item>
-        <item quantity="many">تم تغيير موضع %d بطاقة</item>
-        <item quantity="other">تم تغيير موضع %d بطاقة</item>
-    </plurals>
     <string name="reset_card_dialog_title">تصفير تقدم البطاقة</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="zero">تم تصفير %d بطاقة</item>
diff --git a/AnkiDroid/src/main/res/values-ar/10-preferences.xml b/AnkiDroid/src/main/res/values-ar/10-preferences.xml
index ff11a88db0a2..73c6197ebe7e 100644
--- a/AnkiDroid/src/main/res/values-ar/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ar/10-preferences.xml
@@ -269,9 +269,7 @@
     <string name="donate_description"><![CDATA[تستطيع دعم تطوير أنكيدرويد من خلال <a href=\"%1$s\">التبرع</a>. نقدّر أي كمية.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">إضافة إيماءة</string>
-    <string name="binding_replace_gesture">استبدال الإيماء</string>
     <string name="binding_add_key">إضافة مفتاح</string>
-    <string name="binding_replace_key">استبدال المفتاح</string>
     <string name="key_picker_default_press_key">ضغط مفتاح</string>
     <string name="binding_add_axis">إضافة وحدة عصا التحكم أو جهاز التحرك/حركة</string>
     <string name="axis_picker_move_joystick">نقل وحدة عصا التحكم أو جهاز التحرك/حركة</string>
diff --git a/AnkiDroid/src/main/res/values-az/03-dialogs.xml b/AnkiDroid/src/main/res/values-az/03-dialogs.xml
index f8b3c7ecf142..36c60a1f1c9c 100644
--- a/AnkiDroid/src/main/res/values-az/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-az/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Mətndən-çıxış dilinə ehtiyac yoxdur</string>
     <string name="tts_no_tts">Söhbət etməyin</string>
-    <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d card repositioned</item>
-        <item quantity="other">%d cards repositioned</item>
-    </plurals>
     <string name="reset_card_dialog_title">Kartın tərəqqisini bərpa edin</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d card reset</item>
diff --git a/AnkiDroid/src/main/res/values-az/10-preferences.xml b/AnkiDroid/src/main/res/values-az/10-preferences.xml
index 8065f6b15c1d..4fda357d1c06 100644
--- a/AnkiDroid/src/main/res/values-az/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-az/10-preferences.xml
@@ -262,9 +262,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-be/03-dialogs.xml b/AnkiDroid/src/main/res/values-be/03-dialogs.xml
index b37b6c4d6299..7eabc2e271c1 100644
--- a/AnkiDroid/src/main/res/values-be/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-be/03-dialogs.xml
@@ -57,14 +57,7 @@
     <string name="delete_cram_deck_message">Выдаліць фільтраваную калоду %s і адправіць усе карткі назад у іх арыгінальныя калоды?</string>
     <string name="no_tts_available_message">Сінтэз маўлення недаступны</string>
     <string name="tts_no_tts">Не прамаўляць</string>
-    <string name="reposition_card_dialog_title">Перамясціць новую картку</string>
     <string name="reposition_card_not_new_error">Толькі новыя карткі могуць быць перамешчаныя</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">Перамешчана %d картка</item>
-        <item quantity="few">Перамешчаны %d карткі</item>
-        <item quantity="many">Перамешчаны %d картак</item>
-        <item quantity="other">Перамешчаны %d картак</item>
-    </plurals>
     <string name="reset_card_dialog_title">Скінуць дасягненні па картцы</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">Скінута %d картка</item>
diff --git a/AnkiDroid/src/main/res/values-be/10-preferences.xml b/AnkiDroid/src/main/res/values-be/10-preferences.xml
index 2f26fbe1f595..ada55da0c3cc 100644
--- a/AnkiDroid/src/main/res/values-be/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-be/10-preferences.xml
@@ -266,9 +266,7 @@
     <string name="donate_description"><![CDATA[Вы можаце падтрымаць распрацоўку AnkiDroid <a href=\"%1$s\">ахвяраваннем</a>. Мы будзем удзячныя за любую суму.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Дадаць жэст</string>
-    <string name="binding_replace_gesture">Замяніць жэст</string>
     <string name="binding_add_key">Дадаць кнопку</string>
-    <string name="binding_replace_key">Замяніць ключ</string>
     <string name="key_picker_default_press_key">Націсніце кнопку</string>
     <string name="binding_add_axis">Дадаць джойсцік/кантролер руху</string>
     <string name="axis_picker_move_joystick">Перамясціць джойсцік/кантролер руху</string>
diff --git a/AnkiDroid/src/main/res/values-bg/03-dialogs.xml b/AnkiDroid/src/main/res/values-bg/03-dialogs.xml
index 3f426899b60c..0b9e151c2e14 100644
--- a/AnkiDroid/src/main/res/values-bg/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-bg/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Няма наличен синтез за език</string>
     <string name="tts_no_tts">Не говори</string>
-    <string name="reposition_card_dialog_title">Преместване на нова карта</string>
     <string name="reposition_card_not_new_error">Само нови карти могат да бъдат премествани</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d картата е преместена</item>
-        <item quantity="other">%d картите са преместени</item>
-    </plurals>
     <string name="reset_card_dialog_title">Начално състояние на прогреса на картата</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d card reset</item>
diff --git a/AnkiDroid/src/main/res/values-bg/10-preferences.xml b/AnkiDroid/src/main/res/values-bg/10-preferences.xml
index 3bb5e020f5fe..1491c80a5400 100644
--- a/AnkiDroid/src/main/res/values-bg/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-bg/10-preferences.xml
@@ -261,9 +261,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Добавяне на жест</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Добавяне на клавиш</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Натиснете клавиш</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-bn/03-dialogs.xml b/AnkiDroid/src/main/res/values-bn/03-dialogs.xml
index 1794387d6b84..1c0cf570db0e 100644
--- a/AnkiDroid/src/main/res/values-bn/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-bn/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">ফিল্টার করা ডেক %s মুছে ফেলবেন এবং সমস্ত কার্ড তাদের আসল ডেকে ফিরিয়ে দেবেন?</string>
     <string name="no_tts_available_message">কোনও টেক্সট টু স্পিচ ভাষা উপলব্ধ নেই</string>
     <string name="tts_no_tts">নিশ্চুপ</string>
-    <string name="reposition_card_dialog_title">নতুন কার্ড এর ক্রম পরিবর্তন</string>
     <string name="reposition_card_not_new_error">শুধু মাত্র নতুন কার্ড এর ক্রম বদলানো যাবে</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d টি কার্ড পুনঃস্থাপিত</item>
-        <item quantity="other">%d টি কার্ড পুনঃস্থাপিত</item>
-    </plurals>
     <string name="reset_card_dialog_title">অগ্ৰগতি মুছে ফেলুন</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d টি কার্ড রিসেট হয়েছে</item>
diff --git a/AnkiDroid/src/main/res/values-bn/10-preferences.xml b/AnkiDroid/src/main/res/values-bn/10-preferences.xml
index 61101dd5567f..024723d875a3 100644
--- a/AnkiDroid/src/main/res/values-bn/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-bn/10-preferences.xml
@@ -262,9 +262,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">অঙ্গভঙ্গি যোগ করুন</string>
-    <string name="binding_replace_gesture">অঙ্গভঙ্গি প্রতিস্থাপন</string>
     <string name="binding_add_key">কী যোগ করুন</string>
-    <string name="binding_replace_key">কী প্রতিস্থাপন করুন</string>
     <string name="key_picker_default_press_key">একটি কী টিপুন</string>
     <string name="binding_add_axis">জয়স্টিক/মোশন কন্ট্রোল যোগ করুন</string>
     <string name="axis_picker_move_joystick">একটি জয়স্টিক/মোশন কন্ট্রোলার সরান</string>
diff --git a/AnkiDroid/src/main/res/values-ca/03-dialogs.xml b/AnkiDroid/src/main/res/values-ca/03-dialogs.xml
index 54e7271f0a05..6bcb708fe277 100644
--- a/AnkiDroid/src/main/res/values-ca/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ca/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No hi ha idiomes de síntesi de veu disponibles</string>
     <string name="tts_no_tts">No parlis</string>
-    <string name="reposition_card_dialog_title">Recol·locar carta nova</string>
     <string name="reposition_card_not_new_error">Solament es poden recol·locar les cartes noves</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d carta recol·locada</item>
-        <item quantity="other">%d cartes recol·locades</item>
-    </plurals>
     <string name="reset_card_dialog_title">Reinicia el progrés de les fitxes</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d carta reiniciada</item>
diff --git a/AnkiDroid/src/main/res/values-ca/10-preferences.xml b/AnkiDroid/src/main/res/values-ca/10-preferences.xml
index 783c83469af3..826fc3d511cb 100644
--- a/AnkiDroid/src/main/res/values-ca/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ca/10-preferences.xml
@@ -261,9 +261,7 @@
     <string name="donate_description"><![CDATA[Podeu donar suport al desenvolupament d\'AnkiDroid <a href=\"%1$s\">fent una donació</a>. Apreciarem molt qualsevol quantitat.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Afegeix gest</string>
-    <string name="binding_replace_gesture">Substitueix el gest</string>
     <string name="binding_add_key">Afegir una clau</string>
-    <string name="binding_replace_key">Substitueix la tecla</string>
     <string name="key_picker_default_press_key">Premeu una tecla</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-ckb/03-dialogs.xml b/AnkiDroid/src/main/res/values-ckb/03-dialogs.xml
index c2f07ad2a3b1..d99b9cb1805c 100644
--- a/AnkiDroid/src/main/res/values-ckb/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ckb/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Nexwîne</string>
-    <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d card repositioned</item>
-        <item quantity="other">%d cards repositioned</item>
-    </plurals>
     <string name="reset_card_dialog_title">Reset card progress</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d card reset</item>
diff --git a/AnkiDroid/src/main/res/values-ckb/10-preferences.xml b/AnkiDroid/src/main/res/values-ckb/10-preferences.xml
index 03744990f8ef..76fb669b6a37 100644
--- a/AnkiDroid/src/main/res/values-ckb/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ckb/10-preferences.xml
@@ -262,9 +262,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-cs/03-dialogs.xml b/AnkiDroid/src/main/res/values-cs/03-dialogs.xml
index 0e86cf4a7b88..bd452b6e6062 100644
--- a/AnkiDroid/src/main/res/values-cs/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-cs/03-dialogs.xml
@@ -57,14 +57,7 @@
     <string name="delete_cram_deck_message">Vymazat filtrovaný balíček %s a poslat všechny karty zpět do jejich původních balíčků?</string>
     <string name="no_tts_available_message">Není dostupný žádný jazyk převodu textu na řeč</string>
     <string name="tts_no_tts">Nemluv</string>
-    <string name="reposition_card_dialog_title">Změnit pořadí nové karty</string>
     <string name="reposition_card_not_new_error">Změnit pořadí lze pouze u nových karet</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d karta přesunuta</item>
-        <item quantity="few">%d karty přesunuty</item>
-        <item quantity="many">%d karty přesunuto</item>
-        <item quantity="other">%d karet přesunuto</item>
-    </plurals>
     <string name="reset_card_dialog_title">Obnovit proces učení karty</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d karta obnovena</item>
diff --git a/AnkiDroid/src/main/res/values-cs/10-preferences.xml b/AnkiDroid/src/main/res/values-cs/10-preferences.xml
index f305d8d1359e..8b03c0412e8d 100644
--- a/AnkiDroid/src/main/res/values-cs/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-cs/10-preferences.xml
@@ -265,9 +265,7 @@
     <string name="donate_description"><![CDATA[Můžete podpořit vývoj AnkiDroidu <a href=\"%1$s\">finančními příspěvky</a>. Jakékoliv částky si hluboce vážíme.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Přidat gesto</string>
-    <string name="binding_replace_gesture">Nahradit gesto</string>
     <string name="binding_add_key">Přidat klávesu</string>
-    <string name="binding_replace_key">Nahradit klávesu</string>
     <string name="key_picker_default_press_key">Stiskněte tlačítko</string>
     <string name="binding_add_axis">Přidat joystick / ovladač pohybu</string>
     <string name="axis_picker_move_joystick">Pohnout joystickem / ovladačem pohybu</string>
diff --git a/AnkiDroid/src/main/res/values-da/03-dialogs.xml b/AnkiDroid/src/main/res/values-da/03-dialogs.xml
index a1a83eade31c..4bc3e0510360 100644
--- a/AnkiDroid/src/main/res/values-da/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-da/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Intet Tekst-Til-Tale sprog tilgængelig</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="reposition_card_dialog_title">Repositionér nyt kort</string>
     <string name="reposition_card_not_new_error">Udelukkende nye kort kan repositioneres</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d kort repositioneret</item>
-        <item quantity="other">%d cards repositioned</item>
-    </plurals>
     <string name="reset_card_dialog_title">Reset card progress</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d card reset</item>
diff --git a/AnkiDroid/src/main/res/values-da/10-preferences.xml b/AnkiDroid/src/main/res/values-da/10-preferences.xml
index 8acca7451601..d7f181212461 100644
--- a/AnkiDroid/src/main/res/values-da/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-da/10-preferences.xml
@@ -262,9 +262,7 @@
     <string name="donate_description"><![CDATA[Du kan støtte AnkiDroid\'s udvikling ved at <a href=\"%1$s\">donere</a>. Ethvert bidrag er dybt værdsat.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-de/03-dialogs.xml b/AnkiDroid/src/main/res/values-de/03-dialogs.xml
index 08af5811948e..14a4b52bd9ed 100644
--- a/AnkiDroid/src/main/res/values-de/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-de/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Gefilterten Stapel „%s“ löschen und alle Karten zurück in ihre ursprünglichen Stapel senden?</string>
     <string name="no_tts_available_message">Keine Vorlesesprache verfügbar</string>
     <string name="tts_no_tts">Nicht vorlesen</string>
-    <string name="reposition_card_dialog_title">Position der neuen Karte ändern</string>
     <string name="reposition_card_not_new_error">Die Position kann nur für neue Karten geändert werden</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d Karte neu positioniert</item>
-        <item quantity="other">%d Karten neu positioniert</item>
-    </plurals>
     <string name="reset_card_dialog_title">Lernfortschritt zurücksetzen</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d Karte zurücksetzen</item>
diff --git a/AnkiDroid/src/main/res/values-de/10-preferences.xml b/AnkiDroid/src/main/res/values-de/10-preferences.xml
index ebca1adcae1a..0b4057aaef95 100644
--- a/AnkiDroid/src/main/res/values-de/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-de/10-preferences.xml
@@ -261,9 +261,7 @@
     <string name="donate_description"><![CDATA[Sie können AnkiDroid\s Entwicklung mit <a href=\"%1$s\">unterstützen</a>. Jede Spende schätzen wir zutiefst.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Geste hinzufügen</string>
-    <string name="binding_replace_gesture">Geste ersetzen</string>
     <string name="binding_add_key">Schlüssel hinzufügen</string>
-    <string name="binding_replace_key">Schlüssel ersetzen</string>
     <string name="key_picker_default_press_key">Eine Taste drücken</string>
     <string name="binding_add_axis">Joystick/Motion Controller hinzufügen</string>
     <string name="axis_picker_move_joystick">Joystick/Motion Controller bewegen</string>
diff --git a/AnkiDroid/src/main/res/values-el/03-dialogs.xml b/AnkiDroid/src/main/res/values-el/03-dialogs.xml
index a4929bbba611..f7895f65d938 100644
--- a/AnkiDroid/src/main/res/values-el/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-el/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Διαγράψτε τη φιλτραρισμένη τράπουλα %s και στείλτε όλες τις κάρτες πίσω στις αρχικές τους τράπουλες;</string>
     <string name="no_tts_available_message">Δεν είναι διαθέσιμη η μετατροπής κειμένου σε ομιλία</string>
     <string name="tts_no_tts">Σίγαση</string>
-    <string name="reposition_card_dialog_title">Επανατοποθέτηση νέας κάρτας</string>
     <string name="reposition_card_not_new_error">Μόνο νέες κάρτες μπορούν να επανατοποθετηθούν</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">Επανατοποθετήθηκε %d κάρτα</item>
-        <item quantity="other">Επανατοποθετήθηκαν %d κάρτες</item>
-    </plurals>
     <string name="reset_card_dialog_title">Επαναφορά προόδου κάρτας</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d card reset</item>
diff --git a/AnkiDroid/src/main/res/values-el/10-preferences.xml b/AnkiDroid/src/main/res/values-el/10-preferences.xml
index 2dc449912605..ff04aaab6dbb 100644
--- a/AnkiDroid/src/main/res/values-el/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-el/10-preferences.xml
@@ -262,9 +262,7 @@
     <string name="donate_description"><![CDATA[Μπορείτε να υποστηρίξετε την ανάπτυξη του AnkiDroid κάνοντας <a href=\"%1$s\">δωρεά</a>. Οποιοδήποτε ποσό εκτιμάται βαθύτατα.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Προσθήκη χειρονομίας</string>
-    <string name="binding_replace_gesture">Αντικατάσταση χειρονομίας</string>
     <string name="binding_add_key">Προσθήκη κλειδιού</string>
-    <string name="binding_replace_key">Αντικατάσταση κλειδιού</string>
     <string name="key_picker_default_press_key">Πατήστε ένα πλήκτρο</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-eo/03-dialogs.xml b/AnkiDroid/src/main/res/values-eo/03-dialogs.xml
index 90b62857d31d..d28824c2d5cc 100644
--- a/AnkiDroid/src/main/res/values-eo/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-eo/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Ĉu forigi la filtritan kartaron %s kaj movi ĉiujn ĝiajn kartojn reen al iliaj originalaj kartaroj?</string>
     <string name="no_tts_available_message">Neniu parolsintezilo disponebla</string>
     <string name="tts_no_tts">Ne paroli</string>
-    <string name="reposition_card_dialog_title">Repozicii novan karton</string>
     <string name="reposition_card_not_new_error">Nur novaj kartoj povas esti repoziciitaj</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d karto estas repoziciita</item>
-        <item quantity="other">%d kartoj estas repoziciitaj</item>
-    </plurals>
     <string name="reset_card_dialog_title">Nuligi progreson de karto</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d karto estas nuligita</item>
diff --git a/AnkiDroid/src/main/res/values-eo/10-preferences.xml b/AnkiDroid/src/main/res/values-eo/10-preferences.xml
index 18f975a55952..8c49d5fc33af 100644
--- a/AnkiDroid/src/main/res/values-eo/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-eo/10-preferences.xml
@@ -257,9 +257,7 @@
     <string name="donate_description"><![CDATA[Vi povas subteni evoluigon de AnkiDroid per <a href=\"%1$s\">donaci monon</a>. Ĉiu monsumo estas dankinda.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Aldoni geston</string>
-    <string name="binding_replace_gesture">Anstataŭigi geston</string>
     <string name="binding_add_key">Aldoni klavon</string>
-    <string name="binding_replace_key">Anstataŭigi klavon</string>
     <string name="key_picker_default_press_key">Premu klavon</string>
     <string name="binding_add_axis">Asigni ludstirilon</string>
     <string name="axis_picker_move_joystick">Movu per ludstirilo</string>
diff --git a/AnkiDroid/src/main/res/values-es-rAR/03-dialogs.xml b/AnkiDroid/src/main/res/values-es-rAR/03-dialogs.xml
index 4c086954c67e..511e92f83c89 100644
--- a/AnkiDroid/src/main/res/values-es-rAR/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-es-rAR/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">¿Borrar el mazo filtrado %s y devolver todas las cartas a sus mazos originales?</string>
     <string name="no_tts_available_message">No hay un idioma de texto-a-voz disponible</string>
     <string name="tts_no_tts">No hable</string>
-    <string name="reposition_card_dialog_title">Reposicionar nueva tarjeta</string>
     <string name="reposition_card_not_new_error">Sólo las tarjetas nuevas pueden ser reposicionadas</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d tarjeta reposicionada</item>
-        <item quantity="other">%d tarjetas reposicionadas</item>
-    </plurals>
     <string name="reset_card_dialog_title">Resetear el progreso de las tarjetas</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d tarjeta reiniciada</item>
diff --git a/AnkiDroid/src/main/res/values-es-rAR/10-preferences.xml b/AnkiDroid/src/main/res/values-es-rAR/10-preferences.xml
index 6aa6a9ae2784..56bcd859927e 100644
--- a/AnkiDroid/src/main/res/values-es-rAR/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-es-rAR/10-preferences.xml
@@ -261,9 +261,7 @@
     <string name="donate_description"><![CDATA[Puedes apoyar el desarrollo de AnkiDroid <a href=\"%1$s\">donando</a>. Cualquier cantidad es profundamente apreciada.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Agregar gesto</string>
-    <string name="binding_replace_gesture">Reemplazar gesto</string>
     <string name="binding_add_key">Añadir botón</string>
-    <string name="binding_replace_key">Reemplazar clave</string>
     <string name="key_picker_default_press_key">Presione una tecla</string>
     <string name="binding_add_axis">Añadir joystick/controlador de movimiento</string>
     <string name="axis_picker_move_joystick">Mueve un joystick/controlador de movimiento</string>
diff --git a/AnkiDroid/src/main/res/values-es-rES/03-dialogs.xml b/AnkiDroid/src/main/res/values-es-rES/03-dialogs.xml
index 16eb28c8c39c..8d2165b014b8 100644
--- a/AnkiDroid/src/main/res/values-es-rES/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-es-rES/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">¿Borrar el mazo filtrado %s y devolver todas las cartas a sus mazos originales?</string>
     <string name="no_tts_available_message">No hay idiomas de texto-a-voz disponibles</string>
     <string name="tts_no_tts">No hablar</string>
-    <string name="reposition_card_dialog_title">Reposicionar nueva tarjeta</string>
     <string name="reposition_card_not_new_error">Sólo las tarjetas nuevas pueden ser reposicionadas</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d tarjeta reposicionada</item>
-        <item quantity="other">%d tarjetas reposicionadas</item>
-    </plurals>
     <string name="reset_card_dialog_title">Resetear el progreso de la tarjeta</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d tarjeta reiniciada</item>
diff --git a/AnkiDroid/src/main/res/values-es-rES/10-preferences.xml b/AnkiDroid/src/main/res/values-es-rES/10-preferences.xml
index f3e26035f378..333fa025b753 100644
--- a/AnkiDroid/src/main/res/values-es-rES/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-es-rES/10-preferences.xml
@@ -261,9 +261,7 @@
     <string name="donate_description"><![CDATA[Puedes apoyar el desarrollo de AnkiDroid <a href=\"%1$s\">donando</a>. Cualquier cantidad es profundamente apreciada.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Agregar gesto</string>
-    <string name="binding_replace_gesture">Reemplazar gesto</string>
     <string name="binding_add_key">Añadir botón</string>
-    <string name="binding_replace_key">Reemplazar clave</string>
     <string name="key_picker_default_press_key">Presione una tecla</string>
     <string name="binding_add_axis">Añadir joystick/controlador de movimiento</string>
     <string name="axis_picker_move_joystick">Mueve un joystick/controlador de movimiento</string>
diff --git a/AnkiDroid/src/main/res/values-et/03-dialogs.xml b/AnkiDroid/src/main/res/values-et/03-dialogs.xml
index 3e2da2251247..954d7637f5cb 100644
--- a/AnkiDroid/src/main/res/values-et/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-et/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Ära räägi</string>
-    <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d card repositioned</item>
-        <item quantity="other">%d cards repositioned</item>
-    </plurals>
     <string name="reset_card_dialog_title">Reset card progress</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d card reset</item>
diff --git a/AnkiDroid/src/main/res/values-et/10-preferences.xml b/AnkiDroid/src/main/res/values-et/10-preferences.xml
index c4459c409dc3..5f7decb917a0 100644
--- a/AnkiDroid/src/main/res/values-et/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-et/10-preferences.xml
@@ -262,9 +262,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-eu/03-dialogs.xml b/AnkiDroid/src/main/res/values-eu/03-dialogs.xml
index f3b0cddfead6..4593a44d6d5c 100644
--- a/AnkiDroid/src/main/res/values-eu/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-eu/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Ez dago testua hizketa bihurketarako hizkuntzarik</string>
     <string name="tts_no_tts">Ez hitz egin</string>
-    <string name="reposition_card_dialog_title">Birkokatu karta berria</string>
     <string name="reposition_card_not_new_error">Bakarrik karta berriak birkokatu daitezke</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d card repositioned</item>
-        <item quantity="other">%d cards repositioned</item>
-    </plurals>
     <string name="reset_card_dialog_title">Reset card progress</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d card reset</item>
diff --git a/AnkiDroid/src/main/res/values-eu/10-preferences.xml b/AnkiDroid/src/main/res/values-eu/10-preferences.xml
index 7451f7b1bffd..5f4d827fd720 100644
--- a/AnkiDroid/src/main/res/values-eu/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-eu/10-preferences.xml
@@ -262,9 +262,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-fa/03-dialogs.xml b/AnkiDroid/src/main/res/values-fa/03-dialogs.xml
index 3746a4370263..d498c152f4c2 100644
--- a/AnkiDroid/src/main/res/values-fa/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-fa/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">آبا می خواهید دسته فیلتر شده %s را حذف کنید و همه کارت ها را به دسته اصلیشان بفرستید؟</string>
     <string name="no_tts_available_message">زبان متن به گفتار در دسترس نیست</string>
     <string name="tts_no_tts">حرف نزن</string>
-    <string name="reposition_card_dialog_title">تغییر مکان کارت جدید</string>
     <string name="reposition_card_not_new_error">فقط کارت‌های جدید می‌توانند جابه‌جا شوند</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d کارت جابه‌جا شد</item>
-        <item quantity="other">%d کارت جابه‌جا شدند</item>
-    </plurals>
     <string name="reset_card_dialog_title">بازنشانی پیشرفت کارت</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d کارت تنظیم مجدد شد</item>
diff --git a/AnkiDroid/src/main/res/values-fa/10-preferences.xml b/AnkiDroid/src/main/res/values-fa/10-preferences.xml
index 56b7e06769c8..fe2ce5d51c72 100644
--- a/AnkiDroid/src/main/res/values-fa/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-fa/10-preferences.xml
@@ -261,9 +261,7 @@
     <string name="donate_description"><![CDATA[شما میتوانید توسعه AnkiDroid را همایت کنید با <a href=\"%1$s\">اهدای پول</a>. هر مقداری ما را بی نهایت خوشحال میکند.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">حرکت لمس اضافه کن</string>
-    <string name="binding_replace_gesture">حرکت لمس با جایگذین کن</string>
     <string name="binding_add_key">کلید اضافه کن</string>
-    <string name="binding_replace_key">کلید را جایگذین کن</string>
     <string name="key_picker_default_press_key">یک کلید را انتخاب کنید</string>
     <string name="binding_add_axis">اضافه کردن اهرمک/تنظیم کننده حرکات</string>
     <string name="axis_picker_move_joystick">یک اهرمک/تنظیم کننده حرکات را حرکت دهید</string>
diff --git a/AnkiDroid/src/main/res/values-fi/03-dialogs.xml b/AnkiDroid/src/main/res/values-fi/03-dialogs.xml
index 0d9f7a0ce22f..725a88356345 100644
--- a/AnkiDroid/src/main/res/values-fi/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-fi/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Poistetaanko suodatettu pakka \'%1$s\'? Kaikki kortit lähetetään niiden alkuperäisiin pakkoihin.</string>
     <string name="no_tts_available_message">Yhtään puhesyntetisaattorin tukemaa kieltä ei ole käytettävissä</string>
     <string name="tts_no_tts">Ei puhetta</string>
-    <string name="reposition_card_dialog_title">Siirrä uusi kortti</string>
     <string name="reposition_card_not_new_error">Ainoastaan uudet kortit voidaan siirtää</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d kortti siirretty</item>
-        <item quantity="other">%d korttia siirretty</item>
-    </plurals>
     <string name="reset_card_dialog_title">Nollaa kortin edistyminen</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d alusta kortti</item>
diff --git a/AnkiDroid/src/main/res/values-fi/10-preferences.xml b/AnkiDroid/src/main/res/values-fi/10-preferences.xml
index 4b01fd930439..86bd204c0988 100644
--- a/AnkiDroid/src/main/res/values-fi/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-fi/10-preferences.xml
@@ -261,9 +261,7 @@
     <string name="donate_description"><![CDATA[Voit tukea AnkiDroid\:n kehitystä <a href=\"%1$s\">lahjoittamalla</a>. Mikä tahansa summa on erittäin tervetullut.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Lisää kosketusele</string>
-    <string name="binding_replace_gesture">Korvaa kosketusele</string>
     <string name="binding_add_key">Lisää näppäin</string>
-    <string name="binding_replace_key">Korvaa näppäin</string>
     <string name="key_picker_default_press_key">Paina näppäintä</string>
     <string name="binding_add_axis">Lisää peliohjain tai liikeohjain</string>
     <string name="axis_picker_move_joystick">Liikuta peli- tai liikeohjainta</string>
diff --git a/AnkiDroid/src/main/res/values-fil/03-dialogs.xml b/AnkiDroid/src/main/res/values-fil/03-dialogs.xml
index cb766b78747a..7275d610ccd5 100644
--- a/AnkiDroid/src/main/res/values-fil/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-fil/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Walang available na wika sa text-to-speech</string>
     <string name="tts_no_tts">Huwag magsalita</string>
-    <string name="reposition_card_dialog_title">Iposisyon muli ang card</string>
     <string name="reposition_card_not_new_error">Mga bagong card lamang ang maaaring iposisyon muli</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d card ang pinosisyon muli</item>
-        <item quantity="other">%d mga card ang pinosisyon muli</item>
-    </plurals>
     <string name="reset_card_dialog_title">I-reset ang progreso ng kard</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d card ang na-reset</item>
diff --git a/AnkiDroid/src/main/res/values-fil/10-preferences.xml b/AnkiDroid/src/main/res/values-fil/10-preferences.xml
index 8c4ee628bddb..ce04bba9aa07 100644
--- a/AnkiDroid/src/main/res/values-fil/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-fil/10-preferences.xml
@@ -262,9 +262,7 @@
     <string name="donate_description"><![CDATA[Maaari mong suportahan ang pag-develop sa AnkiDroid sa pamamagitan ng <a href=\"%1$s\">paghahandog</a>. Lubos naming ipinapasalamat ang anumang halaga.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Magdagdag ng gesture</string>
-    <string name="binding_replace_gesture">Palitan ang gesture</string>
     <string name="binding_add_key">Magdagdag ng key</string>
-    <string name="binding_replace_key">Palitan ang key</string>
     <string name="key_picker_default_press_key">Pindutin ang key</string>
     <string name="binding_add_axis">Magdagdag ng joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Igalaw ang joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-fr/03-dialogs.xml b/AnkiDroid/src/main/res/values-fr/03-dialogs.xml
index bb2fdfd90814..802900bf7d92 100644
--- a/AnkiDroid/src/main/res/values-fr/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-fr/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Supprimer le paquet filtré %s et renvoyer toutes les cartes dans leurs paquets d’origine?</string>
     <string name="no_tts_available_message">Aucun langage de synthèse vocale disponible</string>
     <string name="tts_no_tts">Ne pas parler</string>
-    <string name="reposition_card_dialog_title">Repositionner la nouvelle carte</string>
     <string name="reposition_card_not_new_error">Seules les nouvelles cartes peuvent être repositionnées</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d carte repositionnée</item>
-        <item quantity="other">%d cartes repositionnées</item>
-    </plurals>
     <string name="reset_card_dialog_title">Réinitialiser les progrès de la carte</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d carte réinitialisée</item>
diff --git a/AnkiDroid/src/main/res/values-fr/10-preferences.xml b/AnkiDroid/src/main/res/values-fr/10-preferences.xml
index 75ff3051933d..66087e51ff61 100644
--- a/AnkiDroid/src/main/res/values-fr/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-fr/10-preferences.xml
@@ -261,9 +261,7 @@
     <string name="donate_description"><![CDATA[Vous pouvez supporter le développement de AnkiDroid en <a href=\"%1$s\">faisant un don</a>. N\'importe quel montant est très fortement apprécié.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Ajouter un geste</string>
-    <string name="binding_replace_gesture">Remplacer le geste</string>
     <string name="binding_add_key">Ajouter une touche</string>
-    <string name="binding_replace_key">Remplacer la clé</string>
     <string name="key_picker_default_press_key">Appuyer sur une touche</string>
     <string name="binding_add_axis">Ajouter un joystick/contrôleur de mouvement</string>
     <string name="axis_picker_move_joystick">Déplacer un joystick/contrôleur de mouvement</string>
diff --git a/AnkiDroid/src/main/res/values-fy/03-dialogs.xml b/AnkiDroid/src/main/res/values-fy/03-dialogs.xml
index d576b454fe11..9b2b5d8e4c74 100644
--- a/AnkiDroid/src/main/res/values-fy/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-fy/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d card repositioned</item>
-        <item quantity="other">%d cards repositioned</item>
-    </plurals>
     <string name="reset_card_dialog_title">Reset card progress</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d card reset</item>
diff --git a/AnkiDroid/src/main/res/values-fy/10-preferences.xml b/AnkiDroid/src/main/res/values-fy/10-preferences.xml
index d5568cd30c8c..203308260ac1 100644
--- a/AnkiDroid/src/main/res/values-fy/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-fy/10-preferences.xml
@@ -262,9 +262,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-ga/03-dialogs.xml b/AnkiDroid/src/main/res/values-ga/03-dialogs.xml
index 37fa33a46ef0..ab6f2043d491 100644
--- a/AnkiDroid/src/main/res/values-ga/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ga/03-dialogs.xml
@@ -58,15 +58,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Níl TTS ar fáil sa teanga seo </string>
     <string name="tts_no_tts">Teanga ar bith</string>
-    <string name="reposition_card_dialog_title">Athlonnaigh cárta nua</string>
     <string name="reposition_card_not_new_error">Ní féidir ach cártaí nua a athlonnú </string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d card repositioned</item>
-        <item quantity="two">%d cards repositioned</item>
-        <item quantity="few">%d cards repositioned</item>
-        <item quantity="many">%d cards repositioned</item>
-        <item quantity="other">%d (g)cinn de chártaí athlonnaithe </item>
-    </plurals>
     <string name="reset_card_dialog_title">Glan stair an chárta maidir le do dhul ar aghaidh? </string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d card reset</item>
diff --git a/AnkiDroid/src/main/res/values-ga/10-preferences.xml b/AnkiDroid/src/main/res/values-ga/10-preferences.xml
index c2b0edb43b43..72f7ab23ce99 100644
--- a/AnkiDroid/src/main/res/values-ga/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ga/10-preferences.xml
@@ -268,9 +268,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-gl/03-dialogs.xml b/AnkiDroid/src/main/res/values-gl/03-dialogs.xml
index e252439ee4d6..154e7bc9c308 100644
--- a/AnkiDroid/src/main/res/values-gl/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-gl/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Ningún idioma de síntese de voz dispoñible</string>
     <string name="tts_no_tts">Non fales</string>
-    <string name="reposition_card_dialog_title">Reposicionar novo cartón</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d card repositioned</item>
-        <item quantity="other">%d cards repositioned</item>
-    </plurals>
     <string name="reset_card_dialog_title">Reiniciar o progreso do cartón</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d card reset</item>
diff --git a/AnkiDroid/src/main/res/values-gl/10-preferences.xml b/AnkiDroid/src/main/res/values-gl/10-preferences.xml
index 1af8740e08f9..6d793bf7c9eb 100644
--- a/AnkiDroid/src/main/res/values-gl/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-gl/10-preferences.xml
@@ -262,9 +262,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-got/03-dialogs.xml b/AnkiDroid/src/main/res/values-got/03-dialogs.xml
index 3b1bb56e51b9..682594197941 100644
--- a/AnkiDroid/src/main/res/values-got/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-got/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Bokos-du-gwaurdja razda nist</string>
     <string name="tts_no_tts">Ni rodei</string>
-    <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d card repositioned</item>
-        <item quantity="other">%d cards repositioned</item>
-    </plurals>
     <string name="reset_card_dialog_title">Reset card progress</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d card reset</item>
diff --git a/AnkiDroid/src/main/res/values-got/10-preferences.xml b/AnkiDroid/src/main/res/values-got/10-preferences.xml
index ea74a38d8c9d..29e92629b16c 100644
--- a/AnkiDroid/src/main/res/values-got/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-got/10-preferences.xml
@@ -262,9 +262,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-gu/03-dialogs.xml b/AnkiDroid/src/main/res/values-gu/03-dialogs.xml
index f84df4d9fb0a..5e6d826b7c67 100644
--- a/AnkiDroid/src/main/res/values-gu/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-gu/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">வடிகட்டப்பட்ட %s டெக்கை அகற்றிவிட்டு, எல்லா கார்டுகளையும் அவற்றின் அசல் டெக்குகளுக்குத் திருப்பிவிடவா?</string>
     <string name="no_tts_available_message">કોઈ ટેક્સ્ટ-ટુ-સ્પીચ ભાષા ઉપલબ્ધ નથી</string>
     <string name="tts_no_tts">બોલશો નહીં</string>
-    <string name="reposition_card_dialog_title">નવું કાર્ડ રિપોઝિશન કરો</string>
     <string name="reposition_card_not_new_error">ફક્ત નવા કાર્ડને જ સ્થાનાંતરિત કરી શકાય છે</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d કાર્ડ રિપોઝિશન કર્યું</item>
-        <item quantity="other">%d કાર્ડ રિપોઝિશન કર્યું</item>
-    </plurals>
     <string name="reset_card_dialog_title">કાર્ડની પ્રગતિ રીસેટ કરો</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d કાર્ડ રીસેટ</item>
diff --git a/AnkiDroid/src/main/res/values-gu/10-preferences.xml b/AnkiDroid/src/main/res/values-gu/10-preferences.xml
index 1fe408e723d2..70712163126c 100644
--- a/AnkiDroid/src/main/res/values-gu/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-gu/10-preferences.xml
@@ -261,9 +261,7 @@
     <string name="donate_description"><![CDATA[તમે <a href=\"%1$s\">દાન</a> કરીને AnkiDroid ના વિકાસને સમર્થન આપી શકો છો. કોઈપણ રકમની ખૂબ પ્રશંસા કરવામાં આવે છે.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">હાવભાવ ઉમેરો</string>
-    <string name="binding_replace_gesture">હાવભાવ બદલો</string>
     <string name="binding_add_key">કી ઉમેરો</string>
-    <string name="binding_replace_key">કી બદલો</string>
     <string name="key_picker_default_press_key">એક કી દબાવો</string>
     <string name="binding_add_axis">જોયસ્ટિક/મોશન કંટ્રોલર ઉમેરો</string>
     <string name="axis_picker_move_joystick">જોયસ્ટીક/મોશન કંટ્રોલર ખસેડો</string>
diff --git a/AnkiDroid/src/main/res/values-heb/03-dialogs.xml b/AnkiDroid/src/main/res/values-heb/03-dialogs.xml
index 59c46c2b59f1..3affe6223155 100644
--- a/AnkiDroid/src/main/res/values-heb/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-heb/03-dialogs.xml
@@ -57,14 +57,7 @@
     <string name="delete_cram_deck_message">למחוק את החפיסה %s המסוננת ולשלוח את כל הקלפים בחזרה לחפיסות המקוריות שלהם?</string>
     <string name="no_tts_available_message">אין שום שפת לכתוב-אל-דיבור זמין</string>
     <string name="tts_no_tts">אל תדבר.‏</string>
-    <string name="reposition_card_dialog_title">שינוי מיקום כרטיס חדש</string>
     <string name="reposition_card_not_new_error">ניתן לשנות מיקום לכרטיסים חדשים בלבד</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">כרטיס %d הושם מחדש</item>
-        <item quantity="two">%d כרטיסים הושמו מחדש</item>
-        <item quantity="many">%d כרטיסים הושמו מחדש</item>
-        <item quantity="other">%d כרטיסים הושמו מחדש</item>
-    </plurals>
     <string name="reset_card_dialog_title">איפוס התקדמות הכרטיס</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">כרטיס אחד אופס</item>
diff --git a/AnkiDroid/src/main/res/values-heb/10-preferences.xml b/AnkiDroid/src/main/res/values-heb/10-preferences.xml
index aa0da3be6486..4a1c832cab89 100644
--- a/AnkiDroid/src/main/res/values-heb/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-heb/10-preferences.xml
@@ -265,9 +265,7 @@
     <string name="donate_description"><![CDATA[אתה יכול לתמוך בפיתוח של AnkiDroid על ידי <a href=\"%1$s\">תרומה</a>. כל סכום מוערך מאוד.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">הוסף מחווה</string>
-    <string name="binding_replace_gesture">החלף מחווה</string>
     <string name="binding_add_key">הוסף כפתור</string>
-    <string name="binding_replace_key">החלף כפתור</string>
     <string name="key_picker_default_press_key">לחץ על כפתור</string>
     <string name="binding_add_axis">הוסף ג\'ויסטיק/בקר תנועה</string>
     <string name="axis_picker_move_joystick">הזז ג\'ויסטיק/בקר תנועה</string>
diff --git a/AnkiDroid/src/main/res/values-hi/03-dialogs.xml b/AnkiDroid/src/main/res/values-hi/03-dialogs.xml
index cf8de2b986eb..3020bee43de3 100644
--- a/AnkiDroid/src/main/res/values-hi/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-hi/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">फ़िल्टर किए गए डेक %s को हटाएं और सभी कार्डों को उनके मूल डेक पर वापस भेजें?</string>
     <string name="no_tts_available_message">कोई लेख-से-बोली भाषा उपलब्ध नहीं</string>
     <string name="tts_no_tts">बात न करें</string>
-    <string name="reposition_card_dialog_title">नया कार्ड पुन: प्रस्तुत करें</string>
     <string name="reposition_card_not_new_error">केवल नए कार्डों को बदला जा सकता है</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d कार्डों का स्थान बदल दिया गया है</item>
-        <item quantity="other">%d कार्डों का स्थान बदल दिया गया है</item>
-    </plurals>
     <string name="reset_card_dialog_title">पत्ता प्रगति रीसेट करें</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d कार्ड रीसेट हुआ</item>
diff --git a/AnkiDroid/src/main/res/values-hi/10-preferences.xml b/AnkiDroid/src/main/res/values-hi/10-preferences.xml
index db414d0cb206..16842b9319c7 100644
--- a/AnkiDroid/src/main/res/values-hi/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-hi/10-preferences.xml
@@ -258,9 +258,7 @@
     <string name="donate_description"><![CDATA[आप <a href=\"%1$s\">दान</a> करके AnkiDroid\ के विकास में सहायता कर सकते हैं। किसी भी राशि की अत्यधिक सराहना की जाती है।]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">इशारा जोड़ें</string>
-    <string name="binding_replace_gesture">इशारा बदलें</string>
     <string name="binding_add_key">कुंजी जोड़ें</string>
-    <string name="binding_replace_key">कुंजी बदलें</string>
     <string name="key_picker_default_press_key">कोई कुंजी दबाएं</string>
     <string name="binding_add_axis">जॉयस्टिक/मोशन कंट्रोलर को जोड़ें</string>
     <string name="axis_picker_move_joystick">जॉयस्टिक/मोशन कंट्रोलर को स्थानांतरित करें</string>
diff --git a/AnkiDroid/src/main/res/values-hr/03-dialogs.xml b/AnkiDroid/src/main/res/values-hr/03-dialogs.xml
index 481b0dfa7290..a3019398680a 100644
--- a/AnkiDroid/src/main/res/values-hr/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-hr/03-dialogs.xml
@@ -56,13 +56,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d card repositioned</item>
-        <item quantity="few">%d cards repositioned</item>
-        <item quantity="other">%d cards repositioned</item>
-    </plurals>
     <string name="reset_card_dialog_title">Reset card progress</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d card reset</item>
diff --git a/AnkiDroid/src/main/res/values-hr/10-preferences.xml b/AnkiDroid/src/main/res/values-hr/10-preferences.xml
index 74c12bae5215..2ca6452442b9 100644
--- a/AnkiDroid/src/main/res/values-hr/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-hr/10-preferences.xml
@@ -264,9 +264,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-hu/03-dialogs.xml b/AnkiDroid/src/main/res/values-hu/03-dialogs.xml
index fa89a3403c41..719d4a9e235e 100644
--- a/AnkiDroid/src/main/res/values-hu/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-hu/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Nincs rendelkezésre álló szövegfelolvasási nyelv</string>
     <string name="tts_no_tts">Ne beszélj</string>
-    <string name="reposition_card_dialog_title">Helyezze át az új kártyát</string>
     <string name="reposition_card_not_new_error">Csak az új kártyákat lehet áthelyezni</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d kártya áthelyezve</item>
-        <item quantity="other">%d kártyák áthelyezve</item>
-    </plurals>
     <string name="reset_card_dialog_title">Kártya folyamatát alaphelyzetbe</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d kártya visszaállítva</item>
diff --git a/AnkiDroid/src/main/res/values-hu/10-preferences.xml b/AnkiDroid/src/main/res/values-hu/10-preferences.xml
index b71666398fc2..d120512883ab 100644
--- a/AnkiDroid/src/main/res/values-hu/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-hu/10-preferences.xml
@@ -261,9 +261,7 @@
     <string name="donate_description"><![CDATA[Elősegítheted az AnkiDroid fejlesztését <a href=\"%1$s\">támogatással</a>. Bármilyen összeget nagyra értékelünk.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Gesztus hozzáadása</string>
-    <string name="binding_replace_gesture">Gesztus felcserélése</string>
     <string name="binding_add_key">Kulcs hozzáadása</string>
-    <string name="binding_replace_key">Kulcs felcserélése</string>
     <string name="key_picker_default_press_key">Nyomj meg egy billentyűt</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-hy/03-dialogs.xml b/AnkiDroid/src/main/res/values-hy/03-dialogs.xml
index c51d7ab58414..dc126001a1c4 100644
--- a/AnkiDroid/src/main/res/values-hy/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-hy/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Չխոսել</string>
-    <string name="reposition_card_dialog_title">Տեղափոխել նոր քարտը</string>
     <string name="reposition_card_not_new_error">Կարելի է տեղափոխել միայն նոր քարտերը</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">Տեղափոխվել է %d քարտ</item>
-        <item quantity="other">Տեղափոխվել է %d քարտ</item>
-    </plurals>
     <string name="reset_card_dialog_title">Վերակայել առաջընթացը</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d card reset</item>
diff --git a/AnkiDroid/src/main/res/values-hy/10-preferences.xml b/AnkiDroid/src/main/res/values-hy/10-preferences.xml
index 8df9cb366d80..668bc1fb82b1 100644
--- a/AnkiDroid/src/main/res/values-hy/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-hy/10-preferences.xml
@@ -262,9 +262,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-ind/03-dialogs.xml b/AnkiDroid/src/main/res/values-ind/03-dialogs.xml
index 66ffc9499f2d..41f34ef2d9e3 100644
--- a/AnkiDroid/src/main/res/values-ind/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ind/03-dialogs.xml
@@ -54,11 +54,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Tidak ada bahasa teks-ke-ucapan tersedia</string>
     <string name="tts_no_tts">Jangan bicara</string>
-    <string name="reposition_card_dialog_title">Pindah posisi kartu baru</string>
     <string name="reposition_card_not_new_error">Hanya kartu baru yang dapat pindah posisi</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="other">%d posisi kartu dipindah</item>
-    </plurals>
     <string name="reset_card_dialog_title">Reset kemajuan kartu</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="other">%d kartu direset</item>
diff --git a/AnkiDroid/src/main/res/values-ind/10-preferences.xml b/AnkiDroid/src/main/res/values-ind/10-preferences.xml
index bf428a61c83f..9c53493d7c8d 100644
--- a/AnkiDroid/src/main/res/values-ind/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ind/10-preferences.xml
@@ -260,9 +260,7 @@
     <string name="donate_description"><![CDATA[Anda dapat mendukung pengembangan AnkiDroid dengan <a href=\"%1$s\">berdonasi</a>. Berapa pun jumlahnya akan sangat kami hargai.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Tambahkan gestur</string>
-    <string name="binding_replace_gesture">Ganti gestur</string>
     <string name="binding_add_key">Tambahkan tombol</string>
-    <string name="binding_replace_key">Ganti tombol</string>
     <string name="key_picker_default_press_key">Tekan tombol</string>
     <string name="binding_add_axis">Tambahkan pengendali joystick/gerakan</string>
     <string name="axis_picker_move_joystick">Gerakkan pengendali joystick/gerakan</string>
diff --git a/AnkiDroid/src/main/res/values-is/03-dialogs.xml b/AnkiDroid/src/main/res/values-is/03-dialogs.xml
index 2ffe2bf2751a..221b0b5ff1bb 100644
--- a/AnkiDroid/src/main/res/values-is/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-is/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d card repositioned</item>
-        <item quantity="other">%d cards repositioned</item>
-    </plurals>
     <string name="reset_card_dialog_title">Reset card progress</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d card reset</item>
diff --git a/AnkiDroid/src/main/res/values-is/10-preferences.xml b/AnkiDroid/src/main/res/values-is/10-preferences.xml
index ea74a38d8c9d..29e92629b16c 100644
--- a/AnkiDroid/src/main/res/values-is/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-is/10-preferences.xml
@@ -262,9 +262,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-it/03-dialogs.xml b/AnkiDroid/src/main/res/values-it/03-dialogs.xml
index b526732e0a44..ad3f8f11edc9 100644
--- a/AnkiDroid/src/main/res/values-it/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-it/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Nessuna lingua per la sintesi vocale disponibile</string>
     <string name="tts_no_tts">Non parlare</string>
-    <string name="reposition_card_dialog_title">Riposiziona nuova carta</string>
     <string name="reposition_card_not_new_error">Solo le nuove carte possono essere riposizionate</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d carta riposizionata</item>
-        <item quantity="other">%d carte riposizionate</item>
-    </plurals>
     <string name="reset_card_dialog_title">Reimposta progresso carta</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d carta resettata</item>
diff --git a/AnkiDroid/src/main/res/values-it/10-preferences.xml b/AnkiDroid/src/main/res/values-it/10-preferences.xml
index fa995f99e062..45536b662b91 100644
--- a/AnkiDroid/src/main/res/values-it/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-it/10-preferences.xml
@@ -261,9 +261,7 @@
     <string name="donate_description"><![CDATA[Puoi supportare lo sviluppo di AnkiDroid <a href=\"%1$s\">donando</a>. Qualsiasi importo è profondamente apprezzato.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Aggiungi un gesto</string>
-    <string name="binding_replace_gesture">Sostituisci gesto</string>
     <string name="binding_add_key">Aggiungi un tasto</string>
-    <string name="binding_replace_key">Sostituisci chiave</string>
     <string name="key_picker_default_press_key">Premi un tasto</string>
     <string name="binding_add_axis">Aggiungi joystick/controller di movimento</string>
     <string name="axis_picker_move_joystick">Muovere joystick/controller di movimento</string>
diff --git a/AnkiDroid/src/main/res/values-iw/03-dialogs.xml b/AnkiDroid/src/main/res/values-iw/03-dialogs.xml
index 59c46c2b59f1..3affe6223155 100644
--- a/AnkiDroid/src/main/res/values-iw/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-iw/03-dialogs.xml
@@ -57,14 +57,7 @@
     <string name="delete_cram_deck_message">למחוק את החפיסה %s המסוננת ולשלוח את כל הקלפים בחזרה לחפיסות המקוריות שלהם?</string>
     <string name="no_tts_available_message">אין שום שפת לכתוב-אל-דיבור זמין</string>
     <string name="tts_no_tts">אל תדבר.‏</string>
-    <string name="reposition_card_dialog_title">שינוי מיקום כרטיס חדש</string>
     <string name="reposition_card_not_new_error">ניתן לשנות מיקום לכרטיסים חדשים בלבד</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">כרטיס %d הושם מחדש</item>
-        <item quantity="two">%d כרטיסים הושמו מחדש</item>
-        <item quantity="many">%d כרטיסים הושמו מחדש</item>
-        <item quantity="other">%d כרטיסים הושמו מחדש</item>
-    </plurals>
     <string name="reset_card_dialog_title">איפוס התקדמות הכרטיס</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">כרטיס אחד אופס</item>
diff --git a/AnkiDroid/src/main/res/values-iw/10-preferences.xml b/AnkiDroid/src/main/res/values-iw/10-preferences.xml
index aa0da3be6486..4a1c832cab89 100644
--- a/AnkiDroid/src/main/res/values-iw/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-iw/10-preferences.xml
@@ -265,9 +265,7 @@
     <string name="donate_description"><![CDATA[אתה יכול לתמוך בפיתוח של AnkiDroid על ידי <a href=\"%1$s\">תרומה</a>. כל סכום מוערך מאוד.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">הוסף מחווה</string>
-    <string name="binding_replace_gesture">החלף מחווה</string>
     <string name="binding_add_key">הוסף כפתור</string>
-    <string name="binding_replace_key">החלף כפתור</string>
     <string name="key_picker_default_press_key">לחץ על כפתור</string>
     <string name="binding_add_axis">הוסף ג\'ויסטיק/בקר תנועה</string>
     <string name="axis_picker_move_joystick">הזז ג\'ויסטיק/בקר תנועה</string>
diff --git a/AnkiDroid/src/main/res/values-ja/03-dialogs.xml b/AnkiDroid/src/main/res/values-ja/03-dialogs.xml
index a8e6a908aa21..d68971f9a365 100644
--- a/AnkiDroid/src/main/res/values-ja/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ja/03-dialogs.xml
@@ -54,11 +54,7 @@
     <string name="delete_cram_deck_message">フィルターデッキ「%s」を削除し、すべてのカードを元のデッキに戻しますか？</string>
     <string name="no_tts_available_message">テキスト読み上げ可能な言語がありません</string>
     <string name="tts_no_tts">発声なし</string>
-    <string name="reposition_card_dialog_title">位置（新規カード番号）を変更</string>
     <string name="reposition_card_not_new_error">位置（新規カード番号）の変更は、新規カード以外には行えません。</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="other">%d枚のカードの位置（新規カード番号）を変更しました</item>
-    </plurals>
     <string name="reset_card_dialog_title">カードの学習進度をリセット</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="other">%d枚のカードの学習履歴をリセットしました</item>
diff --git a/AnkiDroid/src/main/res/values-ja/10-preferences.xml b/AnkiDroid/src/main/res/values-ja/10-preferences.xml
index abb319252764..ce51ab4adc5c 100644
--- a/AnkiDroid/src/main/res/values-ja/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ja/10-preferences.xml
@@ -259,9 +259,7 @@
     <string name="donate_description"><![CDATA[<a href=\"%1$s\">寄付</a>することでAnkiDroidの開発を支援することができます。]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">ジェスチャーを追加</string>
-    <string name="binding_replace_gesture">ジェスチャーを置換</string>
     <string name="binding_add_key">キーを追加</string>
-    <string name="binding_replace_key">キーを置換</string>
     <string name="key_picker_default_press_key">いずれかのキーを押してください</string>
     <string name="binding_add_axis">ジョイスティック/モーションコントローラーの動作を追加</string>
     <string name="axis_picker_move_joystick">ジョイスティック/モーションコントローラーを動かしてください</string>
diff --git a/AnkiDroid/src/main/res/values-jv/03-dialogs.xml b/AnkiDroid/src/main/res/values-jv/03-dialogs.xml
index ecb2c3a28ce2..4c4d14477486 100644
--- a/AnkiDroid/src/main/res/values-jv/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-jv/03-dialogs.xml
@@ -54,11 +54,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="other">%d cards repositioned</item>
-    </plurals>
     <string name="reset_card_dialog_title">Reset card progress</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="other">%d cards reset</item>
diff --git a/AnkiDroid/src/main/res/values-jv/10-preferences.xml b/AnkiDroid/src/main/res/values-jv/10-preferences.xml
index 127160523bfc..0b680887a4dd 100644
--- a/AnkiDroid/src/main/res/values-jv/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-jv/10-preferences.xml
@@ -260,9 +260,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-ka/03-dialogs.xml b/AnkiDroid/src/main/res/values-ka/03-dialogs.xml
index ecfc158f3f50..541393b5cf7c 100644
--- a/AnkiDroid/src/main/res/values-ka/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ka/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">მიუწვდომელია ხმოვანი წამკითხველის ენა</string>
     <string name="tts_no_tts">არ წაიკითხოს</string>
-    <string name="reposition_card_dialog_title">ახალი ბარათის გადაადგილება</string>
     <string name="reposition_card_not_new_error">პოზიციის შეცვლა მხოლოდ ახალი ბარათებისთვის შეიძლება</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">შეიცვალა %d ბარათის პოზიცია</item>
-        <item quantity="other">შეიცვალა %d ბარათის პოზიცია</item>
-    </plurals>
     <string name="reset_card_dialog_title">ბარათის პროგრესის გაუქმება</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d ბარათი დაყენდა საწყის მდგომარეობაში</item>
diff --git a/AnkiDroid/src/main/res/values-ka/10-preferences.xml b/AnkiDroid/src/main/res/values-ka/10-preferences.xml
index 1d1da860411c..355eceed09df 100644
--- a/AnkiDroid/src/main/res/values-ka/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ka/10-preferences.xml
@@ -261,9 +261,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">ჟესტის დამატება</string>
-    <string name="binding_replace_gesture">ჟესტის გამოცვლა</string>
     <string name="binding_add_key">კლავიშის დამატება</string>
-    <string name="binding_replace_key">კლავიშის შეცვლა</string>
     <string name="key_picker_default_press_key">დააჭირეთ ნებისმიერ კლავიშს</string>
     <string name="binding_add_axis">ჯოისტიკის/მოძრაობით მართული კონტროლერის დამატება</string>
     <string name="axis_picker_move_joystick">ჯოისტიკის/მოძრაობით მართული კონტროლერის გამოძრავება</string>
diff --git a/AnkiDroid/src/main/res/values-kk/03-dialogs.xml b/AnkiDroid/src/main/res/values-kk/03-dialogs.xml
index 61b99a871615..4c7e5145537a 100644
--- a/AnkiDroid/src/main/res/values-kk/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-kk/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d card repositioned</item>
-        <item quantity="other">%d cards repositioned</item>
-    </plurals>
     <string name="reset_card_dialog_title">Reset card progress</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d card reset</item>
diff --git a/AnkiDroid/src/main/res/values-kk/10-preferences.xml b/AnkiDroid/src/main/res/values-kk/10-preferences.xml
index ea74a38d8c9d..29e92629b16c 100644
--- a/AnkiDroid/src/main/res/values-kk/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-kk/10-preferences.xml
@@ -262,9 +262,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-km/03-dialogs.xml b/AnkiDroid/src/main/res/values-km/03-dialogs.xml
index 9d0934257fe9..d4e9fbd9850c 100644
--- a/AnkiDroid/src/main/res/values-km/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-km/03-dialogs.xml
@@ -54,11 +54,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="other">%d cards repositioned</item>
-    </plurals>
     <string name="reset_card_dialog_title">Reset card progress</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="other">%d cards reset</item>
diff --git a/AnkiDroid/src/main/res/values-km/10-preferences.xml b/AnkiDroid/src/main/res/values-km/10-preferences.xml
index 127160523bfc..0b680887a4dd 100644
--- a/AnkiDroid/src/main/res/values-km/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-km/10-preferences.xml
@@ -260,9 +260,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-kn/03-dialogs.xml b/AnkiDroid/src/main/res/values-kn/03-dialogs.xml
index ff284f4f285d..8525a75a65de 100644
--- a/AnkiDroid/src/main/res/values-kn/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-kn/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">ಫಿಲ್ಟರ್ ಮಾಡಿದ ಡೆಕ್ %s ಅನ್ನು ಅಳಿಸಿ ಮತ್ತು ಎಲ್ಲಾ ಕಾರ್ಡ್‌ಗಳನ್ನು ಅವುಗಳ ಮೂಲ ಡೆಕ್‌ಗಳಿಗೆ ಹಿಂತಿರುಗಿಸುವುದೇ?</string>
     <string name="no_tts_available_message">ಯಾವುದೇ ಪಠ್ಯದಿಂದ ಭಾಷಣಕ್ಕೆ ಭಾಷೆ ಲಭ್ಯವಿಲ್ಲ</string>
     <string name="tts_no_tts">ಮಾತನಾಡಬೇಡ</string>
-    <string name="reposition_card_dialog_title">ಹೊಸ ಕಾರ್ಡ್ ಅನ್ನು ಮರುಸೇರಿಸಿ</string>
     <string name="reposition_card_not_new_error">ಹೊಸ ಕಾರ್ಡ್‌ಗಳನ್ನು ಮಾತ್ರ ಮರುಸ್ಥಾಪಿಸಬಹುದು</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d ಕಾರ್ಡ್ ಅನ್ನು ಮರುಸ್ಥಾನಗೊಳಿಸಲಾಗಿದೆ</item>
-        <item quantity="other">%d ಕಾರ್ಡ್‌ಗಳನ್ನು ಮರುಸ್ಥಾನಗೊಳಿಸಲಾಗಿದೆ</item>
-    </plurals>
     <string name="reset_card_dialog_title">ಕಾರ್ಡ್ ಪ್ರಗತಿಯನ್ನು ಮರುಹೊಂದಿಸಿ</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d ಕಾರ್ಡ್ ಅನ್ನು ಮರುಹೊಂದಿಸಿ</item>
diff --git a/AnkiDroid/src/main/res/values-kn/10-preferences.xml b/AnkiDroid/src/main/res/values-kn/10-preferences.xml
index 8369d868ed35..2d0acc79492a 100644
--- a/AnkiDroid/src/main/res/values-kn/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-kn/10-preferences.xml
@@ -260,9 +260,7 @@
     <string name="donate_description"><![CDATA[<a href=\"%1$s\">ದಾನ ಮಾಡುವ ಮೂಲಕ</a> ನೀವು AnkiDroid ಅಭಿವೃದ್ಧಿಯನ್ನು ಬೆಂಬಲಿಸಬಹುದು. ಯಾವುದೇ ಮೊತ್ತವನ್ನು ಆಳವಾಗಿ ಪ್ರಶಂಸಿಸಲಾಗುತ್ತದೆ.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">ಗೆಸ್ಚರ್ ಸೇರಿಸಿ</string>
-    <string name="binding_replace_gesture">ಗೆಸ್ಚರ್ ಬದಲಾಯಿಸಿ</string>
     <string name="binding_add_key">ಕೀ ಸೇರಿಸಿ</string>
-    <string name="binding_replace_key">ಕೀಲಿಯನ್ನು ಬದಲಾಯಿಸಿ</string>
     <string name="key_picker_default_press_key">ಒಂದು ಕೀಲಿಯನ್ನು ಒತ್ತಿರಿ</string>
     <string name="binding_add_axis">ಜಾಯ್ಸ್ಟಿಕ್/ಚಲನೆಯ ನಿಯಂತ್ರಕವನ್ನು ಸರಿಸಿ</string>
     <string name="axis_picker_move_joystick">ಜಾಯ್ಸ್ಟಿಕ್/ಚಲನೆಯ ನಿಯಂತ್ರಕವನ್ನು ಸರಿಸಿ</string>
diff --git a/AnkiDroid/src/main/res/values-ko/03-dialogs.xml b/AnkiDroid/src/main/res/values-ko/03-dialogs.xml
index d8015ae018d9..2338d1cc22b4 100644
--- a/AnkiDroid/src/main/res/values-ko/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ko/03-dialogs.xml
@@ -54,11 +54,7 @@
     <string name="delete_cram_deck_message">필터링된 덱 %s을(를) 삭제하고 모든 카드를 원래 덱으로 돌려보낼까요?</string>
     <string name="no_tts_available_message">문장 읽어주기 기능(TTS)을 사용할 수 없음</string>
     <string name="tts_no_tts">무음</string>
-    <string name="reposition_card_dialog_title">새 카드 위치 변경</string>
     <string name="reposition_card_not_new_error">새 카드만 순서를 조정할 수 있습니다.</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="other">%d개의 카드를 옮겼습니다.</item>
-    </plurals>
     <string name="reset_card_dialog_title">카드 학습 진행 재설정</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="other">%d개의 카드를 초기화했습니다.</item>
diff --git a/AnkiDroid/src/main/res/values-ko/10-preferences.xml b/AnkiDroid/src/main/res/values-ko/10-preferences.xml
index bb078211b65b..b7407111fb9f 100644
--- a/AnkiDroid/src/main/res/values-ko/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ko/10-preferences.xml
@@ -258,9 +258,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">제스쳐 추가</string>
-    <string name="binding_replace_gesture">제스쳐 대체</string>
     <string name="binding_add_key">키 추가</string>
-    <string name="binding_replace_key">키 대체</string>
     <string name="key_picker_default_press_key">키 누르기</string>
     <string name="binding_add_axis">조이스틱/모션 컨트롤러 추가</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-ku/03-dialogs.xml b/AnkiDroid/src/main/res/values-ku/03-dialogs.xml
index c2f07ad2a3b1..d99b9cb1805c 100644
--- a/AnkiDroid/src/main/res/values-ku/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ku/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Nexwîne</string>
-    <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d card repositioned</item>
-        <item quantity="other">%d cards repositioned</item>
-    </plurals>
     <string name="reset_card_dialog_title">Reset card progress</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d card reset</item>
diff --git a/AnkiDroid/src/main/res/values-ku/10-preferences.xml b/AnkiDroid/src/main/res/values-ku/10-preferences.xml
index 03744990f8ef..76fb669b6a37 100644
--- a/AnkiDroid/src/main/res/values-ku/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ku/10-preferences.xml
@@ -262,9 +262,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-ky/03-dialogs.xml b/AnkiDroid/src/main/res/values-ky/03-dialogs.xml
index 1c406a25e9ca..e9fdcb377dee 100644
--- a/AnkiDroid/src/main/res/values-ky/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ky/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d card repositioned</item>
-        <item quantity="other">%d cards repositioned</item>
-    </plurals>
     <string name="reset_card_dialog_title">Reset card progress</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d card reset</item>
diff --git a/AnkiDroid/src/main/res/values-ky/10-preferences.xml b/AnkiDroid/src/main/res/values-ky/10-preferences.xml
index ea74a38d8c9d..29e92629b16c 100644
--- a/AnkiDroid/src/main/res/values-ky/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ky/10-preferences.xml
@@ -262,9 +262,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-lt/03-dialogs.xml b/AnkiDroid/src/main/res/values-lt/03-dialogs.xml
index be929d17e5a4..30cca55c2459 100644
--- a/AnkiDroid/src/main/res/values-lt/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-lt/03-dialogs.xml
@@ -57,14 +57,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Teksto perskaityti nurodyta kalba negalime</string>
     <string name="tts_no_tts">Nekalbėkite</string>
-    <string name="reposition_card_dialog_title">Pakeiskite naujos kortelės padėtį</string>
     <string name="reposition_card_not_new_error">Gali būti keičiamas tik naujų kortelių išdėstymas</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">Pakeistas %d kortelės išdėstymas</item>
-        <item quantity="few">Pakeistas %d kortelių išdėstymas</item>
-        <item quantity="many">Pakeistas %d kortelių išdėstymas</item>
-        <item quantity="other">Pakeistas %d kort. išdėstymas</item>
-    </plurals>
     <string name="reset_card_dialog_title">Atkurti kortelių eigą</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d kortelės atkūrimas</item>
diff --git a/AnkiDroid/src/main/res/values-lt/10-preferences.xml b/AnkiDroid/src/main/res/values-lt/10-preferences.xml
index 45cdc74bfa7d..bbd1abf46e9d 100644
--- a/AnkiDroid/src/main/res/values-lt/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-lt/10-preferences.xml
@@ -266,9 +266,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-lv/03-dialogs.xml b/AnkiDroid/src/main/res/values-lv/03-dialogs.xml
index 835db5f93028..0f24aa30ad6a 100644
--- a/AnkiDroid/src/main/res/values-lv/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-lv/03-dialogs.xml
@@ -56,13 +56,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="zero">%d cards repositioned</item>
-        <item quantity="one">%d card repositioned</item>
-        <item quantity="other">%d cards repositioned</item>
-    </plurals>
     <string name="reset_card_dialog_title">Reset card progress</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="zero">%d cards reset</item>
diff --git a/AnkiDroid/src/main/res/values-lv/10-preferences.xml b/AnkiDroid/src/main/res/values-lv/10-preferences.xml
index 6ade468a4a75..af545fb15c92 100644
--- a/AnkiDroid/src/main/res/values-lv/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-lv/10-preferences.xml
@@ -264,9 +264,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-mk/03-dialogs.xml b/AnkiDroid/src/main/res/values-mk/03-dialogs.xml
index 5cbeedc2510b..199572732287 100644
--- a/AnkiDroid/src/main/res/values-mk/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-mk/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Нема достапен јазик за текст-во-говор</string>
     <string name="tts_no_tts">Не зборувај</string>
-    <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d card repositioned</item>
-        <item quantity="other">%d cards repositioned</item>
-    </plurals>
     <string name="reset_card_dialog_title">Ресетирање на напредок на картичката</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d card reset</item>
diff --git a/AnkiDroid/src/main/res/values-mk/10-preferences.xml b/AnkiDroid/src/main/res/values-mk/10-preferences.xml
index fd5dfdeed414..27df657854a1 100644
--- a/AnkiDroid/src/main/res/values-mk/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-mk/10-preferences.xml
@@ -262,9 +262,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-ml/03-dialogs.xml b/AnkiDroid/src/main/res/values-ml/03-dialogs.xml
index 7de736acbbc2..cde3c6bfb91f 100644
--- a/AnkiDroid/src/main/res/values-ml/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ml/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">ടെക്സ്റ്റ്-ടു-സ്പീച്ച് ഭാഷ ലഭ്യമല്ല</string>
     <string name="tts_no_tts">സംസാരിക്കരുത്</string>
-    <string name="reposition_card_dialog_title">പുതിയ കാർഡ് പുന  സ്ഥാപിക്കുക</string>
     <string name="reposition_card_not_new_error">പുതിയ കാർഡുകൾ മാത്രമേ പുന  സ്ഥാപിക്കാൻ കഴിയൂ</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d കാർഡ് സ്ഥാനം മാറ്റി</item>
-        <item quantity="other">%d കാർഡുകൾ സ്ഥാനം മാറ്റി</item>
-    </plurals>
     <string name="reset_card_dialog_title">കാർഡ് പുരോഗതി പുന Res സജ്ജമാക്കുക</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%dകാർഡ് പുന സജ്ജമാക്കുക</item>
diff --git a/AnkiDroid/src/main/res/values-ml/10-preferences.xml b/AnkiDroid/src/main/res/values-ml/10-preferences.xml
index 9fd634a28516..bf34084e55b6 100644
--- a/AnkiDroid/src/main/res/values-ml/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ml/10-preferences.xml
@@ -261,9 +261,7 @@
     <string name="donate_description"><![CDATA[<a href=\"%1$s\">സംഭാവന ചെയ്യുന്നതിലൂടെ</a> നിങ്ങൾക്ക് AnkiDroid വികസനത്തെ പിന്തുണയ്ക്കാം. ഏത് തുകയും ആഴത്തിൽ വിലമതിക്കുന്നു.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">ആംഗ്യം ചേർക്കുക</string>
-    <string name="binding_replace_gesture">ആംഗ്യം മാറ്റിസ്ഥാപിക്കുക</string>
     <string name="binding_add_key">കീ ചേർക്കുക</string>
-    <string name="binding_replace_key">കീ മാറ്റിസ്ഥാപിക്കുക</string>
     <string name="key_picker_default_press_key">ഒരു കീ അമർത്തുക</string>
     <string name="binding_add_axis">ഒരു ജോയിസ്റ്റിക്ക്/മോഷൻ കൺട്രോളർ ചേർക്കുക</string>
     <string name="axis_picker_move_joystick">ഒരു ജോയിസ്റ്റിക്ക്/മോഷൻ കൺട്രോളർ നീക്കുക</string>
diff --git a/AnkiDroid/src/main/res/values-mn/03-dialogs.xml b/AnkiDroid/src/main/res/values-mn/03-dialogs.xml
index d156c86298d1..a90006f09ce1 100644
--- a/AnkiDroid/src/main/res/values-mn/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-mn/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d card repositioned</item>
-        <item quantity="other">%d cards repositioned</item>
-    </plurals>
     <string name="reset_card_dialog_title">Reset card progress</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d card reset</item>
diff --git a/AnkiDroid/src/main/res/values-mn/10-preferences.xml b/AnkiDroid/src/main/res/values-mn/10-preferences.xml
index 0ebe52c31011..dd70942eb764 100644
--- a/AnkiDroid/src/main/res/values-mn/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-mn/10-preferences.xml
@@ -262,9 +262,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-mr/03-dialogs.xml b/AnkiDroid/src/main/res/values-mr/03-dialogs.xml
index ed006a808336..5ddcf4a4e9a0 100644
--- a/AnkiDroid/src/main/res/values-mr/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-mr/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">मजकूर-ते-भाषणाची भाषा उपलब्ध नाही</string>
     <string name="tts_no_tts">बोलू नका</string>
-    <string name="reposition_card_dialog_title">नवीन कार्ड पुनर्स्थित करा</string>
     <string name="reposition_card_not_new_error">केवळ नवीन कार्डे पुनर्स्थित केली जाऊ शकतात</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d कार्ड बदलले</item>
-        <item quantity="other">%d कार्ड पुनर्स्थित केली</item>
-    </plurals>
     <string name="reset_card_dialog_title">कार्ड प्रगती रीसेट करा</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d कार्ड रीसेट</item>
diff --git a/AnkiDroid/src/main/res/values-mr/10-preferences.xml b/AnkiDroid/src/main/res/values-mr/10-preferences.xml
index 0a7038eaa743..8c9ed489bcb6 100644
--- a/AnkiDroid/src/main/res/values-mr/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-mr/10-preferences.xml
@@ -260,9 +260,7 @@
     <string name="donate_description"><![CDATA[तुम्ही <a href=\"%1$s\">दान</a> करून AnkiDroid च्या विकासाला समर्थन देऊ शकता. कोणतीही रक्कम खूप कौतुकास्पद आहे.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">एक जेश्चर जोडा</string>
-    <string name="binding_replace_gesture">जेश्चर बदला</string>
     <string name="binding_add_key">की जोडा</string>
-    <string name="binding_replace_key">की बदला</string>
     <string name="key_picker_default_press_key">एक कळ दाबा</string>
     <string name="binding_add_axis">जॉयस्टिक/मोशन कंट्रोलर जोडा</string>
     <string name="axis_picker_move_joystick">जॉयस्टिक/मोशन कंट्रोलर हलवा</string>
diff --git a/AnkiDroid/src/main/res/values-ms/03-dialogs.xml b/AnkiDroid/src/main/res/values-ms/03-dialogs.xml
index 51d19de12d4e..88ca44174204 100644
--- a/AnkiDroid/src/main/res/values-ms/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ms/03-dialogs.xml
@@ -54,11 +54,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Teks-ke-ucapan bahasa tiada</string>
     <string name="tts_no_tts">Jangan bercakap</string>
-    <string name="reposition_card_dialog_title">Alih posisi kad baru</string>
     <string name="reposition_card_not_new_error">Hanya kad baru boleh alih posisi</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="other">%d kad telah alih posisi</item>
-    </plurals>
     <string name="reset_card_dialog_title">Tetap semula kemajuan kad</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="other">%d kad ditetap semula</item>
diff --git a/AnkiDroid/src/main/res/values-ms/10-preferences.xml b/AnkiDroid/src/main/res/values-ms/10-preferences.xml
index 3539d2808924..9deb06530b91 100644
--- a/AnkiDroid/src/main/res/values-ms/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ms/10-preferences.xml
@@ -260,9 +260,7 @@
     <string name="donate_description"><![CDATA[Anda boleh menyokong pembangunan AnkiDroid dengan <a href=\"%1$s\">menderma</a>. Apa-apa jumlah sangat dihargai.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Tambah gerak isyarat</string>
-    <string name="binding_replace_gesture">Ganti gerak isyarat</string>
     <string name="binding_add_key">Tambah kekunci</string>
-    <string name="binding_replace_key">Ganti kekunci</string>
     <string name="key_picker_default_press_key">Tekan kekunci</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-my/03-dialogs.xml b/AnkiDroid/src/main/res/values-my/03-dialogs.xml
index 22cc38cc490e..dee33a42274a 100644
--- a/AnkiDroid/src/main/res/values-my/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-my/03-dialogs.xml
@@ -54,11 +54,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="other">%d cards repositioned</item>
-    </plurals>
     <string name="reset_card_dialog_title">Reset card progress</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="other">%d cards reset</item>
diff --git a/AnkiDroid/src/main/res/values-my/10-preferences.xml b/AnkiDroid/src/main/res/values-my/10-preferences.xml
index 127160523bfc..0b680887a4dd 100644
--- a/AnkiDroid/src/main/res/values-my/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-my/10-preferences.xml
@@ -260,9 +260,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-nl/03-dialogs.xml b/AnkiDroid/src/main/res/values-nl/03-dialogs.xml
index 4c868775d098..78eec1b4d888 100644
--- a/AnkiDroid/src/main/res/values-nl/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-nl/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Verwijder gefilterd deck %s en plaats alle kaarten terug in hun oorspronkelijke decks?</string>
     <string name="no_tts_available_message">Geen tekst-naar-spraak taal beschikbaar</string>
     <string name="tts_no_tts">Niet spreken</string>
-    <string name="reposition_card_dialog_title">Nieuwe kaart verplaatsen</string>
     <string name="reposition_card_not_new_error">Alleen nieuwe kaarten kunnen verplaatst worden</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d kaart verplaatst</item>
-        <item quantity="other">%d kaarten verplaatst</item>
-    </plurals>
     <string name="reset_card_dialog_title">Herstel leervoortgang</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d kaart gereset</item>
diff --git a/AnkiDroid/src/main/res/values-nl/10-preferences.xml b/AnkiDroid/src/main/res/values-nl/10-preferences.xml
index 17c6ce557f43..655155fec673 100644
--- a/AnkiDroid/src/main/res/values-nl/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-nl/10-preferences.xml
@@ -261,9 +261,7 @@
     <string name="donate_description"><![CDATA[U kunt de ontwikkeling van AnkiDroid steunen door te <a href="%1$s">doneren</a>. Elk bedrag wordt zeer op prijs gesteld.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Gebaar toevoegen</string>
-    <string name="binding_replace_gesture">Gebaar vervangen</string>
     <string name="binding_add_key">Sleutel toevoegen</string>
-    <string name="binding_replace_key">Vervang sleutel</string>
     <string name="key_picker_default_press_key">Druk op een toets</string>
     <string name="binding_add_axis">Joystick/bewegingscontroller toevoegen</string>
     <string name="axis_picker_move_joystick">Joystick/bewegingscontroller bewegen</string>
diff --git a/AnkiDroid/src/main/res/values-nn/03-dialogs.xml b/AnkiDroid/src/main/res/values-nn/03-dialogs.xml
index 64759885b0af..5d207bbdb889 100644
--- a/AnkiDroid/src/main/res/values-nn/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-nn/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Ingen \"tekst til tale\"-språk tilgjengelige</string>
     <string name="tts_no_tts">Ikke snakk</string>
-    <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d card repositioned</item>
-        <item quantity="other">%d cards repositioned</item>
-    </plurals>
     <string name="reset_card_dialog_title">Tilbakestill kortfremskritt</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d card reset</item>
diff --git a/AnkiDroid/src/main/res/values-nn/10-preferences.xml b/AnkiDroid/src/main/res/values-nn/10-preferences.xml
index 96f6c4be34e3..8d52ed8d93d9 100644
--- a/AnkiDroid/src/main/res/values-nn/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-nn/10-preferences.xml
@@ -262,9 +262,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-no/03-dialogs.xml b/AnkiDroid/src/main/res/values-no/03-dialogs.xml
index 36e0d12ab6c7..1f0feb90cba1 100644
--- a/AnkiDroid/src/main/res/values-no/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-no/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Ingen \"tekst til tale\"-språk tilgjengelige</string>
     <string name="tts_no_tts">Ikke snakk</string>
-    <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d card repositioned</item>
-        <item quantity="other">%d cards repositioned</item>
-    </plurals>
     <string name="reset_card_dialog_title">Tilbakestill kortfremskritt</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d card reset</item>
diff --git a/AnkiDroid/src/main/res/values-no/10-preferences.xml b/AnkiDroid/src/main/res/values-no/10-preferences.xml
index 33122a1a7bd8..86be1ff1b2d4 100644
--- a/AnkiDroid/src/main/res/values-no/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-no/10-preferences.xml
@@ -262,9 +262,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-or/03-dialogs.xml b/AnkiDroid/src/main/res/values-or/03-dialogs.xml
index 91265b613b34..19c40dba26e2 100644
--- a/AnkiDroid/src/main/res/values-or/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-or/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">କୌଣସି ପାଠ୍ୟ-ରୁ-କଥନ ଭାଷା ଉପଲବ୍ଧ ନାହିଁ</string>
     <string name="tts_no_tts">କଥା କୁହ ନାହିଁ</string>
-    <string name="reposition_card_dialog_title">ନୂଆ ପତ୍ରଟିକୁ ପୁନଃଅଵସ୍ଥିତ କରିବା</string>
     <string name="reposition_card_not_new_error">କେଵଳ ନୂଆ ପତ୍ରଗୁଡ଼ିକୁ ପୁନଃଅଵସ୍ଥିତ କରିହେବ</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%dଟିଏ ପତ୍ର ପୁନଃଅଵସ୍ଥିତ କରାଗଲା</item>
-        <item quantity="other">%dଟି ପତ୍ର ପୁନଃଅଵସ୍ଥିତ କରାଗଲା</item>
-    </plurals>
     <string name="reset_card_dialog_title">ପତ୍ରର ପ୍ରଗତି ପୁନଃସେଟ୍ କର</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%dଟିଏ ପତ୍ର ପୁନଃସେଟ୍ ହେଲା</item>
diff --git a/AnkiDroid/src/main/res/values-or/10-preferences.xml b/AnkiDroid/src/main/res/values-or/10-preferences.xml
index 070e7dbf97be..70d0f1da84ef 100644
--- a/AnkiDroid/src/main/res/values-or/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-or/10-preferences.xml
@@ -261,9 +261,7 @@
     <string name="donate_description"><![CDATA[ଆପଣ <a href=\"%1$s\">ଦାନ</a> କରି AnkiDroidର ବିକାଶକୁ ସମର୍ଥନ କରିପାରିବେ। ଯେକୌଣସି ରାଶି ଅତ୍ୟନ୍ତ ପ୍ରଶଂସନୀୟ ଅଟେ।]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">ଅଙ୍ଗଭଙ୍ଗୀ ଯୋଡ଼ନ୍ତୁ</string>
-    <string name="binding_replace_gesture">ଅଙ୍ଗଭଙ୍ଗୀ ବଦଳାନ୍ତୁ</string>
     <string name="binding_add_key">Key ଯୋଡ଼ନ୍ତୁ</string>
-    <string name="binding_replace_key">Key ବଦଳାନ୍ତୁ</string>
     <string name="key_picker_default_press_key">ଏକ key ଦବାନ୍ତୁ</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-pa/03-dialogs.xml b/AnkiDroid/src/main/res/values-pa/03-dialogs.xml
index 8ecd426eccdc..1c3d7a2428fb 100644
--- a/AnkiDroid/src/main/res/values-pa/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-pa/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">ਫਿਲਟਰ ਕੀਤੇ ਡੈੱਕ %s ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ ਅਤੇ ਸਾਰੇ ਕਾਰਡਾਂ ਨੂੰ ਉਹਨਾਂ ਦੇ ਅਸਲ ਡੈੱਕ \'ਤੇ ਵਾਪਸ ਕਰਨਾ ਹੈ?</string>
     <string name="no_tts_available_message">ਕੋਈ ਟੈਕਸਟ-ਟੂ-ਸਪੀਚ ਭਾਸ਼ਾ ਉਪਲਬਧ ਨਹੀਂ ਹੈ</string>
     <string name="tts_no_tts">ਨਾ ਬੋਲੋ</string>
-    <string name="reposition_card_dialog_title">ਨਵਾਂ ਕਾਰਡ ਬਦਲੋ</string>
     <string name="reposition_card_not_new_error">ਸਿਰਫ਼ ਨਵੇਂ ਕਾਰਡਾਂ ਨੂੰ ਹੀ ਮੁੜ-ਸਥਾਪਿਤ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d ਕਾਰਡ ਮੁੜ-ਸਥਾਪਤ ਕੀਤਾ ਗਿਆ</item>
-        <item quantity="other">%d ਕਾਰਡ ਮੁੜ-ਸਥਾਪਤ ਕੀਤੇ ਗਏ</item>
-    </plurals>
     <string name="reset_card_dialog_title">ਕਾਰਡ ਦੀ ਪ੍ਰਗਤੀ ਨੂੰ ਰੀਸੈਟ ਕਰੋ</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d ਕਾਰਡ ਰੀਸੈੱਟ</item>
diff --git a/AnkiDroid/src/main/res/values-pa/10-preferences.xml b/AnkiDroid/src/main/res/values-pa/10-preferences.xml
index 83b13ccc29e4..d8c8c8817758 100644
--- a/AnkiDroid/src/main/res/values-pa/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-pa/10-preferences.xml
@@ -261,9 +261,7 @@
     <string name="donate_description"><![CDATA[ਤੁਸੀਂ <a href=\"%1$s\">ਦਾਨ ਦੇ ਕੇ</a> AnkiDroid ਦੇ ਵਿਕਾਸ ਦਾ ਸਮਰਥਨ ਕਰ ਸਕਦੇ ਹੋ। ਕਿਸੇ ਵੀ ਰਕਮ ਦੀ ਡੂੰਘਾਈ ਨਾਲ ਸ਼ਲਾਘਾ ਕੀਤੀ ਜਾਂਦੀ ਹੈ.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">ਸੰਕੇਤ ਸ਼ਾਮਲ ਕਰੋ</string>
-    <string name="binding_replace_gesture">ਸੰਕੇਤ ਬਦਲੋ</string>
     <string name="binding_add_key">ਕੁੰਜੀ ਸ਼ਾਮਲ ਕਰੋ</string>
-    <string name="binding_replace_key">ਕੁੰਜੀ ਨੂੰ ਬਦਲੋ</string>
     <string name="key_picker_default_press_key">ਇੱਕ ਕੁੰਜੀ ਦਬਾਓ</string>
     <string name="binding_add_axis">ਜਾਇਸਟਿਕ/ਮੋਸ਼ਨ ਕੰਟਰੋਲਰ ਸ਼ਾਮਲ ਕਰੋ</string>
     <string name="axis_picker_move_joystick">ਇੱਕ ਜਾਇਸਟਿਕ/ਮੋਸ਼ਨ ਕੰਟਰੋਲਰ ਨੂੰ ਹਿਲਾਓ</string>
diff --git a/AnkiDroid/src/main/res/values-pl/03-dialogs.xml b/AnkiDroid/src/main/res/values-pl/03-dialogs.xml
index ce87767c4906..e960fc4ec44f 100644
--- a/AnkiDroid/src/main/res/values-pl/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-pl/03-dialogs.xml
@@ -57,14 +57,7 @@
     <string name="delete_cram_deck_message">Czy na pewno chcesz usunąć filtrowaną talię %s i przenieść wszystkie karty do ich oryginalnych talii?</string>
     <string name="no_tts_available_message">Brak dostępnego języka zamiany tekstu na mowę</string>
     <string name="tts_no_tts">Nie mów</string>
-    <string name="reposition_card_dialog_title">Przestawianie nowej karty</string>
     <string name="reposition_card_not_new_error">Tylko nowe karty mogą być przestawione</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d karta przestawiona</item>
-        <item quantity="few">%d karty przestawione</item>
-        <item quantity="many">%d kart przestawiono</item>
-        <item quantity="other">%d kart przestawiono</item>
-    </plurals>
     <string name="reset_card_dialog_title">Reset postępu karty</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d karta zresetowana</item>
diff --git a/AnkiDroid/src/main/res/values-pl/10-preferences.xml b/AnkiDroid/src/main/res/values-pl/10-preferences.xml
index eeb95cc99efd..bb1697e1b5f8 100644
--- a/AnkiDroid/src/main/res/values-pl/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-pl/10-preferences.xml
@@ -265,9 +265,7 @@
     <string name="donate_description"><![CDATA[Możesz wspierać rozwój AnkiDroida <a href=\"%1$s\">darowizną</a>. Jesteśmy wdzięczni za każdą kwotę.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Dodaj gest</string>
-    <string name="binding_replace_gesture">Zastąp gest</string>
     <string name="binding_add_key">Dodaj klawisz</string>
-    <string name="binding_replace_key">Zamień klucz</string>
     <string name="key_picker_default_press_key">Naciśnij klawisz</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rBR/03-dialogs.xml b/AnkiDroid/src/main/res/values-pt-rBR/03-dialogs.xml
index af3c604e648e..9642f607ec86 100644
--- a/AnkiDroid/src/main/res/values-pt-rBR/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-pt-rBR/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Excluir baralho filtrado %s e enviar todos os cartões de volta para seus baralhos originais?</string>
     <string name="no_tts_available_message">Nenhum idioma de texto para fala disponível</string>
     <string name="tts_no_tts">Não fale</string>
-    <string name="reposition_card_dialog_title">Reposicionar novo cartão</string>
     <string name="reposition_card_not_new_error">Apenas novos cartões podem ser reposicionados</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d cartão reposicionado</item>
-        <item quantity="other">%d cards reposicionados</item>
-    </plurals>
     <string name="reset_card_dialog_title">Redefinir progresso do cartão</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d resetar cartão</item>
diff --git a/AnkiDroid/src/main/res/values-pt-rBR/10-preferences.xml b/AnkiDroid/src/main/res/values-pt-rBR/10-preferences.xml
index 60fbf1794859..7f253f75ca17 100644
--- a/AnkiDroid/src/main/res/values-pt-rBR/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-pt-rBR/10-preferences.xml
@@ -261,9 +261,7 @@
     <string name="donate_description"><![CDATA[Você pode apoiar o desenvolvimento de AnkiDroid <a href=\"%1$s\">doando</a>. Qualquer quantia é profundamente apreciada.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Adicionar gesto</string>
-    <string name="binding_replace_gesture">Substituir gesto</string>
     <string name="binding_add_key">Adicionar tecla</string>
-    <string name="binding_replace_key">Substituir tecla</string>
     <string name="key_picker_default_press_key">Pressione uma tecla</string>
     <string name="binding_add_axis">Adicionar controle</string>
     <string name="axis_picker_move_joystick">Movimente o controle</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rPT/03-dialogs.xml b/AnkiDroid/src/main/res/values-pt-rPT/03-dialogs.xml
index 24fd97425b11..7f48f7c8d9e8 100644
--- a/AnkiDroid/src/main/res/values-pt-rPT/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-pt-rPT/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Apagar baralho filtrado %s e devolver fichas aos seus baralhos originais?</string>
     <string name="no_tts_available_message">Nenhuma língua disponível para o sistema de conversão de texto para fala</string>
     <string name="tts_no_tts">Não falar</string>
-    <string name="reposition_card_dialog_title">Reposicionar a nova ficha</string>
     <string name="reposition_card_not_new_error">Apenas novas fichas podem ser reposicionadas.</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d ficha reposicionada</item>
-        <item quantity="other">%d fichas reposicionadas</item>
-    </plurals>
     <string name="reset_card_dialog_title">Reiniciar progresso da ficha</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d ficha reinicializada</item>
diff --git a/AnkiDroid/src/main/res/values-pt-rPT/10-preferences.xml b/AnkiDroid/src/main/res/values-pt-rPT/10-preferences.xml
index c2cb83f98fd0..6e98a71bff39 100644
--- a/AnkiDroid/src/main/res/values-pt-rPT/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-pt-rPT/10-preferences.xml
@@ -262,9 +262,7 @@
     <string name="donate_description"><![CDATA[Pode apoiar o desenvolvimento do AnkiDroid ao <a href=\"%1$s\">doar</a>. Ficamos muito gratos independentemente do valor.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Adicionar gesto</string>
-    <string name="binding_replace_gesture">Substituir gesto</string>
     <string name="binding_add_key">Adicionar tecla</string>
-    <string name="binding_replace_key">Substituir tecla</string>
     <string name="key_picker_default_press_key">Pressione uma tecla</string>
     <string name="binding_add_axis">Adicionar um \"joystick\"/comando de movimento</string>
     <string name="axis_picker_move_joystick">Mover um \"joystick\"/comando de movimento</string>
diff --git a/AnkiDroid/src/main/res/values-ro/03-dialogs.xml b/AnkiDroid/src/main/res/values-ro/03-dialogs.xml
index 99d5f8edc323..ba248204934a 100644
--- a/AnkiDroid/src/main/res/values-ro/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ro/03-dialogs.xml
@@ -56,13 +56,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Nu vorbi</string>
-    <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d card repositioned</item>
-        <item quantity="few">%d cards repositioned</item>
-        <item quantity="other">%d cards repositioned</item>
-    </plurals>
     <string name="reset_card_dialog_title">Resetează progresul de carduri</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d card reset</item>
diff --git a/AnkiDroid/src/main/res/values-ro/10-preferences.xml b/AnkiDroid/src/main/res/values-ro/10-preferences.xml
index 17fc2c02636b..8d04dae2c5d9 100644
--- a/AnkiDroid/src/main/res/values-ro/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ro/10-preferences.xml
@@ -264,9 +264,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-ru/03-dialogs.xml b/AnkiDroid/src/main/res/values-ru/03-dialogs.xml
index 840e47a8922c..6868fabf7951 100644
--- a/AnkiDroid/src/main/res/values-ru/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ru/03-dialogs.xml
@@ -57,14 +57,7 @@
     <string name="delete_cram_deck_message">Удалить отфильтрованную колоду %s и отправить все карточки обратно в оригинальные колоды?</string>
     <string name="no_tts_available_message">Синтез речи недоступен</string>
     <string name="tts_no_tts">Не произносить</string>
-    <string name="reposition_card_dialog_title">Переместить новую карточку</string>
     <string name="reposition_card_not_new_error">Можно переместить только новые карточки</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d карточка перемещена</item>
-        <item quantity="few">%d карточки перемещена</item>
-        <item quantity="many">%d карточек перемещены</item>
-        <item quantity="other">%d карточек перемещены</item>
-    </plurals>
     <string name="reset_card_dialog_title">Сбросить состояние карточек</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d карточка сброшена</item>
diff --git a/AnkiDroid/src/main/res/values-ru/10-preferences.xml b/AnkiDroid/src/main/res/values-ru/10-preferences.xml
index 81027c75c21a..4be4e744e4bc 100644
--- a/AnkiDroid/src/main/res/values-ru/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ru/10-preferences.xml
@@ -264,9 +264,7 @@
     <string name="donate_description"><![CDATA[Вы можете поддержать развитие AnkiDroid, <a href=\"%1$s\">пожертвованием</a>. Любая сумма сильно поможет.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Добавить жест</string>
-    <string name="binding_replace_gesture">Заменить жест</string>
     <string name="binding_add_key">Добавить кнопку</string>
-    <string name="binding_replace_key">Заменить клавишу</string>
     <string name="key_picker_default_press_key">Нажмите кнопку</string>
     <string name="binding_add_axis">Добавить джойстик/контроллер движения</string>
     <string name="axis_picker_move_joystick">Переместить джойстик/контроллер движения</string>
diff --git a/AnkiDroid/src/main/res/values-sat/03-dialogs.xml b/AnkiDroid/src/main/res/values-sat/03-dialogs.xml
index bd2817550f81..4df5e25aeb76 100644
--- a/AnkiDroid/src/main/res/values-sat/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sat/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">ᱯᱷᱤᱞᱴᱟᱨ ᱟᱠᱟᱫ ᱰᱮᱠ %s ᱵᱚᱫᱚᱞ ᱢᱮ ᱟᱨ ᱡᱚᱛᱚ ᱠᱟᱨᱰ ᱟᱠᱚᱣᱟᱜ ᱚᱨᱡᱤᱱᱤᱭᱟᱞ ᱰᱮᱠ ᱨᱮ ᱵᱚᱫᱚᱞ ᱢᱮ?</string>
     <string name="no_tts_available_message">text-to-speech ᱯᱟᱹᱨᱥᱤ ᱵᱟᱱᱩᱜᱼᱟ ᱾</string>
     <string name="tts_no_tts">ᱟᱞᱚᱢ ᱨᱚᱲᱟ</string>
-    <string name="reposition_card_dialog_title">ᱱᱟᱶᱟ ᱠᱟᱰ ᱥᱛᱷᱟᱱᱚᱱᱛᱚᱨ ᱯᱮ</string>
     <string name="reposition_card_not_new_error">ᱠᱷᱟᱹᱞᱤ ᱱᱟᱶᱟ ᱠᱟᱰ ᱜᱮ ᱥᱛᱷᱟᱱᱚᱱᱛᱚᱨ ᱫᱟᱲᱮᱭᱟᱜᱟᱢ</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d ᱠᱟᱰ ᱥᱛᱷᱟᱱᱚᱱᱛᱚᱨ ᱮᱱᱟ</item>
-        <item quantity="other">%d ᱠᱟᱰ ᱥᱛᱷᱟᱱᱚᱱᱛᱚᱨ ᱮᱱᱟ</item>
-    </plurals>
     <string name="reset_card_dialog_title">ᱠᱟᱰ ᱨᱤᱥᱮᱴ ᱯᱨᱚᱜᱨᱮᱥᱚᱜ ᱠᱟᱱᱟ</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d ᱠᱟᱰ ᱨᱤᱥᱮᱴ</item>
diff --git a/AnkiDroid/src/main/res/values-sat/10-preferences.xml b/AnkiDroid/src/main/res/values-sat/10-preferences.xml
index 99ce44ceecd2..671711b4852a 100644
--- a/AnkiDroid/src/main/res/values-sat/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sat/10-preferences.xml
@@ -261,9 +261,7 @@
     <string name="donate_description"><![CDATA[ᱟᱢ <a href=\"%1$s\">ᱫᱚᱦᱚᱭ ᱠᱟᱛᱮ</a> AnkiDroid ᱨᱮᱭᱟᱜ ᱩᱛᱷᱱᱟᱹᱣ ᱨᱮ ᱜᱚᱲᱚ ᱮᱢ ᱫᱟᱲᱮᱭᱟᱜᱼᱟ ᱾ ᱡᱟᱦᱟᱸᱱ ᱮᱢᱟᱱ ᱜᱮ ᱟᱹᱰᱤ ᱟᱞᱜᱟ ᱛᱮᱭ ᱢᱟᱱᱟᱣ ᱵᱟᱛᱟᱣᱜᱼᱟ ᱾]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">ᱤᱥᱟᱨᱟ ᱡᱚᱲᱟᱣ</string>
-    <string name="binding_replace_gesture">ᱪᱤᱱᱦᱟᱹ ᱵᱚᱫᱚᱞ ᱢᱮ</string>
     <string name="binding_add_key">Key ᱡᱚᱲᱟᱣ</string>
-    <string name="binding_replace_key">ᱪᱷᱟᱸᱪ ᱫᱚᱦᱚᱭ ᱢᱮ</string>
     <string name="key_picker_default_press_key">ᱢᱤᱫ key ᱚᱛᱟᱭ ᱢᱮ</string>
     <string name="binding_add_axis">ᱡᱚᱭᱥᱴᱤᱠ/ᱢᱳᱥᱚᱱ ᱠᱚᱱᱴᱨᱚᱞᱟᱨ ᱥᱮᱞᱮᱫ ᱢᱮ</string>
     <string name="axis_picker_move_joystick">ᱡᱚᱭᱥᱴᱤᱠ/ᱢᱳᱥᱚᱱ ᱠᱚᱱᱴᱨᱚᱞᱟᱨ ᱥᱮᱞᱮᱫ ᱢᱮ</string>
diff --git a/AnkiDroid/src/main/res/values-sc/03-dialogs.xml b/AnkiDroid/src/main/res/values-sc/03-dialogs.xml
index ff464bc9927e..0b8ac32bff10 100644
--- a/AnkiDroid/src/main/res/values-sc/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sc/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Iscantzellare su matzu filtradu %s e torrare a imbiare totu sas cartas a sos matzos originale issoro?</string>
     <string name="no_tts_available_message">Non b\'est a disponimentu peruna limba de sìntesi vocale</string>
     <string name="tts_no_tts">Non chistiones</string>
-    <string name="reposition_card_dialog_title">Torra a positzionare sa carta noa</string>
     <string name="reposition_card_not_new_error">Petzi sas cartas noas si podent torrare a positzionare</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d carta torrada a positzionare</item>
-        <item quantity="other">%d cartas torradas a positzionare</item>
-    </plurals>
     <string name="reset_card_dialog_title">Reseta su progressu de sa carta</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d carta resetada</item>
diff --git a/AnkiDroid/src/main/res/values-sc/10-preferences.xml b/AnkiDroid/src/main/res/values-sc/10-preferences.xml
index b3a41ada6f3a..b20799979594 100644
--- a/AnkiDroid/src/main/res/values-sc/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sc/10-preferences.xml
@@ -261,9 +261,7 @@
     <string name="donate_description"><![CDATA[Podes suportare s\'isvilupu de AnkiDroid <a href=\"%1$s\">cun una donatzione</a>. Cale si siat tantu est apretziadu meda.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Annanghe unu gestu</string>
-    <string name="binding_replace_gesture">Sostitui su gestu</string>
     <string name="binding_add_key">Annanghe una tecla</string>
-    <string name="binding_replace_key">Sostitui sa tecla</string>
     <string name="key_picker_default_press_key">Incarca una tecla</string>
     <string name="binding_add_axis">Annanghe unu joystick/controllore de movimentu</string>
     <string name="axis_picker_move_joystick">Move unu joystick/controllore de movimentu</string>
diff --git a/AnkiDroid/src/main/res/values-sk/03-dialogs.xml b/AnkiDroid/src/main/res/values-sk/03-dialogs.xml
index d51bbc6ced8e..13775ea7ea11 100644
--- a/AnkiDroid/src/main/res/values-sk/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sk/03-dialogs.xml
@@ -57,14 +57,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Žiaden TTS jazyk nie je k dispozícii</string>
     <string name="tts_no_tts">Nehovoriť</string>
-    <string name="reposition_card_dialog_title">Premiestniť novú kartičku</string>
     <string name="reposition_card_not_new_error">Len pri nových kartách je možné zmeniť pozíciu (premiestniť)</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d premiestnená kartička</item>
-        <item quantity="few">%d premiestnené kartičky</item>
-        <item quantity="many">%d premiestnených kartičiek</item>
-        <item quantity="other">%d premiestnených kartičiek</item>
-    </plurals>
     <string name="reset_card_dialog_title">Vynulovať zaznamenaný priebeh v učení kartičky</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d resetovaná kartička</item>
diff --git a/AnkiDroid/src/main/res/values-sk/10-preferences.xml b/AnkiDroid/src/main/res/values-sk/10-preferences.xml
index 1a130d82421a..d56e290f5483 100644
--- a/AnkiDroid/src/main/res/values-sk/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sk/10-preferences.xml
@@ -266,9 +266,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Pridať gesto</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Pridať kláves</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Stlačte kláves</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-sl/03-dialogs.xml b/AnkiDroid/src/main/res/values-sl/03-dialogs.xml
index 7521d91d69ec..99d4f98e7b5c 100644
--- a/AnkiDroid/src/main/res/values-sl/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sl/03-dialogs.xml
@@ -57,14 +57,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Noben jezik pretvorbe besedila v govor ni na voljo</string>
     <string name="tts_no_tts">Bodite tiho</string>
-    <string name="reposition_card_dialog_title">Prestavi novo kartico</string>
     <string name="reposition_card_not_new_error">Prerazporedite lahko samo nove kartice.</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d card repositioned</item>
-        <item quantity="two">%d cards repositioned</item>
-        <item quantity="few">%d cards repositioned</item>
-        <item quantity="other">%d cards repositioned</item>
-    </plurals>
     <string name="reset_card_dialog_title">Ponastavi napredek kartice</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d card reset</item>
diff --git a/AnkiDroid/src/main/res/values-sl/10-preferences.xml b/AnkiDroid/src/main/res/values-sl/10-preferences.xml
index 36e124fe6764..b089598c87cc 100644
--- a/AnkiDroid/src/main/res/values-sl/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sl/10-preferences.xml
@@ -266,9 +266,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-sq/03-dialogs.xml b/AnkiDroid/src/main/res/values-sq/03-dialogs.xml
index 278dde3d432d..2da1db3d7508 100644
--- a/AnkiDroid/src/main/res/values-sq/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sq/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Nuk ka gjuhë tekst-në-fjalë të disponueshme</string>
     <string name="tts_no_tts">mos fol</string>
-    <string name="reposition_card_dialog_title">Rivendosni kartën e re</string>
     <string name="reposition_card_not_new_error">Vetëm kartat e reja mund të ripozicionohen</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d kartë u ripozicionua</item>
-        <item quantity="other">%d karta u ripozicionuan</item>
-    </plurals>
     <string name="reset_card_dialog_title">Rivendos progresin e kartës</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">Rivendosja e %d kartës</item>
diff --git a/AnkiDroid/src/main/res/values-sq/10-preferences.xml b/AnkiDroid/src/main/res/values-sq/10-preferences.xml
index ea74a38d8c9d..29e92629b16c 100644
--- a/AnkiDroid/src/main/res/values-sq/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sq/10-preferences.xml
@@ -262,9 +262,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-sr/03-dialogs.xml b/AnkiDroid/src/main/res/values-sr/03-dialogs.xml
index 9b37e016c3f1..97bfdfa7324d 100644
--- a/AnkiDroid/src/main/res/values-sr/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sr/03-dialogs.xml
@@ -56,13 +56,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Функција претварања текста у говор није доступна</string>
     <string name="tts_no_tts">Не изговарај</string>
-    <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d card repositioned</item>
-        <item quantity="few">%d cards repositioned</item>
-        <item quantity="other">%d cards repositioned</item>
-    </plurals>
     <string name="reset_card_dialog_title">Ресетовање прогреса учења карте</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d card reset</item>
diff --git a/AnkiDroid/src/main/res/values-sr/10-preferences.xml b/AnkiDroid/src/main/res/values-sr/10-preferences.xml
index e430fd071d38..b9f2d6d8701e 100644
--- a/AnkiDroid/src/main/res/values-sr/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sr/10-preferences.xml
@@ -264,9 +264,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-ss/03-dialogs.xml b/AnkiDroid/src/main/res/values-ss/03-dialogs.xml
index d156c86298d1..a90006f09ce1 100644
--- a/AnkiDroid/src/main/res/values-ss/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ss/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d card repositioned</item>
-        <item quantity="other">%d cards repositioned</item>
-    </plurals>
     <string name="reset_card_dialog_title">Reset card progress</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d card reset</item>
diff --git a/AnkiDroid/src/main/res/values-ss/10-preferences.xml b/AnkiDroid/src/main/res/values-ss/10-preferences.xml
index ea74a38d8c9d..29e92629b16c 100644
--- a/AnkiDroid/src/main/res/values-ss/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ss/10-preferences.xml
@@ -262,9 +262,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-sv/03-dialogs.xml b/AnkiDroid/src/main/res/values-sv/03-dialogs.xml
index 07e243b3eade..676904a232bc 100644
--- a/AnkiDroid/src/main/res/values-sv/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sv/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Ta bort filtrerad kortlek %s och skicka alla kort tillbaks till deras ursprungliga kortlek?</string>
     <string name="no_tts_available_message">Det finns inget språk för text-till-tal</string>
     <string name="tts_no_tts">Tala inte</string>
-    <string name="reposition_card_dialog_title">Ompositionera nytt kort</string>
     <string name="reposition_card_not_new_error">Endast nya kort kan ompositioneras</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d kort ompositionerat</item>
-        <item quantity="other">%d kort ompositionerade</item>
-    </plurals>
     <string name="reset_card_dialog_title">Återställ kortets framsteg</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d kort återställt</item>
diff --git a/AnkiDroid/src/main/res/values-sv/10-preferences.xml b/AnkiDroid/src/main/res/values-sv/10-preferences.xml
index a7fcfe5f041d..2a88f7e65575 100644
--- a/AnkiDroid/src/main/res/values-sv/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sv/10-preferences.xml
@@ -261,9 +261,7 @@
     <string name="donate_description"><![CDATA[Du kan stödja AnkiDroids utveckling genom att <a href=\"%1$s\">donera</a>. Alla donationer uppskattas enormt!]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Lägg till gest</string>
-    <string name="binding_replace_gesture">Ersätt gest</string>
     <string name="binding_add_key">Lägg till knapp</string>
-    <string name="binding_replace_key">Ersätt knapp</string>
     <string name="key_picker_default_press_key">Tryck på en knapp</string>
     <string name="binding_add_axis">Lägg till joystick/rörelsekänslig handkontroll</string>
     <string name="axis_picker_move_joystick">Manövrera en joystick/rörelsekänslig handkontroll</string>
diff --git a/AnkiDroid/src/main/res/values-sw/03-dialogs.xml b/AnkiDroid/src/main/res/values-sw/03-dialogs.xml
index d156c86298d1..a90006f09ce1 100644
--- a/AnkiDroid/src/main/res/values-sw/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sw/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d card repositioned</item>
-        <item quantity="other">%d cards repositioned</item>
-    </plurals>
     <string name="reset_card_dialog_title">Reset card progress</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d card reset</item>
diff --git a/AnkiDroid/src/main/res/values-sw/10-preferences.xml b/AnkiDroid/src/main/res/values-sw/10-preferences.xml
index ea74a38d8c9d..29e92629b16c 100644
--- a/AnkiDroid/src/main/res/values-sw/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sw/10-preferences.xml
@@ -262,9 +262,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-ta/03-dialogs.xml b/AnkiDroid/src/main/res/values-ta/03-dialogs.xml
index 1c31150d8f24..0a6bcb030f2d 100644
--- a/AnkiDroid/src/main/res/values-ta/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ta/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">வடிகட்டப்பட்ட டெக்கை %sஐ நீக்கி, எல்லா கார்டுகளையும் அவற்றின் அசல் டெக்குகளுக்கு அனுப்பவா?</string>
     <string name="no_tts_available_message">உரையிலிருந்து பேச்சு மொழி இல்லை</string>
     <string name="tts_no_tts">பேசாதே</string>
-    <string name="reposition_card_dialog_title">புதிய அட்டையை மாற்றவும்</string>
     <string name="reposition_card_not_new_error">புதிய அட்டைகளை மட்டுமே இடமாற்றம் செய்ய முடியும்</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d கார்டு மாற்றப்பட்டது</item>
-        <item quantity="other">%d கார்டுகள் இடமாற்றம் செய்யப்பட்டன</item>
-    </plurals>
     <string name="reset_card_dialog_title">அட்டையின் முன்னேற்றத்தை மீட்டமைக்கவும்</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d அட்டை மீட்டமைப்பு</item>
diff --git a/AnkiDroid/src/main/res/values-ta/10-preferences.xml b/AnkiDroid/src/main/res/values-ta/10-preferences.xml
index 7add29ec4ef0..4bd7db5c43d9 100644
--- a/AnkiDroid/src/main/res/values-ta/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ta/10-preferences.xml
@@ -261,9 +261,7 @@
     <string name="donate_description"><![CDATA[நீங்கள் <a href=\"%1$s\">நன்கொடை அளிப்பதன் மூலம்</a> AnkiDroid இன் வளர்ச்சியை ஆதரிக்கலாம். எந்தத் தொகையும் ஆழமாகப் பாராட்டப்படுகிறது.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">சைகையைச் சேர்க்கவும்</string>
-    <string name="binding_replace_gesture">சைகையை மாற்றவும்</string>
     <string name="binding_add_key">விசையைச் சேர்க்கவும்</string>
-    <string name="binding_replace_key">விசையை மாற்றவும்</string>
     <string name="key_picker_default_press_key">ஒரு விசையை அழுத்தவும்</string>
     <string name="binding_add_axis">கடைசி ஒத்திசைவு 10 க்கும் அதிகமாக இருந்தால், தொடக்க/வெளியேறும்போது பயன்பாடு தானாகவே ஒத்திசைக்கப்படும்</string>
     <string name="axis_picker_move_joystick">கடைசி ஒத்திசைவு 10 க்கும் அதிகமாக இருந்தால், தொடக்க/வெளியேறும்போது பயன்பாடு தானாகவே ஒத்திசைக்கப்படும்</string>
diff --git a/AnkiDroid/src/main/res/values-te/03-dialogs.xml b/AnkiDroid/src/main/res/values-te/03-dialogs.xml
index 576d855c592e..884a82b12b2d 100644
--- a/AnkiDroid/src/main/res/values-te/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-te/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">ఫిల్టర్ చేసిన డెక్ %sని తొలగించి, అన్ని కార్డ్‌లను వాటి అసలు డెక్‌లకు తిరిగి పంపాలా?</string>
     <string name="no_tts_available_message">టెక్స్ట్-టు-స్పీచ్ లాంగ్వేజ్ అందుబాటులో లేదు</string>
     <string name="tts_no_tts">మాట్లాడకండి</string>
-    <string name="reposition_card_dialog_title">కొత్త కార్డును భర్తీ చేయండి</string>
     <string name="reposition_card_not_new_error">కొత్త కార్డ్‌లను మాత్రమే రీపోజిషన్ చేయవచ్చు</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d కార్డ్ రీపోజిషన్ చేయబడింది</item>
-        <item quantity="other">%d కార్డ్‌లు రీపోజిషన్ చేయబడ్డాయి</item>
-    </plurals>
     <string name="reset_card_dialog_title">కార్డ్ పురోగతిని రీసెట్ చేయండి</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d కార్డ్ రీసెట్</item>
diff --git a/AnkiDroid/src/main/res/values-te/10-preferences.xml b/AnkiDroid/src/main/res/values-te/10-preferences.xml
index 3aebbf1dd2ad..f7185c45f585 100644
--- a/AnkiDroid/src/main/res/values-te/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-te/10-preferences.xml
@@ -260,9 +260,7 @@
     <string name="donate_description"><![CDATA[మీరు <a href=\"%1$s\">దానం చేయడం</a> ద్వారా AnkiDroid అభివృద్ధికి మద్దతు ఇవ్వవచ్చు. ఏదైనా మొత్తం లోతుగా ప్రశంసించబడుతుంది.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">సంజ్ఞను జోడించండి</string>
-    <string name="binding_replace_gesture">సంజ్ఞను భర్తీ చేయండి</string>
     <string name="binding_add_key">ఒక కీని జోడించండి</string>
-    <string name="binding_replace_key">కీని భర్తీ చేయండి</string>
     <string name="key_picker_default_press_key">ఒక కీని నొక్కండి</string>
     <string name="binding_add_axis">జాయ్‌స్టిక్/మోషన్ కంట్రోలర్‌ను జోడించండి</string>
     <string name="axis_picker_move_joystick">జాయ్‌స్టిక్/మోషన్ కంట్రోలర్‌ను తరలించండి</string>
diff --git a/AnkiDroid/src/main/res/values-tg/03-dialogs.xml b/AnkiDroid/src/main/res/values-tg/03-dialogs.xml
index 395014fd7a15..954422112bc9 100644
--- a/AnkiDroid/src/main/res/values-tg/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-tg/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d card repositioned</item>
-        <item quantity="other">%d cards repositioned</item>
-    </plurals>
     <string name="reset_card_dialog_title">Reset card progress</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d card reset</item>
diff --git a/AnkiDroid/src/main/res/values-tg/10-preferences.xml b/AnkiDroid/src/main/res/values-tg/10-preferences.xml
index ea74a38d8c9d..29e92629b16c 100644
--- a/AnkiDroid/src/main/res/values-tg/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-tg/10-preferences.xml
@@ -262,9 +262,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-tgl/03-dialogs.xml b/AnkiDroid/src/main/res/values-tgl/03-dialogs.xml
index eb34ddd44aca..f63aa6b35468 100644
--- a/AnkiDroid/src/main/res/values-tgl/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-tgl/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Walang available na wika sa teksto-sa-salita</string>
     <string name="tts_no_tts">Huwag kang magsalita</string>
-    <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d card repositioned</item>
-        <item quantity="other">%d cards repositioned</item>
-    </plurals>
     <string name="reset_card_dialog_title">I-reset ang progreso ng baraha</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d card reset</item>
diff --git a/AnkiDroid/src/main/res/values-tgl/10-preferences.xml b/AnkiDroid/src/main/res/values-tgl/10-preferences.xml
index 1b5bf2e4091d..0029c1b69a36 100644
--- a/AnkiDroid/src/main/res/values-tgl/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-tgl/10-preferences.xml
@@ -262,9 +262,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-th/03-dialogs.xml b/AnkiDroid/src/main/res/values-th/03-dialogs.xml
index ecb2c3a28ce2..4c4d14477486 100644
--- a/AnkiDroid/src/main/res/values-th/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-th/03-dialogs.xml
@@ -54,11 +54,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="other">%d cards repositioned</item>
-    </plurals>
     <string name="reset_card_dialog_title">Reset card progress</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="other">%d cards reset</item>
diff --git a/AnkiDroid/src/main/res/values-th/10-preferences.xml b/AnkiDroid/src/main/res/values-th/10-preferences.xml
index 0ae3b7c013c5..28ba47737894 100644
--- a/AnkiDroid/src/main/res/values-th/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-th/10-preferences.xml
@@ -260,9 +260,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-ti/03-dialogs.xml b/AnkiDroid/src/main/res/values-ti/03-dialogs.xml
index d156c86298d1..a90006f09ce1 100644
--- a/AnkiDroid/src/main/res/values-ti/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ti/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d card repositioned</item>
-        <item quantity="other">%d cards repositioned</item>
-    </plurals>
     <string name="reset_card_dialog_title">Reset card progress</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d card reset</item>
diff --git a/AnkiDroid/src/main/res/values-ti/10-preferences.xml b/AnkiDroid/src/main/res/values-ti/10-preferences.xml
index ea74a38d8c9d..29e92629b16c 100644
--- a/AnkiDroid/src/main/res/values-ti/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ti/10-preferences.xml
@@ -262,9 +262,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-tn/03-dialogs.xml b/AnkiDroid/src/main/res/values-tn/03-dialogs.xml
index d156c86298d1..a90006f09ce1 100644
--- a/AnkiDroid/src/main/res/values-tn/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-tn/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d card repositioned</item>
-        <item quantity="other">%d cards repositioned</item>
-    </plurals>
     <string name="reset_card_dialog_title">Reset card progress</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d card reset</item>
diff --git a/AnkiDroid/src/main/res/values-tn/10-preferences.xml b/AnkiDroid/src/main/res/values-tn/10-preferences.xml
index ea74a38d8c9d..29e92629b16c 100644
--- a/AnkiDroid/src/main/res/values-tn/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-tn/10-preferences.xml
@@ -262,9 +262,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-tr/03-dialogs.xml b/AnkiDroid/src/main/res/values-tr/03-dialogs.xml
index 82a58537911e..7d60af4b2ac1 100644
--- a/AnkiDroid/src/main/res/values-tr/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-tr/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">%s filtreli destesi silinip bütün kartlar orjinal destelerine gönderilsin mi?</string>
     <string name="no_tts_available_message">Mevcut metin okuma dili yok</string>
     <string name="tts_no_tts">Konuşma</string>
-    <string name="reposition_card_dialog_title">Yeni kartın yerini değiştir</string>
     <string name="reposition_card_not_new_error">Yalnızca yeni kartların yeri değiştirilebilir</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d kartın yeri değiştirildi</item>
-        <item quantity="other">%d kartın yeri değiştirildi</item>
-    </plurals>
     <string name="reset_card_dialog_title">Kart ilerlemesini sıfırla</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d kart sıfırlandı</item>
diff --git a/AnkiDroid/src/main/res/values-tr/10-preferences.xml b/AnkiDroid/src/main/res/values-tr/10-preferences.xml
index ab5b7816e919..581abb33335e 100644
--- a/AnkiDroid/src/main/res/values-tr/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-tr/10-preferences.xml
@@ -261,9 +261,7 @@
     <string name="donate_description"><![CDATA[AnkiDroid\'in geliştirilmesine <a href=\"%1$s\">bağış yaparak</a> destek olabilirsiniz. Miktarı ne olursa olsun içten teşekkürlerimizi kazanırsınız.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Hareket ekle</string>
-    <string name="binding_replace_gesture">El hareketini değiştir</string>
     <string name="binding_add_key">Anahtar ekle</string>
-    <string name="binding_replace_key">Tuşu değiştir</string>
     <string name="key_picker_default_press_key">Bir tuşa basın</string>
     <string name="binding_add_axis">Joystick/hareket kumandası ekle</string>
     <string name="axis_picker_move_joystick">Bir joystick/hareket kumandasını hareket ettir</string>
diff --git a/AnkiDroid/src/main/res/values-ts/03-dialogs.xml b/AnkiDroid/src/main/res/values-ts/03-dialogs.xml
index d156c86298d1..a90006f09ce1 100644
--- a/AnkiDroid/src/main/res/values-ts/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ts/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d card repositioned</item>
-        <item quantity="other">%d cards repositioned</item>
-    </plurals>
     <string name="reset_card_dialog_title">Reset card progress</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d card reset</item>
diff --git a/AnkiDroid/src/main/res/values-ts/10-preferences.xml b/AnkiDroid/src/main/res/values-ts/10-preferences.xml
index ea74a38d8c9d..29e92629b16c 100644
--- a/AnkiDroid/src/main/res/values-ts/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ts/10-preferences.xml
@@ -262,9 +262,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-tt/03-dialogs.xml b/AnkiDroid/src/main/res/values-tt/03-dialogs.xml
index c2a26a0dd82a..e528468d6b38 100644
--- a/AnkiDroid/src/main/res/values-tt/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-tt/03-dialogs.xml
@@ -54,11 +54,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="other">%d cards repositioned</item>
-    </plurals>
     <string name="reset_card_dialog_title">Прогрессны бетерү</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="other">%d кәрт ясалган</item>
diff --git a/AnkiDroid/src/main/res/values-tt/10-preferences.xml b/AnkiDroid/src/main/res/values-tt/10-preferences.xml
index 70b7efb5fb43..47ef5504b5b8 100644
--- a/AnkiDroid/src/main/res/values-tt/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-tt/10-preferences.xml
@@ -260,9 +260,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Ачкыч өстәү</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-ug/03-dialogs.xml b/AnkiDroid/src/main/res/values-ug/03-dialogs.xml
index f160f85e607c..4870473eab98 100644
--- a/AnkiDroid/src/main/res/values-ug/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ug/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">سۈزۈلگەن دەستە %s نى ئۆچۈرۈپ، ھەممە كارتىنى ئەسلىدىكى دەستىگە قايتۇرامدۇ؟</string>
     <string name="no_tts_available_message">بۇ تىلدا ئىشلەتكىلى بولىدىغان تېكىستتىن ئاۋازغا موتورى يوق</string>
     <string name="tts_no_tts">سۆزلىمە</string>
-    <string name="reposition_card_dialog_title">يېڭى كارتىنى قايتا تەرتىپلە</string>
     <string name="reposition_card_not_new_error">پەقەت يېڭى كارتىنىڭ ئورنىنىلا يۆتكىگىلى بولىدۇ</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d كارتىنىڭ ئورنى يۆتكەلدى</item>
-        <item quantity="other">%d كارتىنىڭ ئورنى يۆتكەلدى</item>
-    </plurals>
     <string name="reset_card_dialog_title">كارتا ئىلگىرىلەش جەريانىنى ئەسلىگە قايتۇر</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d كارتا ئەسلىگە قايتۇرۇلدى</item>
diff --git a/AnkiDroid/src/main/res/values-ug/10-preferences.xml b/AnkiDroid/src/main/res/values-ug/10-preferences.xml
index a44bf7c07923..76799524b357 100644
--- a/AnkiDroid/src/main/res/values-ug/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ug/10-preferences.xml
@@ -262,9 +262,7 @@
     <string name="donate_description"><![CDATA[سىز AnkiDroid ئىجادىيىتىگە <a href=\"%1$s\">ئىئانە</a> قىلىش ئارقىلىق قوللىيالايسىز. ھەر قانداق مىقداردىكى ئىئانە چوڭقۇر ئالقىشلىنىدۇ.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">قول ئىشارەت قوش</string>
-    <string name="binding_replace_gesture">قول ئىشارەتنى ئالماشتۇر</string>
     <string name="binding_add_key">توپچە قوش</string>
-    <string name="binding_replace_key">توپچە ئالماشتۇر</string>
     <string name="key_picker_default_press_key">توپچە باس</string>
     <string name="binding_add_axis">ئويۇن تىزگىنىكى/ھەرىكەت تىزگىنلىگۈچ قوشىدۇ</string>
     <string name="axis_picker_move_joystick">ئويۇن تىزگىنىكى/ھەرىكەت تىزگىنلىگۈچ يۆتكەيدۇ</string>
diff --git a/AnkiDroid/src/main/res/values-uk/03-dialogs.xml b/AnkiDroid/src/main/res/values-uk/03-dialogs.xml
index 7f872318bebb..806200a82e72 100644
--- a/AnkiDroid/src/main/res/values-uk/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-uk/03-dialogs.xml
@@ -57,14 +57,7 @@
     <string name="delete_cram_deck_message">Видалити фільтровану колоду %s і повернути всі картки до оригінальних колод?</string>
     <string name="no_tts_available_message">Відсутня мова для перетворення тексту в мовлення</string>
     <string name="tts_no_tts">Не говорити</string>
-    <string name="reposition_card_dialog_title">Перемістити нову картку</string>
     <string name="reposition_card_not_new_error">Можна перемістити тільки нові картки</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d картку переміщено</item>
-        <item quantity="few">%d картки переміщено</item>
-        <item quantity="many">%d карток переміщено</item>
-        <item quantity="other">%d карток переміщено</item>
-    </plurals>
     <string name="reset_card_dialog_title">Скинути прогрес картки</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d картку скинуто</item>
diff --git a/AnkiDroid/src/main/res/values-uk/10-preferences.xml b/AnkiDroid/src/main/res/values-uk/10-preferences.xml
index 1b40a9762b94..7f154a8bbbfb 100644
--- a/AnkiDroid/src/main/res/values-uk/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-uk/10-preferences.xml
@@ -266,9 +266,7 @@
     <string name="donate_description"><![CDATA[Ви можете підтримати розробку AnkiDroid <a href=\"%1$s\">внеском</a>. Будь-яка сума глибоко цінується.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Додати жест</string>
-    <string name="binding_replace_gesture">Замінити жест</string>
     <string name="binding_add_key">Додати клавішу</string>
-    <string name="binding_replace_key">Замінити клавішу</string>
     <string name="key_picker_default_press_key">Натисніть клавішу</string>
     <string name="binding_add_axis">Додати джойстик/контролер руху</string>
     <string name="axis_picker_move_joystick">Рухайте джойстиком/контролером руху</string>
diff --git a/AnkiDroid/src/main/res/values-ur/03-dialogs.xml b/AnkiDroid/src/main/res/values-ur/03-dialogs.xml
index e770abefa4b9..ae062e68e385 100644
--- a/AnkiDroid/src/main/res/values-ur/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ur/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">فلٹر شدہ ڈیک %s کو حذف کریں اور تمام کارڈز کو ان کے اصل ڈیک پر واپس بھیجیں؟</string>
     <string name="no_tts_available_message">متن سے تقریر کی کوئی زبان دستیاب نہیں ہے۔</string>
     <string name="tts_no_tts">مت بولو</string>
-    <string name="reposition_card_dialog_title">نئے کارڈ کی جگہ</string>
     <string name="reposition_card_not_new_error">صرف نئے کارڈز کی جگہ تبدیل کی جا سکتی ہے۔</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d کارڈ دوبارہ ترتیب دیا گیا۔</item>
-        <item quantity="other">%d کارڈز کی جگہ بدل دی گئی۔</item>
-    </plurals>
     <string name="reset_card_dialog_title">کارڈ کی پیشرفت کو دوبارہ ترتیب دیں۔</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d کارڈ ری سیٹ</item>
diff --git a/AnkiDroid/src/main/res/values-ur/10-preferences.xml b/AnkiDroid/src/main/res/values-ur/10-preferences.xml
index 680a1cd5002c..76cd17eb7f99 100644
--- a/AnkiDroid/src/main/res/values-ur/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ur/10-preferences.xml
@@ -262,9 +262,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-uz/03-dialogs.xml b/AnkiDroid/src/main/res/values-uz/03-dialogs.xml
index d5eb04aa619a..568506b57755 100644
--- a/AnkiDroid/src/main/res/values-uz/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-uz/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d ta karta qayta joylandi</item>
-        <item quantity="other">%d ta kartalar qayta joylandi</item>
-    </plurals>
     <string name="reset_card_dialog_title">Reset card progress</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d karta restart qilindi</item>
diff --git a/AnkiDroid/src/main/res/values-uz/10-preferences.xml b/AnkiDroid/src/main/res/values-uz/10-preferences.xml
index ea74a38d8c9d..29e92629b16c 100644
--- a/AnkiDroid/src/main/res/values-uz/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-uz/10-preferences.xml
@@ -262,9 +262,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-ve/03-dialogs.xml b/AnkiDroid/src/main/res/values-ve/03-dialogs.xml
index d156c86298d1..a90006f09ce1 100644
--- a/AnkiDroid/src/main/res/values-ve/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ve/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d card repositioned</item>
-        <item quantity="other">%d cards repositioned</item>
-    </plurals>
     <string name="reset_card_dialog_title">Reset card progress</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d card reset</item>
diff --git a/AnkiDroid/src/main/res/values-ve/10-preferences.xml b/AnkiDroid/src/main/res/values-ve/10-preferences.xml
index ea74a38d8c9d..29e92629b16c 100644
--- a/AnkiDroid/src/main/res/values-ve/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ve/10-preferences.xml
@@ -262,9 +262,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-vi/03-dialogs.xml b/AnkiDroid/src/main/res/values-vi/03-dialogs.xml
index 33a83f0beafa..10f8a11749c4 100644
--- a/AnkiDroid/src/main/res/values-vi/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-vi/03-dialogs.xml
@@ -54,11 +54,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Không có ngôn ngữ chuyển-văn-bản-thành-lời</string>
     <string name="tts_no_tts">Đừng phát âm</string>
-    <string name="reposition_card_dialog_title">Đặt lại vị trí thẻ mới</string>
     <string name="reposition_card_not_new_error">Chỉ thẻ mới có thể được định vị lại</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="other">%d thẻ được định vị lại</item>
-    </plurals>
     <string name="reset_card_dialog_title">Đặt lại tiến trình thẻ</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="other">đặt lại thẻ %d</item>
diff --git a/AnkiDroid/src/main/res/values-vi/10-preferences.xml b/AnkiDroid/src/main/res/values-vi/10-preferences.xml
index 17569a4ac286..31351f63b732 100644
--- a/AnkiDroid/src/main/res/values-vi/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-vi/10-preferences.xml
@@ -258,9 +258,7 @@
     <string name="donate_description"><![CDATA[Bạn có thể hỗ trợ sự phát triển của AnkiDroid bằng cách <a href=\"%1$s\">quyên góp</a>. Bất kỳ số tiền nào cũng được đánh giá cao.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Thay thế cử chỉ</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Thay thế khoá</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Thêm cần điều khiển/bộ điều khiển chuyển động</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-wo/03-dialogs.xml b/AnkiDroid/src/main/res/values-wo/03-dialogs.xml
index ecb2c3a28ce2..4c4d14477486 100644
--- a/AnkiDroid/src/main/res/values-wo/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-wo/03-dialogs.xml
@@ -54,11 +54,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="other">%d cards repositioned</item>
-    </plurals>
     <string name="reset_card_dialog_title">Reset card progress</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="other">%d cards reset</item>
diff --git a/AnkiDroid/src/main/res/values-wo/10-preferences.xml b/AnkiDroid/src/main/res/values-wo/10-preferences.xml
index 127160523bfc..0b680887a4dd 100644
--- a/AnkiDroid/src/main/res/values-wo/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-wo/10-preferences.xml
@@ -260,9 +260,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-xh/03-dialogs.xml b/AnkiDroid/src/main/res/values-xh/03-dialogs.xml
index d156c86298d1..a90006f09ce1 100644
--- a/AnkiDroid/src/main/res/values-xh/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-xh/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d card repositioned</item>
-        <item quantity="other">%d cards repositioned</item>
-    </plurals>
     <string name="reset_card_dialog_title">Reset card progress</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d card reset</item>
diff --git a/AnkiDroid/src/main/res/values-xh/10-preferences.xml b/AnkiDroid/src/main/res/values-xh/10-preferences.xml
index ea74a38d8c9d..29e92629b16c 100644
--- a/AnkiDroid/src/main/res/values-xh/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-xh/10-preferences.xml
@@ -262,9 +262,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-yue/03-dialogs.xml b/AnkiDroid/src/main/res/values-yue/03-dialogs.xml
index cd4f0bfd2441..75dccb971b0a 100644
--- a/AnkiDroid/src/main/res/values-yue/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-yue/03-dialogs.xml
@@ -54,11 +54,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="other">%d cards repositioned</item>
-    </plurals>
     <string name="reset_card_dialog_title">Reset card progress</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="other">%d cards reset</item>
diff --git a/AnkiDroid/src/main/res/values-yue/10-preferences.xml b/AnkiDroid/src/main/res/values-yue/10-preferences.xml
index 127160523bfc..0b680887a4dd 100644
--- a/AnkiDroid/src/main/res/values-yue/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-yue/10-preferences.xml
@@ -260,9 +260,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
diff --git a/AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml b/AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml
index 96a0ed0bfb51..c67726c1bf01 100644
--- a/AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml
@@ -54,11 +54,7 @@
     <string name="delete_cram_deck_message">删除筛选过的牌组 %s 并将所有卡片发回原牌组？</string>
     <string name="no_tts_available_message">没有可用的文字转语音（TTS）语言</string>
     <string name="tts_no_tts">不要朗读</string>
-    <string name="reposition_card_dialog_title">更改新卡位置</string>
     <string name="reposition_card_not_new_error">只有新卡牌可被更改位置</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="other">%d 张卡牌已更改位置</item>
-    </plurals>
     <string name="reset_card_dialog_title">重设卡片进度</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="other">%d 张卡牌已重置</item>
diff --git a/AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml b/AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml
index 82b00eaf7b2d..c787cfd8d38d 100644
--- a/AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml
@@ -259,9 +259,7 @@
     <string name="donate_description"><![CDATA[您可以通过 <a href=\"%1$s\"> 捐赠 </a > 支持 AnkiDroid 的开发。我们感谢任何数额的捐赠。]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">添加手势</string>
-    <string name="binding_replace_gesture">替换手势</string>
     <string name="binding_add_key">添加按键</string>
-    <string name="binding_replace_key">替换按键</string>
     <string name="key_picker_default_press_key">按下按键</string>
     <string name="binding_add_axis">添加游戏杆/运动控制器</string>
     <string name="axis_picker_move_joystick">移动游戏杆/运动控制器</string>
diff --git a/AnkiDroid/src/main/res/values-zh-rTW/03-dialogs.xml b/AnkiDroid/src/main/res/values-zh-rTW/03-dialogs.xml
index c852d47ec2b2..f5c57449752b 100644
--- a/AnkiDroid/src/main/res/values-zh-rTW/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-zh-rTW/03-dialogs.xml
@@ -54,11 +54,7 @@
     <string name="delete_cram_deck_message">刪除篩選過的牌組 %s 並將所有卡片發回原牌組？</string>
     <string name="no_tts_available_message">沒有可用的朗讀語言</string>
     <string name="tts_no_tts">不要發音</string>
-    <string name="reposition_card_dialog_title">變更新卡片位置</string>
     <string name="reposition_card_not_new_error">只有新卡片可以變更位置</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="other">%d 卡片已變更位置</item>
-    </plurals>
     <string name="reset_card_dialog_title">重置卡片進度</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="other">%d 卡片已重設</item>
diff --git a/AnkiDroid/src/main/res/values-zh-rTW/10-preferences.xml b/AnkiDroid/src/main/res/values-zh-rTW/10-preferences.xml
index c7948a52a73b..f8eb7698c2d6 100644
--- a/AnkiDroid/src/main/res/values-zh-rTW/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-zh-rTW/10-preferences.xml
@@ -259,9 +259,7 @@
     <string name="donate_description"><![CDATA[您可以通過<a href=\"%1$s\">捐贈</a>支持AnkiDroid的開發。 我們感謝任何數額的捐贈。]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">新增手勢</string>
-    <string name="binding_replace_gesture">替換手勢</string>
     <string name="binding_add_key">新增按鍵</string>
-    <string name="binding_replace_key">替換按鍵</string>
     <string name="key_picker_default_press_key">按一個按鍵</string>
     <string name="binding_add_axis">新增搖桿/運動控制器</string>
     <string name="axis_picker_move_joystick">移動搖桿/運動控制器</string>
diff --git a/AnkiDroid/src/main/res/values-zu/03-dialogs.xml b/AnkiDroid/src/main/res/values-zu/03-dialogs.xml
index d156c86298d1..a90006f09ce1 100644
--- a/AnkiDroid/src/main/res/values-zu/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-zu/03-dialogs.xml
@@ -55,12 +55,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
     <string name="tts_no_tts">Don’t speak</string>
-    <string name="reposition_card_dialog_title">Reposition new card</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
-    <plurals name="reposition_card_dialog_acknowledge">
-        <item quantity="one">%d card repositioned</item>
-        <item quantity="other">%d cards repositioned</item>
-    </plurals>
     <string name="reset_card_dialog_title">Reset card progress</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d card reset</item>
diff --git a/AnkiDroid/src/main/res/values-zu/10-preferences.xml b/AnkiDroid/src/main/res/values-zu/10-preferences.xml
index ea74a38d8c9d..29e92629b16c 100644
--- a/AnkiDroid/src/main/res/values-zu/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-zu/10-preferences.xml
@@ -262,9 +262,7 @@
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Add gesture</string>
-    <string name="binding_replace_gesture">Replace gesture</string>
     <string name="binding_add_key">Add key</string>
-    <string name="binding_replace_key">Replace key</string>
     <string name="key_picker_default_press_key">Press a key</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>

From 86145585b3bb251b13ec31d14920485b13c31c46 Mon Sep 17 00:00:00 2001
From: Mike Hardy <github@mikehardy.net>
Date: Fri, 14 Feb 2025 02:59:20 +0000
Subject: [PATCH 056/200] Bumped version to 2.21alpha13

---
 AnkiDroid/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AnkiDroid/build.gradle b/AnkiDroid/build.gradle
index ea75cd815017..95757cc736f9 100644
--- a/AnkiDroid/build.gradle
+++ b/AnkiDroid/build.gradle
@@ -85,8 +85,8 @@ android {
         //
         // This ensures the correct ordering between the various types of releases (dev < alpha < beta < release) which is
         // needed for upgrades to be offered correctly.
-        versionCode=22100112
-        versionName="2.21alpha12"
+        versionCode=22100113
+        versionName="2.21alpha13"
         minSdk libs.versions.minSdk.get().toInteger()
 
         // After #13695: change .tests_emulator.yml

From a72258a5e8bcd6636a285036db925ef12c424a7f Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Fri, 14 Feb 2025 06:16:35 -0300
Subject: [PATCH 057/200] fixup: improve ControlPreference style

I forgot to push the requested changes in 17927 before it got merged
---
 .../java/com/ichi2/preferences/ControlPreference.kt    | 10 +++++-----
 AnkiDroid/src/main/res/layout/control_preference.xml   |  9 +++------
 .../main/res/layout/control_preference_list_item.xml   |  3 +--
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/preferences/ControlPreference.kt b/AnkiDroid/src/main/java/com/ichi2/preferences/ControlPreference.kt
index b3c39f9ebf37..9608f81aec4d 100644
--- a/AnkiDroid/src/main/java/com/ichi2/preferences/ControlPreference.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/preferences/ControlPreference.kt
@@ -19,7 +19,6 @@ package com.ichi2.preferences
 import android.app.Dialog
 import android.content.Context
 import android.os.Bundle
-import android.text.TextUtils
 import android.util.AttributeSet
 import android.view.View
 import android.widget.ArrayAdapter
@@ -45,6 +44,7 @@ import com.ichi2.ui.AxisPicker
 import com.ichi2.ui.KeyPicker
 import com.ichi2.utils.create
 import com.ichi2.utils.customView
+import com.ichi2.utils.dp
 import com.ichi2.utils.negativeButton
 import com.ichi2.utils.positiveButton
 import com.ichi2.utils.show
@@ -89,8 +89,8 @@ open class ControlPreference :
         binding: Binding,
         warningDisplay: WarningDisplay?,
     ): Boolean {
-        val bindingPreference = getPreferenceAssignedTo(binding)
-        if (bindingPreference == null || bindingPreference == this) return false
+        val bindingPreference = getPreferenceAssignedTo(binding) ?: return false
+        if (bindingPreference == this) return false
         val actionTitle = bindingPreference.title ?: ""
         val warning = context.getString(R.string.bindings_already_bound, actionTitle)
         if (warningDisplay != null) {
@@ -104,7 +104,7 @@ open class ControlPreference :
     var value: String?
         get() = getPersistedString(null)
         set(value) {
-            if (!TextUtils.equals(getPersistedString(null), value)) {
+            if (value != getPersistedString(null)) {
                 persistString(value)
                 notifyChanged()
             }
@@ -232,7 +232,7 @@ class ControlPreferenceDialogFragment : DialogFragment() {
         return AlertDialog.Builder(requireContext()).create {
             setTitle(preference.title)
             setIcon(preference.icon)
-            customView(view, paddingTop = 24)
+            customView(view, paddingTop = 16.dp.toPx(context))
             negativeButton(R.string.dialog_cancel)
         }
     }
diff --git a/AnkiDroid/src/main/res/layout/control_preference.xml b/AnkiDroid/src/main/res/layout/control_preference.xml
index 06c4cee8468c..86f7c12d643c 100644
--- a/AnkiDroid/src/main/res/layout/control_preference.xml
+++ b/AnkiDroid/src/main/res/layout/control_preference.xml
@@ -15,8 +15,7 @@
         android:text="@string/binding_add_gesture"
         android:gravity="center_vertical"
         android:drawableStart="@drawable/ic_touch"
-        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:paddingHorizontal="24dp"
         android:drawablePadding="16dp"
         android:background="?android:attr/selectableItemBackground"
         android:clickable="true"
@@ -31,8 +30,7 @@
         android:text="@string/binding_add_key"
         android:drawableStart="@drawable/ic_keyboard"
         android:gravity="center_vertical"
-        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:paddingHorizontal="24dp"
         android:drawablePadding="16dp"
         android:background="?android:attr/selectableItemBackground"
         android:clickable="true"
@@ -47,8 +45,7 @@
         android:text="@string/binding_add_axis"
         android:drawableStart="@drawable/ic_videogame"
         android:gravity="center_vertical"
-        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:paddingHorizontal="24dp"
         android:drawablePadding="16dp"
         android:background="?android:attr/selectableItemBackground"
         android:clickable="true"
diff --git a/AnkiDroid/src/main/res/layout/control_preference_list_item.xml b/AnkiDroid/src/main/res/layout/control_preference_list_item.xml
index 5b88f37fd7b3..00269ecc46d2 100644
--- a/AnkiDroid/src/main/res/layout/control_preference_list_item.xml
+++ b/AnkiDroid/src/main/res/layout/control_preference_list_item.xml
@@ -4,8 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:paddingHorizontal="24dp"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:textAppearance="?attr/textAppearanceBodyLarge"
     tools:text="Remove ‘\u2328 Space’"

From c6c480c0023aba20a82058cae4ed6ee4c95f6e64 Mon Sep 17 00:00:00 2001
From: Sagar <sagar.0dev@gmail.com>
Date: Sat, 15 Feb 2025 22:56:05 +0530
Subject: [PATCH 058/200] bump: update searchpreference version to 2.7.1 and
 fix#17967

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2e083f5c2872..b832eed919b3 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -102,7 +102,7 @@ okhttp = "4.12.0"
 protobufKotlinLite = "4.29.3"
 # ../AnkiDroid/robolectricDownload.gradle may need changes - read instructions in that file
 robolectric = "4.14.1"
-searchpreference = "2.6.2"
+searchpreference = "2.7.1"
 seismic = "1.0.3"
 sharedPreferencesMock = "1.2.4"
 slackKeeper = "0.16.1"

From 7b9fdab51d3d32589906630f9c6dfe5049535951 Mon Sep 17 00:00:00 2001
From: Mike Hardy <github@mikehardy.net>
Date: Thu, 13 Feb 2025 21:41:00 -0500
Subject: [PATCH 059/200] test: mark DeckPicker context menu test flaky on
 windows

See Issue #17821
---
 .../src/test/java/com/ichi2/anki/DeckPickerTest.kt     | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerTest.kt
index c3af0913186e..d45fa527eed3 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerTest.kt
@@ -21,18 +21,18 @@ import com.ichi2.anki.dialogs.utils.title
 import com.ichi2.anki.exception.UnknownDatabaseVersionException
 import com.ichi2.anki.preferences.sharedPrefs
 import com.ichi2.anki.utils.ext.dismissAllDialogFragments
-import com.ichi2.annotations.NeedsTest
 import com.ichi2.libanki.DeckId
 import com.ichi2.libanki.Storage
 import com.ichi2.libanki.utils.TimeManager
 import com.ichi2.testutils.BackendEmulatingOpenConflict
 import com.ichi2.testutils.BackupManagerTestUtilities
 import com.ichi2.testutils.DbUtils
+import com.ichi2.testutils.common.Flaky
+import com.ichi2.testutils.common.OS
 import com.ichi2.testutils.grantWritePermissions
 import com.ichi2.testutils.revokeWritePermissions
 import com.ichi2.utils.KotlinCleanup
 import com.ichi2.utils.ResourceLoader
-import org.apache.commons.exec.OS
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.containsInAnyOrder
 import org.hamcrest.Matchers.equalTo
@@ -492,6 +492,7 @@ class DeckPickerTest : RobolectricTest() {
         }
 
     @Test
+    @Flaky(OS.WINDOWS)
     fun `ContextMenu unburied cards when selecting UNBURY`() =
         runTest {
             startActivityNormallyOpenCollectionWithIntent(DeckPicker::class.java, Intent()).run {
@@ -543,11 +544,8 @@ class DeckPickerTest : RobolectricTest() {
 
     @Test
     @RunInBackground
-    @NeedsTest("fix this on Windows")
+    @Flaky(OS.WINDOWS)
     fun version16CollectionOpens() {
-        if (OS.isFamilyWindows()) {
-            assumeTrue("test is flaky on Windows", false)
-        }
         try {
             setupColV16()
             InitialActivityWithConflictTest.setupForValid(targetContext)

From a5f97d8f8b83f61d7663cb1046bbd415f7c62f72 Mon Sep 17 00:00:00 2001
From: Mike Hardy <github@mikehardy.net>
Date: Sat, 15 Feb 2025 13:10:53 -0500
Subject: [PATCH 060/200] build(deps): remove apache.commons.exec

As Brayan rightly pointed out, relying entirely on our `Flaky.OS`
companion means we no longer have any uses at all of this dep
---
 AnkiDroid/build.gradle    | 1 -
 gradle/libs.versions.toml | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/AnkiDroid/build.gradle b/AnkiDroid/build.gradle
index 95757cc736f9..1e17e14cf9ab 100644
--- a/AnkiDroid/build.gradle
+++ b/AnkiDroid/build.gradle
@@ -441,7 +441,6 @@ dependencies {
     testImplementation libs.kotlin.test.junit5
     testImplementation libs.kotlinx.coroutines.test
     testImplementation libs.mockk
-    testImplementation libs.commons.exec // obtaining the OS
     testImplementation libs.androidx.fragment.testing
     // in a JvmTest we need org.json.JSONObject to not be mocked
     testImplementation libs.json
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b832eed919b3..b8aaefb9f8cb 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -67,8 +67,6 @@ colorpicker = "1.2.0"
 commonsCollections4 = "4.4"
 # https://commons.apache.org/proper/commons-compress/changes-report.html
 commonsCompress = "1.27.1"
-# https://commons.apache.org/proper/commons-exec/changes-report.html
-commonsExec = "1.4.0"
 # https://commons.apache.org/proper/commons-io/changes-report.html
 commonsIo = "2.18.0"
 coroutines = '1.10.1'
@@ -182,7 +180,6 @@ androidx-test-runner = { module = "androidx.test:runner", version.ref = "android
 androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidxTest" }
 androidx-test-core = { module = "androidx.test:core", version.ref = "androidxTest" }
 androidx-work-testing = { module = "androidx.work:work-testing", version.ref = "androidxWork" }
-commons-exec = { module = "org.apache.commons:commons-exec", version.ref = "commonsExec" }
 hamcrest = { module = "org.hamcrest:hamcrest", version.ref = "hamcrest" }
 hamcrest-library = { module = "org.hamcrest:hamcrest-library", version.ref = "hamcrest" }
 ivanshafran-shared-preferences-mock = { module = "io.github.ivanshafran:shared-preferences-mock", version.ref = "sharedPreferencesMock" }

From bff965abf01846e209732f89f7ecd551d5485f7b Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Wed, 5 Feb 2025 20:26:25 -0300
Subject: [PATCH 061/200] refactor: inline MappableBinding.allMappings

used only once now
---
 .../java/com/ichi2/anki/reviewer/MappableBinding.kt    |  7 -------
 .../java/com/ichi2/anki/reviewer/MotionEventHandler.kt | 10 ++++++++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MappableBinding.kt b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MappableBinding.kt
index 818b8c27e8f3..7b4623dca05b 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MappableBinding.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MappableBinding.kt
@@ -92,12 +92,5 @@ open class MappableBinding(
             val value = prefs.getString(command.preferenceKey, null) ?: return command.defaultValue.toMutableList()
             return fromPreferenceString(value)
         }
-
-        @CheckResult
-        fun allMappings(prefs: SharedPreferences): MutableList<Pair<ViewerCommand, MutableList<MappableBinding>>> =
-            ViewerCommand.entries
-                .map {
-                    Pair(it, fromPreference(prefs, it))
-                }.toMutableList()
     }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MotionEventHandler.kt b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MotionEventHandler.kt
index 0b04b064a4c4..6fbf12aa52f5 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MotionEventHandler.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MotionEventHandler.kt
@@ -22,6 +22,7 @@ import com.ichi2.anki.AbstractFlashcardViewer
 import com.ichi2.anki.AnkiDroidApp
 import com.ichi2.anki.cardviewer.ViewerCommand
 import com.ichi2.anki.preferences.sharedPrefs
+import com.ichi2.anki.reviewer.MappableBinding.Companion.fromPreference
 import com.ichi2.compat.CompatHelper
 import timber.log.Timber
 
@@ -114,8 +115,13 @@ class MotionEventHandler(
 
         private fun getAxisButtonBindings(context: Context) =
             sequence {
-                for ((command, bindings) in MappableBinding.allMappings(context.sharedPrefs())) {
-                    for (binding in bindings.map { it.binding }.filterIsInstance<Binding.AxisButtonBinding>()) {
+                for ((command, bindings) in ViewerCommand.entries
+                    .map {
+                        Pair(it, fromPreference(context.sharedPrefs(), it))
+                    }) {
+                    for (binding in bindings
+                        .map { it.binding }
+                        .filterIsInstance<Binding.AxisButtonBinding>()) {
                         yield(SingleAxisDetector(command, binding))
                     }
                 }

From 7b23fcf41d72cf704fd564553d1fadc32a51262c Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Wed, 5 Feb 2025 20:45:42 -0300
Subject: [PATCH 062/200] refactor: move addBinding to tests dir

used only there
---
 .../ichi2/anki/cardviewer/ViewerCommand.kt    | 17 ++--------
 .../ichi2/anki/ReviewerKeyboardInputTest.kt   |  1 +
 .../com/ichi2/anki/ReviewerNoParamTest.kt     |  1 +
 .../UpgradeGesturesToControlsTest.kt          |  1 +
 .../com/ichi2/anki/utils/ext/ViewerCommand.kt | 33 +++++++++++++++++++
 5 files changed, 39 insertions(+), 14 deletions(-)
 create mode 100644 AnkiDroid/src/test/java/com/ichi2/anki/utils/ext/ViewerCommand.kt

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/ViewerCommand.kt b/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/ViewerCommand.kt
index 981949961f96..d9406e92042e 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/ViewerCommand.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/ViewerCommand.kt
@@ -17,6 +17,7 @@ package com.ichi2.anki.cardviewer
 
 import android.content.SharedPreferences
 import android.view.KeyEvent
+import androidx.annotation.VisibleForTesting
 import androidx.core.content.edit
 import com.ichi2.anki.reviewer.Binding.Companion.keyCode
 import com.ichi2.anki.reviewer.Binding.Companion.unicode
@@ -89,19 +90,6 @@ enum class ViewerCommand {
     val preferenceKey: String
         get() = "binding_$name"
 
-    fun addBinding(
-        preferences: SharedPreferences,
-        binding: MappableBinding,
-    ) {
-        val addAtStart: (MutableList<MappableBinding>, MappableBinding) -> Boolean = { collection, element ->
-            // reorder the elements, moving the added binding to the first position
-            collection.remove(element)
-            collection.add(0, element)
-            true
-        }
-        addBindingInternal(preferences, binding, addAtStart)
-    }
-
     fun addBindingAtEnd(
         preferences: SharedPreferences,
         binding: MappableBinding,
@@ -118,7 +106,8 @@ enum class ViewerCommand {
         addBindingInternal(preferences, binding, addAtEnd)
     }
 
-    private fun addBindingInternal(
+    @VisibleForTesting
+    fun addBindingInternal(
         preferences: SharedPreferences,
         binding: MappableBinding,
         performAdd: (MutableList<MappableBinding>, MappableBinding) -> Boolean,
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerKeyboardInputTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerKeyboardInputTest.kt
index efcfab0e6516..69b2b12d9d70 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerKeyboardInputTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerKeyboardInputTest.kt
@@ -45,6 +45,7 @@ import com.ichi2.anki.reviewer.Binding.Companion.keyCode
 import com.ichi2.anki.reviewer.Binding.ModifierKeys
 import com.ichi2.anki.reviewer.CardSide
 import com.ichi2.anki.reviewer.ReviewerBinding
+import com.ichi2.anki.utils.ext.addBinding
 import com.ichi2.libanki.Card
 import kotlinx.coroutines.Job
 import org.hamcrest.MatcherAssert.assertThat
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerNoParamTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerNoParamTest.kt
index 18bfe2817b04..e8c6ae5b6d78 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerNoParamTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerNoParamTest.kt
@@ -34,6 +34,7 @@ import com.ichi2.anki.reviewer.FullScreenMode.Companion.setPreference
 import com.ichi2.anki.reviewer.MappableBinding
 import com.ichi2.anki.reviewer.MappableBinding.Companion.toPreferenceString
 import com.ichi2.anki.reviewer.ReviewerBinding
+import com.ichi2.anki.utils.ext.addBinding
 import com.ichi2.libanki.Consts
 import com.ichi2.libanki.DeckId
 import com.ichi2.testutils.common.Flaky
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/servicemodel/UpgradeGesturesToControlsTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/servicemodel/UpgradeGesturesToControlsTest.kt
index c0143e793589..221b2f470354 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/servicemodel/UpgradeGesturesToControlsTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/servicemodel/UpgradeGesturesToControlsTest.kt
@@ -25,6 +25,7 @@ import com.ichi2.anki.reviewer.MappableBinding
 import com.ichi2.anki.reviewer.ReviewerBinding
 import com.ichi2.anki.servicelayer.PreferenceUpgradeService.PreferenceUpgrade.Companion.UPGRADE_VERSION_PREF_KEY
 import com.ichi2.anki.servicelayer.PreferenceUpgradeService.PreferenceUpgrade.UpgradeGesturesToControls
+import com.ichi2.anki.utils.ext.addBinding
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.CoreMatchers.not
 import org.hamcrest.MatcherAssert.assertThat
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/utils/ext/ViewerCommand.kt b/AnkiDroid/src/test/java/com/ichi2/anki/utils/ext/ViewerCommand.kt
new file mode 100644
index 000000000000..da74482ebd45
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/utils/ext/ViewerCommand.kt
@@ -0,0 +1,33 @@
+/*
+ *  Copyright (c) 2025 Brayan Oliveira <brayandso.dev@gmail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify it under
+ *  the terms of the GNU General Public License as published by the Free Software
+ *  Foundation; either version 3 of the License, or (at your option) any later
+ *  version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ *  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ *  PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with
+ *  this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.ichi2.anki.utils.ext
+
+import android.content.SharedPreferences
+import com.ichi2.anki.cardviewer.ViewerCommand
+import com.ichi2.anki.reviewer.MappableBinding
+
+fun ViewerCommand.addBinding(
+    preferences: SharedPreferences,
+    binding: MappableBinding,
+) {
+    val addAtStart: (MutableList<MappableBinding>, MappableBinding) -> Boolean = { collection, element ->
+        // reorder the elements, moving the added binding to the first position
+        collection.remove(element)
+        collection.add(0, element)
+        true
+    }
+    addBindingInternal(preferences, binding, addAtStart)
+}

From e52577f9b1f912918dcb8a7676b4633932d1eb06 Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Wed, 5 Feb 2025 20:46:49 -0300
Subject: [PATCH 063/200] refactor: inline addBindingAtEnd

---
 .../ichi2/anki/cardviewer/ViewerCommand.kt    | 18 ----------
 .../servicelayer/PreferenceUpgradeService.kt  | 36 ++++++++++++++++---
 2 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/ViewerCommand.kt b/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/ViewerCommand.kt
index d9406e92042e..d4dd2884cf5c 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/ViewerCommand.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/ViewerCommand.kt
@@ -17,7 +17,6 @@ package com.ichi2.anki.cardviewer
 
 import android.content.SharedPreferences
 import android.view.KeyEvent
-import androidx.annotation.VisibleForTesting
 import androidx.core.content.edit
 import com.ichi2.anki.reviewer.Binding.Companion.keyCode
 import com.ichi2.anki.reviewer.Binding.Companion.unicode
@@ -90,23 +89,6 @@ enum class ViewerCommand {
     val preferenceKey: String
         get() = "binding_$name"
 
-    fun addBindingAtEnd(
-        preferences: SharedPreferences,
-        binding: MappableBinding,
-    ) {
-        val addAtEnd: (MutableList<MappableBinding>, MappableBinding) -> Boolean = { collection, element ->
-            // do not reorder the elements
-            if (collection.contains(element)) {
-                false
-            } else {
-                collection.add(element)
-                true
-            }
-        }
-        addBindingInternal(preferences, binding, addAtEnd)
-    }
-
-    @VisibleForTesting
     fun addBindingInternal(
         preferences: SharedPreferences,
         binding: MappableBinding,
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/PreferenceUpgradeService.kt b/AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/PreferenceUpgradeService.kt
index aae5aaa9a14a..1990708947b9 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/PreferenceUpgradeService.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/PreferenceUpgradeService.kt
@@ -338,11 +338,27 @@ object PreferenceUpgradeService {
                 upgradeGestureToBinding(preferences, "gestureTapLeft", Gesture.TAP_LEFT)
                 upgradeGestureToBinding(preferences, "gestureTapCenter", Gesture.TAP_CENTER)
                 upgradeGestureToBinding(preferences, "gestureTapRight", Gesture.TAP_RIGHT)
-                upgradeGestureToBinding(preferences, "gestureTapBottomLeft", Gesture.TAP_BOTTOM_LEFT)
+                upgradeGestureToBinding(
+                    preferences,
+                    "gestureTapBottomLeft",
+                    Gesture.TAP_BOTTOM_LEFT,
+                )
                 upgradeGestureToBinding(preferences, "gestureTapBottom", Gesture.TAP_BOTTOM)
-                upgradeGestureToBinding(preferences, "gestureTapBottomRight", Gesture.TAP_BOTTOM_RIGHT)
-                upgradeVolumeGestureToBinding(preferences, "gestureVolumeUp", KeyEvent.KEYCODE_VOLUME_UP)
-                upgradeVolumeGestureToBinding(preferences, "gestureVolumeDown", KeyEvent.KEYCODE_VOLUME_DOWN)
+                upgradeGestureToBinding(
+                    preferences,
+                    "gestureTapBottomRight",
+                    Gesture.TAP_BOTTOM_RIGHT,
+                )
+                upgradeVolumeGestureToBinding(
+                    preferences,
+                    "gestureVolumeUp",
+                    KeyEvent.KEYCODE_VOLUME_UP,
+                )
+                upgradeVolumeGestureToBinding(
+                    preferences,
+                    "gestureVolumeDown",
+                    KeyEvent.KEYCODE_VOLUME_DOWN,
+                )
             }
 
             private fun upgradeVolumeGestureToBinding(
@@ -400,7 +416,17 @@ object PreferenceUpgradeService {
 
                 // add to the binding_COMMANDNAME preference
                 val mappableBinding = ReviewerBinding(binding, CardSide.BOTH)
-                command.addBindingAtEnd(preferences, mappableBinding)
+                val addAtEnd: (MutableList<MappableBinding>, MappableBinding) -> Boolean =
+                    { collection, element ->
+                        // do not reorder the elements
+                        if (collection.contains(element)) {
+                            false
+                        } else {
+                            collection.add(element)
+                            true
+                        }
+                    }
+                command.addBindingInternal(preferences, mappableBinding, addAtEnd)
             }
         }
 

From fede351a10290fb9044410454cc1f49c9c2c80af Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Wed, 5 Feb 2025 20:47:15 -0300
Subject: [PATCH 064/200] refactor: remove fromPreferenceKey

unused
---
 .../src/main/java/com/ichi2/anki/cardviewer/ViewerCommand.kt  | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/ViewerCommand.kt b/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/ViewerCommand.kt
index d4dd2884cf5c..6b71e01a203f 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/ViewerCommand.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/ViewerCommand.kt
@@ -82,10 +82,6 @@ enum class ViewerCommand {
     USER_ACTION_9,
     ;
 
-    companion object {
-        fun fromPreferenceKey(key: String) = entries.first { it.preferenceKey == key }
-    }
-
     val preferenceKey: String
         get() = "binding_$name"
 

From 70082bd09bcf19863354097d309c7bf96eb2cc74 Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Wed, 5 Feb 2025 20:49:34 -0300
Subject: [PATCH 065/200] refactor: inline addBindingInternal

---
 .../ichi2/anki/cardviewer/ViewerCommand.kt    | 15 -------------
 .../servicelayer/PreferenceUpgradeService.kt  |  6 +++++-
 .../com/ichi2/anki/utils/ext/ViewerCommand.kt | 21 ++++++++++++-------
 3 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/ViewerCommand.kt b/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/ViewerCommand.kt
index 6b71e01a203f..526bdc9164b9 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/ViewerCommand.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/ViewerCommand.kt
@@ -15,9 +15,7 @@
  */
 package com.ichi2.anki.cardviewer
 
-import android.content.SharedPreferences
 import android.view.KeyEvent
-import androidx.core.content.edit
 import com.ichi2.anki.reviewer.Binding.Companion.keyCode
 import com.ichi2.anki.reviewer.Binding.Companion.unicode
 import com.ichi2.anki.reviewer.Binding.ModifierKeys
@@ -25,8 +23,6 @@ import com.ichi2.anki.reviewer.Binding.ModifierKeys.Companion.ctrl
 import com.ichi2.anki.reviewer.Binding.ModifierKeys.Companion.shift
 import com.ichi2.anki.reviewer.CardSide
 import com.ichi2.anki.reviewer.MappableBinding
-import com.ichi2.anki.reviewer.MappableBinding.Companion.fromPreference
-import com.ichi2.anki.reviewer.MappableBinding.Companion.toPreferenceString
 import com.ichi2.anki.reviewer.ReviewerBinding
 
 /** Abstraction: Discuss moving many of these to 'Reviewer'  */
@@ -85,17 +81,6 @@ enum class ViewerCommand {
     val preferenceKey: String
         get() = "binding_$name"
 
-    fun addBindingInternal(
-        preferences: SharedPreferences,
-        binding: MappableBinding,
-        performAdd: (MutableList<MappableBinding>, MappableBinding) -> Boolean,
-    ) {
-        val bindings: MutableList<MappableBinding> = fromPreference(preferences, this)
-        performAdd(bindings, binding)
-        val newValue: String = bindings.toPreferenceString()
-        preferences.edit { putString(preferenceKey, newValue) }
-    }
-
     // If we use the serialised format, then this adds additional coupling to the properties.
     val defaultValue: List<MappableBinding>
         get() {
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/PreferenceUpgradeService.kt b/AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/PreferenceUpgradeService.kt
index 1990708947b9..21a213fb38b1 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/PreferenceUpgradeService.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/PreferenceUpgradeService.kt
@@ -49,6 +49,7 @@ import com.ichi2.anki.reviewer.Binding.Companion.keyCode
 import com.ichi2.anki.reviewer.CardSide
 import com.ichi2.anki.reviewer.FullScreenMode
 import com.ichi2.anki.reviewer.MappableBinding
+import com.ichi2.anki.reviewer.MappableBinding.Companion.fromPreference
 import com.ichi2.anki.reviewer.MappableBinding.Companion.toPreferenceString
 import com.ichi2.anki.reviewer.ReviewerBinding
 import com.ichi2.libanki.Consts
@@ -426,7 +427,10 @@ object PreferenceUpgradeService {
                             true
                         }
                     }
-                command.addBindingInternal(preferences, mappableBinding, addAtEnd)
+                val bindings: MutableList<MappableBinding> = fromPreference(preferences, command)
+                addAtEnd(bindings, mappableBinding)
+                val newValue: String = bindings.toPreferenceString()
+                preferences.edit { putString(command.preferenceKey, newValue) }
             }
         }
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/utils/ext/ViewerCommand.kt b/AnkiDroid/src/test/java/com/ichi2/anki/utils/ext/ViewerCommand.kt
index da74482ebd45..6bb72e9c7bdd 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/utils/ext/ViewerCommand.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/utils/ext/ViewerCommand.kt
@@ -16,18 +16,25 @@
 package com.ichi2.anki.utils.ext
 
 import android.content.SharedPreferences
+import androidx.core.content.edit
 import com.ichi2.anki.cardviewer.ViewerCommand
 import com.ichi2.anki.reviewer.MappableBinding
+import com.ichi2.anki.reviewer.MappableBinding.Companion.fromPreference
+import com.ichi2.anki.reviewer.MappableBinding.Companion.toPreferenceString
 
 fun ViewerCommand.addBinding(
     preferences: SharedPreferences,
     binding: MappableBinding,
 ) {
-    val addAtStart: (MutableList<MappableBinding>, MappableBinding) -> Boolean = { collection, element ->
-        // reorder the elements, moving the added binding to the first position
-        collection.remove(element)
-        collection.add(0, element)
-        true
-    }
-    addBindingInternal(preferences, binding, addAtStart)
+    val addAtStart: (MutableList<MappableBinding>, MappableBinding) -> Boolean =
+        { collection, element ->
+            // reorder the elements, moving the added binding to the first position
+            collection.remove(element)
+            collection.add(0, element)
+            true
+        }
+    val bindings: MutableList<MappableBinding> = fromPreference(preferences, this)
+    addAtStart(bindings, binding)
+    val newValue: String = bindings.toPreferenceString()
+    preferences.edit { putString(preferenceKey, newValue) }
 }

From f70f20ce7d53e7fd70b792541103d839112f68b7 Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Fri, 7 Feb 2025 06:11:37 -0300
Subject: [PATCH 066/200] refactor: extract version prefix constant

---
 .../src/main/java/com/ichi2/anki/reviewer/MappableBinding.kt   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MappableBinding.kt b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MappableBinding.kt
index 7b4623dca05b..ba193b40ead3 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MappableBinding.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MappableBinding.kt
@@ -43,12 +43,13 @@ open class MappableBinding(
 
     companion object {
         const val PREF_SEPARATOR = '|'
+        private const val VERSION_PREFIX = "1/"
 
         @CheckResult
         fun List<MappableBinding>.toPreferenceString(): String =
             this
                 .mapNotNull { it.toPreferenceString() }
-                .joinToString(prefix = "1/", separator = PREF_SEPARATOR.toString())
+                .joinToString(prefix = VERSION_PREFIX, separator = PREF_SEPARATOR.toString())
 
         @CheckResult
         private fun fromString(s: String): MappableBinding? {

From b826b5417e2305a4516ff6737a58cc6e5d8b4278 Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Fri, 7 Feb 2025 06:18:15 -0300
Subject: [PATCH 067/200] refactor: extract method in MappableBinding

to be reused later
---
 .../ichi2/anki/reviewer/MappableBinding.kt    | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MappableBinding.kt b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MappableBinding.kt
index ba193b40ead3..176e7fef4ea1 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MappableBinding.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MappableBinding.kt
@@ -68,21 +68,24 @@ open class MappableBinding(
             }
         }
 
+        /**
+         * @param string preference value containing mapped bindings
+         * @return a list with each individual binding substring
+         */
+        @CheckResult
+        fun getPreferenceSubstrings(string: String): List<String> {
+            if (string.isEmpty()) return emptyList()
+            if (!string.startsWith(VERSION_PREFIX)) {
+                Timber.w("cannot handle version of string %s", string)
+                return emptyList()
+            }
+            return string.substring(VERSION_PREFIX.length).split(PREF_SEPARATOR).filter { it.isNotEmpty() }
+        }
+
         @CheckResult
         fun fromPreferenceString(string: String?): MutableList<MappableBinding> {
             if (string.isNullOrEmpty()) return ArrayList()
-            try {
-                val version = string.takeWhile { x -> x != '/' }
-                val remainder = string.substring(version.length + 1) // skip the /
-                if (version != "1") {
-                    Timber.w("cannot handle version '$version'")
-                    return ArrayList()
-                }
-                return remainder.split(PREF_SEPARATOR).mapNotNull { fromString(it) }.toMutableList()
-            } catch (e: Exception) {
-                Timber.w(e, "Failed to deserialize preference")
-                return ArrayList()
-            }
+            return getPreferenceSubstrings(string).mapNotNull { fromString(it) }.toMutableList()
         }
 
         @CheckResult

From 5ffb0dc389e819afea0dd548661c20865e4b031c Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Fri, 14 Feb 2025 06:16:35 -0300
Subject: [PATCH 068/200] refactor: split fromPreferenceString

If you want a ReviewerBinding, use its method, and if you want a MappableBinding use its method
---
 .../ichi2/anki/reviewer/MappableBinding.kt    | 28 +++++------------
 .../ichi2/anki/reviewer/ReviewerBinding.kt    | 31 +++++++++++++------
 .../servicelayer/PreferenceUpgradeService.kt  |  4 +--
 .../preferences/ReviewerControlPreference.kt  |  5 ++-
 .../com/ichi2/anki/ReviewerNoParamTest.kt     |  3 +-
 .../com/ichi2/ui/BindingPreferenceTest.kt     |  2 +-
 6 files changed, 34 insertions(+), 39 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MappableBinding.kt b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MappableBinding.kt
index 176e7fef4ea1..ed0734580f2f 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MappableBinding.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MappableBinding.kt
@@ -51,23 +51,6 @@ open class MappableBinding(
                 .mapNotNull { it.toPreferenceString() }
                 .joinToString(prefix = VERSION_PREFIX, separator = PREF_SEPARATOR.toString())
 
-        @CheckResult
-        private fun fromString(s: String): MappableBinding? {
-            if (s.isEmpty()) {
-                return null
-            }
-            return try {
-                // the prefix of the serialized
-                when (s[0]) {
-                    ReviewerBinding.PREFIX -> ReviewerBinding.fromString(s.substring(1))
-                    else -> null
-                }
-            } catch (e: Exception) {
-                Timber.w(e, "failed to deserialize binding")
-                null
-            }
-        }
-
         /**
          * @param string preference value containing mapped bindings
          * @return a list with each individual binding substring
@@ -83,9 +66,12 @@ open class MappableBinding(
         }
 
         @CheckResult
-        fun fromPreferenceString(string: String?): MutableList<MappableBinding> {
-            if (string.isNullOrEmpty()) return ArrayList()
-            return getPreferenceSubstrings(string).mapNotNull { fromString(it) }.toMutableList()
+        fun fromPreferenceString(string: String?): List<MappableBinding> {
+            if (string.isNullOrEmpty()) return emptyList()
+            return getPreferenceSubstrings(string).map {
+                val binding = Binding.fromString(it)
+                MappableBinding(binding)
+            }
         }
 
         @CheckResult
@@ -94,7 +80,7 @@ open class MappableBinding(
             command: ViewerCommand,
         ): MutableList<MappableBinding> {
             val value = prefs.getString(command.preferenceKey, null) ?: return command.defaultValue.toMutableList()
-            return fromPreferenceString(value)
+            return ReviewerBinding.fromPreferenceString(value).toMutableList()
         }
     }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/ReviewerBinding.kt b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/ReviewerBinding.kt
index 5add073f4bc3..eea1c30a1a1e 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/ReviewerBinding.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/ReviewerBinding.kt
@@ -72,16 +72,27 @@ class ReviewerBinding(
         private const val ANSWER_SUFFIX = '1'
         private const val QUESTION_AND_ANSWER_SUFFIX = '2'
 
-        fun fromString(s: String): MappableBinding {
-            val binding = s.substring(0, s.length - 1)
-            val b = Binding.fromString(binding)
-            val side =
-                when (s[s.length - 1]) {
-                    QUESTION_SUFFIX -> CardSide.QUESTION
-                    ANSWER_SUFFIX -> CardSide.ANSWER
-                    else -> CardSide.BOTH
-                }
-            return ReviewerBinding(b, side)
+        fun fromPreferenceString(prefString: String?): List<ReviewerBinding> {
+            if (prefString.isNullOrEmpty()) return emptyList()
+
+            fun fromString(string: String): ReviewerBinding? {
+                if (string.isEmpty()) return null
+                val bindingString =
+                    StringBuilder(string)
+                        .substring(0, string.length - 1)
+                        .removePrefix(PREFIX.toString())
+                val binding = Binding.fromString(bindingString)
+                val side =
+                    when (string.last()) {
+                        QUESTION_SUFFIX -> CardSide.QUESTION
+                        ANSWER_SUFFIX -> CardSide.ANSWER
+                        else -> CardSide.BOTH
+                    }
+                return ReviewerBinding(binding, side)
+            }
+
+            val strings = getPreferenceSubstrings(prefString)
+            return strings.mapNotNull { fromString(it) }
         }
 
         @CheckResult
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/PreferenceUpgradeService.kt b/AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/PreferenceUpgradeService.kt
index 21a213fb38b1..12ce57515b69 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/PreferenceUpgradeService.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/PreferenceUpgradeService.kt
@@ -527,8 +527,8 @@ object PreferenceUpgradeService {
                 val destinyPrefValue = preferences.getString(destinyPrefKey, null)
 
                 val joinedBindings =
-                    MappableBinding.fromPreferenceString(destinyPrefValue) +
-                        MappableBinding.fromPreferenceString(sourcePrefValue)
+                    ReviewerBinding.fromPreferenceString(destinyPrefValue) +
+                        ReviewerBinding.fromPreferenceString(sourcePrefValue)
                 preferences.edit {
                     putString(destinyPrefKey, joinedBindings.toPreferenceString())
                     remove(sourcePrefKey)
diff --git a/AnkiDroid/src/main/java/com/ichi2/preferences/ReviewerControlPreference.kt b/AnkiDroid/src/main/java/com/ichi2/preferences/ReviewerControlPreference.kt
index fd1d7506cd7a..91152f3b8497 100644
--- a/AnkiDroid/src/main/java/com/ichi2/preferences/ReviewerControlPreference.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/preferences/ReviewerControlPreference.kt
@@ -21,7 +21,6 @@ import com.ichi2.anki.cardviewer.GestureProcessor
 import com.ichi2.anki.dialogs.CardSideSelectionDialog
 import com.ichi2.anki.reviewer.Binding
 import com.ichi2.anki.reviewer.CardSide
-import com.ichi2.anki.reviewer.MappableBinding
 import com.ichi2.anki.reviewer.MappableBinding.Companion.toPreferenceString
 import com.ichi2.anki.reviewer.ReviewerBinding
 
@@ -46,7 +45,7 @@ class ReviewerControlPreference : ControlPreference {
     override val areGesturesEnabled: Boolean
         get() = sharedPreferences?.getBoolean(GestureProcessor.PREF_KEY, false) ?: false
 
-    override fun getMappableBindings() = MappableBinding.fromPreferenceString(value).toList()
+    override fun getMappableBindings(): List<ReviewerBinding> = ReviewerBinding.fromPreferenceString(value).toList()
 
     override fun onKeySelected(binding: Binding) {
         CardSideSelectionDialog.displayInstance(context) { side ->
@@ -68,7 +67,7 @@ class ReviewerControlPreference : ControlPreference {
     ) {
         val newBinding = ReviewerBinding(binding, side)
         getPreferenceAssignedTo(binding)?.removeMappableBinding(newBinding)
-        val bindings = MappableBinding.fromPreferenceString(value).toMutableList()
+        val bindings = ReviewerBinding.fromPreferenceString(value).toMutableList()
         bindings.add(newBinding)
         value = bindings.toPreferenceString()
     }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerNoParamTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerNoParamTest.kt
index e8c6ae5b6d78..0fbd750cfe9e 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerNoParamTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerNoParamTest.kt
@@ -301,8 +301,7 @@ class ReviewerNoParamTest : RobolectricTest() {
             for (mappableBinding in MappableBinding.fromPreference(prefs, command)) {
                 val gestureBinding = mappableBinding.binding as? Binding.GestureInput? ?: continue
                 if (gestureBinding.gesture in gestures) {
-                    val bindings: MutableList<MappableBinding> =
-                        MappableBinding.fromPreferenceString(command.preferenceKey)
+                    val bindings = ReviewerBinding.fromPreferenceString(command.preferenceKey).toMutableList()
                     bindings.remove(mappableBinding)
                     prefs.edit {
                         putString(command.preferenceKey, bindings.toPreferenceString())
diff --git a/AnkiDroid/src/test/java/com/ichi2/ui/BindingPreferenceTest.kt b/AnkiDroid/src/test/java/com/ichi2/ui/BindingPreferenceTest.kt
index a8d1d5d35943..0cddd8f1a517 100644
--- a/AnkiDroid/src/test/java/com/ichi2/ui/BindingPreferenceTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/ui/BindingPreferenceTest.kt
@@ -33,7 +33,7 @@ class BindingPreferenceTest {
     fun serialization_deserialization_returns_same_result() {
         val str = getSampleBindings().toPreferenceString()
 
-        val again = MappableBinding.fromPreferenceString(str)
+        val again = ReviewerBinding.fromPreferenceString(str)
 
         assertEquals(str, again.toPreferenceString())
     }

From 5fee3a22ff78215bae78adc1aff58a2953a181c5 Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Fri, 7 Feb 2025 06:30:55 -0300
Subject: [PATCH 069/200] refactor: move fromPreference()

to ReviewerBinding
---
 .../com/ichi2/anki/cardviewer/GestureProcessor.kt     |  4 ++--
 .../java/com/ichi2/anki/reviewer/MappableBinding.kt   | 11 -----------
 .../com/ichi2/anki/reviewer/MotionEventHandler.kt     |  3 +--
 .../java/com/ichi2/anki/reviewer/PeripheralKeymap.kt  |  4 ++--
 .../java/com/ichi2/anki/reviewer/ReviewerBinding.kt   | 11 +++++++++++
 .../anki/servicelayer/PreferenceUpgradeService.kt     |  3 +--
 .../test/java/com/ichi2/anki/ReviewerNoParamTest.kt   |  3 +--
 .../servicemodel/UpgradeGesturesToControlsTest.kt     | 10 +++++-----
 .../java/com/ichi2/anki/utils/ext/ViewerCommand.kt    |  4 ++--
 9 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/GestureProcessor.kt b/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/GestureProcessor.kt
index 264901f63144..ce37135b41ca 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/GestureProcessor.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/GestureProcessor.kt
@@ -18,7 +18,7 @@ package com.ichi2.anki.cardviewer
 import android.content.SharedPreferences
 import com.ichi2.anki.reviewer.Binding
 import com.ichi2.anki.reviewer.GestureMapper
-import com.ichi2.anki.reviewer.MappableBinding
+import com.ichi2.anki.reviewer.ReviewerBinding
 
 class GestureProcessor(
     private val processor: ViewerCommand.CommandProcessor?,
@@ -58,7 +58,7 @@ class GestureProcessor(
 
         val associatedCommands = HashMap<Gesture, ViewerCommand>()
         for (command in ViewerCommand.entries) {
-            for (mappableBinding in MappableBinding.fromPreference(preferences, command)) {
+            for (mappableBinding in ReviewerBinding.fromPreference(preferences, command)) {
                 if (mappableBinding.binding is Binding.GestureInput) {
                     associatedCommands[mappableBinding.binding.gesture] = command
                 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MappableBinding.kt b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MappableBinding.kt
index ed0734580f2f..8250e5663eb6 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MappableBinding.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MappableBinding.kt
@@ -17,9 +17,7 @@
 package com.ichi2.anki.reviewer
 
 import android.content.Context
-import android.content.SharedPreferences
 import androidx.annotation.CheckResult
-import com.ichi2.anki.cardviewer.ViewerCommand
 import com.ichi2.anki.reviewer.Binding.KeyBinding
 import com.ichi2.utils.hash
 import timber.log.Timber
@@ -73,14 +71,5 @@ open class MappableBinding(
                 MappableBinding(binding)
             }
         }
-
-        @CheckResult
-        fun fromPreference(
-            prefs: SharedPreferences,
-            command: ViewerCommand,
-        ): MutableList<MappableBinding> {
-            val value = prefs.getString(command.preferenceKey, null) ?: return command.defaultValue.toMutableList()
-            return ReviewerBinding.fromPreferenceString(value).toMutableList()
-        }
     }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MotionEventHandler.kt b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MotionEventHandler.kt
index 6fbf12aa52f5..71d5e2844e26 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MotionEventHandler.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MotionEventHandler.kt
@@ -22,7 +22,6 @@ import com.ichi2.anki.AbstractFlashcardViewer
 import com.ichi2.anki.AnkiDroidApp
 import com.ichi2.anki.cardviewer.ViewerCommand
 import com.ichi2.anki.preferences.sharedPrefs
-import com.ichi2.anki.reviewer.MappableBinding.Companion.fromPreference
 import com.ichi2.compat.CompatHelper
 import timber.log.Timber
 
@@ -117,7 +116,7 @@ class MotionEventHandler(
             sequence {
                 for ((command, bindings) in ViewerCommand.entries
                     .map {
-                        Pair(it, fromPreference(context.sharedPrefs(), it))
+                        Pair(it, ReviewerBinding.fromPreference(context.sharedPrefs(), it))
                     }) {
                     for (binding in bindings
                         .map { it.binding }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/PeripheralKeymap.kt b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/PeripheralKeymap.kt
index 5330b06bedf0..99d5f0936d46 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/PeripheralKeymap.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/PeripheralKeymap.kt
@@ -23,7 +23,6 @@ import com.ichi2.anki.cardviewer.ViewerCommand
 import com.ichi2.anki.preferences.sharedPrefs
 import com.ichi2.anki.reviewer.Binding.Companion.possibleKeyBindings
 import com.ichi2.anki.reviewer.CardSide.Companion.fromAnswer
-import com.ichi2.anki.reviewer.MappableBinding.Companion.fromPreference
 
 /** Accepts peripheral input, mapping via various keybinding strategies,
  * and converting them to commands for the Reviewer.  */
@@ -51,7 +50,8 @@ class PeripheralKeymap(
         preferences: SharedPreferences,
     ) {
         val bindings =
-            fromPreference(preferences, command)
+            ReviewerBinding
+                .fromPreference(preferences, command)
                 .filterIsInstance<ReviewerBinding>()
         for (b in bindings) {
             if (!b.isKey) {
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/ReviewerBinding.kt b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/ReviewerBinding.kt
index eea1c30a1a1e..ead1eab9f627 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/ReviewerBinding.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/ReviewerBinding.kt
@@ -16,9 +16,11 @@
 package com.ichi2.anki.reviewer
 
 import android.content.Context
+import android.content.SharedPreferences
 import androidx.annotation.CheckResult
 import com.ichi2.anki.R
 import com.ichi2.anki.cardviewer.Gesture
+import com.ichi2.anki.cardviewer.ViewerCommand
 import java.util.Objects
 
 class ReviewerBinding(
@@ -97,5 +99,14 @@ class ReviewerBinding(
 
         @CheckResult
         fun fromGesture(gesture: Gesture): ReviewerBinding = ReviewerBinding(Binding.GestureInput(gesture), CardSide.BOTH)
+
+        @CheckResult
+        fun fromPreference(
+            prefs: SharedPreferences,
+            command: ViewerCommand,
+        ): MutableList<MappableBinding> {
+            val value = prefs.getString(command.preferenceKey, null) ?: return command.defaultValue.toMutableList()
+            return fromPreferenceString(value).toMutableList()
+        }
     }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/PreferenceUpgradeService.kt b/AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/PreferenceUpgradeService.kt
index 12ce57515b69..dd6bdf448671 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/PreferenceUpgradeService.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/PreferenceUpgradeService.kt
@@ -49,7 +49,6 @@ import com.ichi2.anki.reviewer.Binding.Companion.keyCode
 import com.ichi2.anki.reviewer.CardSide
 import com.ichi2.anki.reviewer.FullScreenMode
 import com.ichi2.anki.reviewer.MappableBinding
-import com.ichi2.anki.reviewer.MappableBinding.Companion.fromPreference
 import com.ichi2.anki.reviewer.MappableBinding.Companion.toPreferenceString
 import com.ichi2.anki.reviewer.ReviewerBinding
 import com.ichi2.libanki.Consts
@@ -427,7 +426,7 @@ object PreferenceUpgradeService {
                             true
                         }
                     }
-                val bindings: MutableList<MappableBinding> = fromPreference(preferences, command)
+                val bindings: MutableList<MappableBinding> = ReviewerBinding.fromPreference(preferences, command)
                 addAtEnd(bindings, mappableBinding)
                 val newValue: String = bindings.toPreferenceString()
                 preferences.edit { putString(command.preferenceKey, newValue) }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerNoParamTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerNoParamTest.kt
index 0fbd750cfe9e..1246b7adf682 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerNoParamTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerNoParamTest.kt
@@ -31,7 +31,6 @@ import com.ichi2.anki.preferences.sharedPrefs
 import com.ichi2.anki.reviewer.Binding
 import com.ichi2.anki.reviewer.FullScreenMode
 import com.ichi2.anki.reviewer.FullScreenMode.Companion.setPreference
-import com.ichi2.anki.reviewer.MappableBinding
 import com.ichi2.anki.reviewer.MappableBinding.Companion.toPreferenceString
 import com.ichi2.anki.reviewer.ReviewerBinding
 import com.ichi2.anki.utils.ext.addBinding
@@ -298,7 +297,7 @@ class ReviewerNoParamTest : RobolectricTest() {
     private fun disableGestures(vararg gestures: Gesture) {
         val prefs = targetContext.sharedPrefs()
         for (command in ViewerCommand.entries) {
-            for (mappableBinding in MappableBinding.fromPreference(prefs, command)) {
+            for (mappableBinding in ReviewerBinding.fromPreference(prefs, command)) {
                 val gestureBinding = mappableBinding.binding as? Binding.GestureInput? ?: continue
                 if (gestureBinding.gesture in gestures) {
                     val bindings = ReviewerBinding.fromPreferenceString(command.preferenceKey).toMutableList()
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/servicemodel/UpgradeGesturesToControlsTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/servicemodel/UpgradeGesturesToControlsTest.kt
index 221b2f470354..7102f084fb64 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/servicemodel/UpgradeGesturesToControlsTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/servicemodel/UpgradeGesturesToControlsTest.kt
@@ -72,7 +72,7 @@ class UpgradeGesturesToControlsTest(
 
         assertThat(prefs.contains(testData.affectedPreferenceKey), equalTo(true))
         assertThat(prefs.contains(testData.unaffectedPreferenceKey), equalTo(false))
-        assertThat("example command should have no defaults", MappableBinding.fromPreference(prefs, command), empty())
+        assertThat("example command should have no defaults", ReviewerBinding.fromPreference(prefs, command), empty())
 
         upgradeAllGestures()
 
@@ -84,7 +84,7 @@ class UpgradeGesturesToControlsTest(
         assertThat("legacy preference removed", prefs.contains(testData.affectedPreferenceKey), equalTo(false))
         assertThat("new preference added", prefs.contains(command.preferenceKey), equalTo(true))
 
-        val fromPreference = MappableBinding.fromPreference(prefs, command)
+        val fromPreference = ReviewerBinding.fromPreference(prefs, command)
         assertThat(fromPreference, hasSize(1))
         val binding = fromPreference.first()
 
@@ -103,7 +103,7 @@ class UpgradeGesturesToControlsTest(
         assertThat(prefs.contains(testData.affectedPreferenceKey), equalTo(true))
         assertThat(prefs.contains(testData.unaffectedPreferenceKey), equalTo(false))
         assertThat("new preference does not exist", prefs.contains(command.preferenceKey), equalTo(false))
-        val previousCommands = MappableBinding.fromPreference(prefs, command)
+        val previousCommands = ReviewerBinding.fromPreference(prefs, command)
         assertThat("example command should have defaults", previousCommands, not(empty()))
 
         upgradeAllGestures()
@@ -116,7 +116,7 @@ class UpgradeGesturesToControlsTest(
         assertThat("legacy preference removed", prefs.contains(testData.affectedPreferenceKey), equalTo(false))
         assertThat("new preference exists", prefs.contains(command.preferenceKey), equalTo(true))
 
-        val currentCommands = MappableBinding.fromPreference(prefs, command)
+        val currentCommands = ReviewerBinding.fromPreference(prefs, command)
         assertThat("a binding was added to '${command.preferenceKey}'", currentCommands, hasSize(previousCommands.size + 1))
 
         // ensure that the order was not changed - the last element is not included in the zip
@@ -143,7 +143,7 @@ class UpgradeGesturesToControlsTest(
         assertThat(prefs.contains(testData.affectedPreferenceKey), equalTo(true))
         assertThat(prefs.contains(testData.unaffectedPreferenceKey), equalTo(false))
         assertThat("new preference exists", prefs.contains(command.preferenceKey), equalTo(true))
-        val previousCommands = MappableBinding.fromPreference(prefs, command)
+        val previousCommands = ReviewerBinding.fromPreference(prefs, command)
         assertThat("example command should have defaults", previousCommands, hasSize(2))
         assertThat(previousCommands.first(), equalTo(testData.binding))
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/utils/ext/ViewerCommand.kt b/AnkiDroid/src/test/java/com/ichi2/anki/utils/ext/ViewerCommand.kt
index 6bb72e9c7bdd..a7fddd3de7d3 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/utils/ext/ViewerCommand.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/utils/ext/ViewerCommand.kt
@@ -19,8 +19,8 @@ import android.content.SharedPreferences
 import androidx.core.content.edit
 import com.ichi2.anki.cardviewer.ViewerCommand
 import com.ichi2.anki.reviewer.MappableBinding
-import com.ichi2.anki.reviewer.MappableBinding.Companion.fromPreference
 import com.ichi2.anki.reviewer.MappableBinding.Companion.toPreferenceString
+import com.ichi2.anki.reviewer.ReviewerBinding
 
 fun ViewerCommand.addBinding(
     preferences: SharedPreferences,
@@ -33,7 +33,7 @@ fun ViewerCommand.addBinding(
             collection.add(0, element)
             true
         }
-    val bindings: MutableList<MappableBinding> = fromPreference(preferences, this)
+    val bindings: MutableList<MappableBinding> = ReviewerBinding.fromPreference(preferences, this)
     addAtStart(bindings, binding)
     val newValue: String = bindings.toPreferenceString()
     preferences.edit { putString(preferenceKey, newValue) }

From ee580d547f80feafe369fd3316ec21d39503ccc9 Mon Sep 17 00:00:00 2001
From: Sahil06012002 <94986140+Sahil06012002@users.noreply.github.com>
Date: Sun, 16 Feb 2025 19:11:14 +0530
Subject: [PATCH 070/200] build: include fallback signing keystore for easy
 release build testing

---
 .github/workflows/tests_emulator.yml |  17 +----------------
 AnkiDroid/build.gradle               |  16 ++++++++++++----
 tools/fallback-release-keystore.jks  | Bin 0 -> 2712 bytes
 3 files changed, 13 insertions(+), 20 deletions(-)
 create mode 100644 tools/fallback-release-keystore.jks

diff --git a/.github/workflows/tests_emulator.yml b/.github/workflows/tests_emulator.yml
index 4d4c6dad43bb..50f33570c0fe 100644
--- a/.github/workflows/tests_emulator.yml
+++ b/.github/workflows/tests_emulator.yml
@@ -21,12 +21,6 @@ jobs:
     env:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
       TEST_RELEASE_BUILD: true
-      # could be better, '/home/runner' should be '~/' but neither that nor '$HOME' worked
-      STOREFILEDIR: /home/runner/src
-      STOREFILE: android-keystore
-      STOREPASS: testpass
-      KEYPASS: testpass
-      KEYALIAS: nrkeystorealias
     strategy:
       fail-fast: false
       matrix:
@@ -51,15 +45,6 @@ jobs:
           swap-storage: false
           docker-images: false
 
-      - name: Test Credential Prep
-        run: |
-          echo "KSTOREPWD=$STOREPASS" >> $GITHUB_ENV
-          echo "KEYPWD=$KEYPASS" >> $GITHUB_ENV
-          mkdir $STOREFILEDIR
-          cd $STOREFILEDIR
-          echo y | keytool -genkeypair -dname "cn=AnkiDroid, ou=ankidroid, o=AnkiDroid, c=US" -alias $KEYALIAS -keypass $KEYPASS -keystore "$STOREFILE" -storepass $STOREPASS -keyalg RSA -validity 20000
-        shell: bash
-
       - uses: actions/checkout@v4
         with:
           fetch-depth: 50
@@ -197,4 +182,4 @@ jobs:
       - uses: codecov/codecov-action@v5
         with:
           verbose: true
-          fail_ci_if_error: ${{ github.repository == 'ankidroid/Anki-Android' }} # optional (default = false)
+          fail_ci_if_error: ${{ github.repository == 'ankidroid/Anki-Android' }} # optional (default = false)
\ No newline at end of file
diff --git a/AnkiDroid/build.gradle b/AnkiDroid/build.gradle
index 1e17e14cf9ab..058be63698c3 100644
--- a/AnkiDroid/build.gradle
+++ b/AnkiDroid/build.gradle
@@ -97,10 +97,18 @@ android {
     }
     signingConfigs {
         release {
-            storeFile file(System.getenv("KEYSTOREPATH") ?: "${homePath}/src/android-keystore")
-            storePassword System.getenv("KEYSTOREPWD") ?: System.getenv("KSTOREPWD")
-            keyAlias System.getenv("KEYALIAS") ?: "nrkeystorealias"
-            keyPassword System.getenv("KEYPWD")
+            def keystorePath = System.getenv("KEYSTOREPATH")
+            if (keystorePath != null && !keystorePath.trim().isEmpty()) {
+                storeFile file(keystorePath)
+                storePassword System.getenv("KEYSTOREPWD") ?: System.getenv("KSTOREPWD")
+                keyAlias System.getenv("KEYALIAS")
+                keyPassword System.getenv("KEYPWD")
+            } else {
+                storeFile file("${rootDir}/tools/fallback-release-keystore.jks")
+                storePassword "Test@123"
+                keyAlias "my-key"
+                keyPassword "Test@123"
+            }
         }
     }
     buildTypes {
diff --git a/tools/fallback-release-keystore.jks b/tools/fallback-release-keystore.jks
new file mode 100644
index 0000000000000000000000000000000000000000..53d3dbc4bc40578a5759007ea54ac681f7085bb9
GIT binary patch
literal 2712
zcma);X*d*&7RP58rWqq^Ni~cu!&t^njO9g^>}ynZ5m~Z?sF+@|k0M+4B|9U#46^fP
z$ubjT5Xv@#hzNPR&%ICYb3fht;XLO#zyJB4kN@YOvCtGcAUzrjRb_;TM(IX<X9j|S
zd040<2n$91!op}QL-l`247ngI!>eC7?N=o;GX2K|g97RDung+IpbGlVZwCW2+6Jxo
z&j>@KK%A5ErTN}u`N-~;wGsTl_57bUHOq8#!mM;a1RBP8=HD0TAPfLBoDt#>r3-YW
z2LVMvtcj7+Q9&_^h_{~BDK7Q)JRmG+EX8f+@Fcy6DSPR5+;M}Qo6<yf>xbPV;k76H
z{OOU8R7bv%_stFkb>8aA@2CX1O&6`x2(f)1jhb?1;XPy=ua_t4#Y>NXJ4jq=0Qe>)
zG^0;j!(TADLwGWoa1R07aximp17qml4wIsv4@$vgdxB=uHtouH6cQJ_hr*7LevyG%
zaV04;VoZzya03l*Ki#VR4HE#oqCl@xVlU9&VIzMparW%XM;4dWmei;pnr@KlLPj~3
z|2z|3kvP#HPkdM_#mhFm#7V6_AgeXOf{y*wKU?j^%Jq^LM0<C7V<C}nANsg&6BK?@
z<$ZWv%)5{G-Yf;_xRGv)#{0k<e1$Oh_r(BA<;H+K0s$`0X&LfpwmXj>LiDUSrmD8j
zuBki_(c8Q1aSh>+har9lB~DLSp%@q!X9Sib*;(a;pJ>@`lhRSszGE53K|X`IJ1G$f
zq~aB3K7aK@K&x=bR3<DJy0p;Oe8Pf=v@m2}s&12daNvzUxT|&&U_J0D`Pq0pu@-(J
zVj@Mp6n_&Z_n6u3r8d+O*~}uenKmVmquZ888Twk#b?W=9;F>$7f3isE$*qc%&sr1j
zT<Ol4+gNjQmSvFXw}j_N)x7pY7CS~opmM<-HWP(DgLBH@=El5dK9ly6pKRXR=%4q#
zw21^fXXV0g!f4n^4hV+<mZCF3LW`Em32&GbY3ALoFGn#cxR$m@*u;H}hZs{rxS8b@
zSI^~+e;DHrN1~qYG~N*FwIgIBX?)<0#>GrbU)R+}&)BWKa6XuRW@C1tDSPlAyURVG
zX@%k|clq^(0}@e2d7s}aNU(;u%*C8;)Z}wmJ*W0+n6X&Voa2-(aE5BR?a3(L5tsA|
z<fNa)Z6OELJRJ2FYP~IjzpP)Eg*HRJTzTkWX56Tk>8tJaQFwdamLlPUyxO`DMk7Hv
zmmQT<#{FrP<^f@I2dbW9kBv?3?jZeEi23LB**CqvHeYtgvEJ_HDQEGEuu90y3piUI
zGqb1{)Bw)sWDdHV(WU#tH2rQ^8=XlrQMINQy#s`SYe(plKJBOW9+(!%UgVnm$;%+m
zP15!`dAztX?pFv*s!4HI8k_hb;6ypF^;Oq<i0RI~HjFsCooO{Rrk83Sg|UyFV^_9z
zW>C{YNb;AReB#{4ba)vCe@Z>t1d+1%0x{hyVuS~4`>n4m)|&gm3<|nc<ecx$t=@R@
z>6rJnr5T);sftfccH(i(mCp@zhN42Nd`^m{r$6<}uiio5hY@rZidSoeB45YWA6Ar&
ziUvxGJFsJ6<6;$u1aqc9Az0e0zW(x^`I&B&67q;N?fkcw1W9MBh7+x8hGhMv0_D#r
zmfmTz{Vwy3+(@k4dYW1YbNlHFJ*-#$;*3XsSjnm(0jv<N+EnGW*urhhkkY6xw&xQ-
z(=f!Sl+j;~ab3pF65*N~c(<h<nXw|C>OC(z%c=Qi-(9*y_IkvQqum7`EAvF?-@Pz#
z+vzh~iEg4-`bXObgZM{=#3G|rl#e+XnL1-e?T20p1!{VCfO0t<owW|M*eJv7h7u7C
zN8+v+^FuSMuZ|=wV}BNNiJYWi8P)OpP00J*;%r8IG%v!CsD7dpbDGe9+9{D-4J5Tn
z(NeMbQc~*ZOTXh1!YOr@2L|v0gaE_=o&Z-s2%7I7@thPVh~46@mn%X_K}Ja$EvqQ4
zq#z@W#)9tuUIH`bVL?v6kR2Tm@T*z>qX7R`OlKY8MB!|Yr^qXZU?Wt(*9$!_7yh4^
zj{kF>i%Yg{YxhHay8Fc>w{R@|0(Y$B2!U@eq`~XqNRhjU#f`cPOKT;rIq;Ld0BoUn
zPEYcjz$T&^sM3Y#n7Ef+k%)e^;hiAmB01Ky<N5ADRuW-<h6&cbYnynGg=ZeFt`|6t
zc-EtLdvP@!_bh9i`Giy-K<cNCgdHnVKj3->m7NT1803%7`};Dwcep>tZFWl3!v|rx
zg-2ja?~24~<{MzJkiM+cg<iAh;o~PFL*IJ8g2vL{2i~^TN-=F;KB<vmp(g4`H!2iw
z#+lRC1BE*mJH{8O54-ro*>*)QZPRnKbk?L9#?8l(<5S#{dND7|j`F{0J~gD>)5cLp
zYKn(y`mKaVu5qh>&&drxr)~}?7x(Noe*PuKX~Xdcu|8nmUvB+;=)zO*ArotHJP%Rs
zm{J}*t}J4+P;{#kWr6Q}0SS(+9=bFs;;5OyJ%y|O(qM`jY2y-`^eYv9sbXXAbTLR@
z77fUz^e2e;a?O-+n~gCoPU%8Z!o<#1e8rhWVS}4Xu~d~l>|cmSLs?HLDbefSX~a@o
zLML_Hk1}a8<JkhnhF2VK1reJajlO5!?@uDFqssW_kIqgMO5$|Zl^NOv`)yByn>uiP
z1EcAFx6U5C5cJsIwM;UKLy#`65<1L62@fWqR$N5&L7@4(MkAgO`U7sMkygWnK4p-e
zCrsoH{uQ}Hy;b?TB?#-%sXTsFJgkakxQk#Jql&M9xZB4>Gq0cBLq|dib&F5>b>_(y
ztpjD5UaAIA{S`KS)r4<Lcfd6{*93+=6<=$%M=qleYe|r?thOVXdI?y&wxIKt?Uu>b
zPr)~M8hhCbO-tQ1`yH#;z^tb0mj1A577MQnX&Div@67i{z_56M8yR`TM*A2G+>JN>
zPII9JXEu`)5|8p-zOC;$OGGgj&c8A!`omkI6hwOXQ;MS}X+*TebxRGyqeg*cp0<aC
z_bDa4OdYSoA-mEuM~e>VrUfz@)+>V#YBSj1TPNxZAKWj>@f#Q&_~Dbpjbw?LD)i19
zomjp|RZy9NI!PO1gzeyxlC1CI9ScDYkw|Wp=KTB2A?@QFNU(rI)WyZBVp6eDA^{1h
zS?W02pat3K!9vcU{?cyexv6Z>=FXd-lAMS7L7pr0bGS6Pt<#xO;smS|ozi(XWr^T;
z$_`mvp_3d96g#XH5`$*?Q0TBFISI!B)w43jTW<TGp>|a$wJHHcjkji{Y_Am_Cv%Uc
zFU@PS%zCU<_1o&7MwiR3Q2pDlYzH${dQQtmJ;GSTtjQ!6xHZ<fwq>}OX1}7cva!^$
zDaPNtAS6icg!gf*bbV^id15W=n}9Y%OQD&6e`|C=1^@^V#dckNC{ww>c`5cq+q;jg
tT;F5D?-<(+(8_^mzen465U1ct#z6loJP>ARKMQ)gd+vFbPwu}W=5NA||K9)r

literal 0
HcmV?d00001


From 296c4d00031be3e03871513b20dc1fe4f4c91a0b Mon Sep 17 00:00:00 2001
From: Arthur Milchior <arthur@milchior.fr>
Date: Wed, 12 Feb 2025 00:08:46 +0100
Subject: [PATCH 071/200] NF: Correct `reps` documentation

`reps` used to have a different meaning than today.
I'd actually love to rename this variable, but it's the name used in
upstream, so I guess it would not be accepted.

I considered adding more information, such as the fact that in
practice, it mostly means that this value is reset when ankidroid
restart, with maybe some exceptions. Or that we should only care about
the difference between values at different point in time and not about
the actual value of this variable. But actually it does not
matter. It's only used for timebox and has 3 occurrences in the
codebase. Any more documentation would be overkill.

Fixed #6830. Well actually, it was fixed in
7a65160e0e23e20080091a30abdd4c05fc610e06 long ago, but the documen tation did
not reflect that. So let's claim I just fixed a 5 yo bug!
---
 .../src/main/java/com/ichi2/libanki/Collection.kt     |  4 ++--
 .../main/java/com/ichi2/libanki/sched/Scheduler.kt    | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/Collection.kt b/AnkiDroid/src/main/java/com/ichi2/libanki/Collection.kt
index ca0ed52ef696..3615815e0af9 100644
--- a/AnkiDroid/src/main/java/com/ichi2/libanki/Collection.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/libanki/Collection.kt
@@ -483,7 +483,7 @@ class Collection(
 
     fun startTimebox() {
         startTime = TimeManager.time.intTime()
-        startReps = sched.reps
+        startReps = sched.numberOfAnswersRecorded
     }
 
     data class TimeboxReached(
@@ -503,7 +503,7 @@ class Collection(
         return if (elapsed > limit) {
             TimeboxReached(
                 limit,
-                sched.reps - startReps,
+                sched.numberOfAnswersRecorded - startReps,
             ).also {
                 startTimebox()
             }
diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/sched/Scheduler.kt b/AnkiDroid/src/main/java/com/ichi2/libanki/sched/Scheduler.kt
index dad3ee8d6510..eb1c92472e97 100644
--- a/AnkiDroid/src/main/java/com/ichi2/libanki/sched/Scheduler.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/libanki/sched/Scheduler.kt
@@ -143,7 +143,7 @@ open class Scheduler(
         ease: Ease,
     ): OpChanges =
         col.backend.answerCard(buildAnswer(info.topCard, info.states, ease)).also {
-            reps += 1
+            numberOfAnswersRecorded += 1
         }
 
     /** Legacy path, used by tests. */
@@ -154,7 +154,7 @@ open class Scheduler(
         val top = queuedCards.cardsList.first()
         val answer = buildAnswer(card, top.states, ease)
         col.backend.answerCard(answer)
-        reps += 1
+        numberOfAnswersRecorded += 1
         // tests assume the card was mutated
         card.load(col)
     }
@@ -210,10 +210,11 @@ open class Scheduler(
             QueuedCards.Queue.UNRECOGNIZED, null -> TODO("unrecognized queue")
         }
 
-    /** @return Number of repetitions today. Note that a repetition is the fact that the scheduler sent a card, and not the fact that the card was answered.
-     * So buried, suspended, ... cards are also counted as repetitions.
+    /**
+     * Number of [answerCard] was called since this scheduler object was created.
+     * Note that when the user undo a review, this number is not decremented.
      */
-    var reps: Int = 0
+    var numberOfAnswersRecorded: Int = 0
 
     /** Only provided for legacy unit tests. */
     fun nextIvl(

From 35acaa48137897e6581483367c8661a006e79f25 Mon Sep 17 00:00:00 2001
From: Mike Hardy <github@mikehardy.net>
Date: Sun, 16 Feb 2025 21:25:48 -0500
Subject: [PATCH 072/200] build(deps): adopt backend 1.51-anki25.02

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b8aaefb9f8cb..d7baba00d7f7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -59,7 +59,7 @@ androidxViewpager2 = "1.1.0"
 androidxWebkit = "1.12.1"
 # https://developer.android.com/jetpack/androidx/releases/work
 androidxWork = "2.10.0"
-ankiBackend = '0.1.50-anki25.02'
+ankiBackend = '0.1.51-anki25.02'
 autoService = "1.1.1"
 autoServiceAnnotations = "1.1.1"
 colorpicker = "1.2.0"

From ce0c4d2f93146488e7568a73d3d25375be8f23b2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Feb 2025 10:13:03 +0000
Subject: [PATCH 073/200] build(deps): Dependency updates 20250216

PR 17991

build(deps): bump androidGradlePlugin from 8.8.0 to 8.8.1

Bumps `androidGradlePlugin` from 8.8.0 to 8.8.1.

Updates `com.android.application` from 8.8.0 to 8.8.1

Updates `com.android.library` from 8.8.0 to 8.8.1

---
updated-dependencies:
- dependency-name: com.android.application
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.android.library
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

build(deps): bump lint from 31.8.0 to 31.8.1

Bumps `lint` from 31.8.0 to 31.8.1.

Updates `com.android.tools.lint:lint-api` from 31.8.0 to 31.8.1

Updates `com.android.tools.lint:lint` from 31.8.0 to 31.8.1

Updates `com.android.tools.lint:lint-tests` from 31.8.0 to 31.8.1

---
updated-dependencies:
- dependency-name: com.android.tools.lint:lint-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.android.tools.lint:lint
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.android.tools.lint:lint-tests
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

build(deps): bump androidxFragmentKtx from 1.8.5 to 1.8.6

Bumps `androidxFragmentKtx` from 1.8.5 to 1.8.6.

Updates `androidx.fragment:fragment-ktx` from 1.8.5 to 1.8.6

Updates `androidx.fragment:fragment-testing` from 1.8.5 to 1.8.6

Updates `androidx.fragment:fragment-testing-manifest` from 1.8.5 to 1.8.6

---
updated-dependencies:
- dependency-name: androidx.fragment:fragment-ktx
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: androidx.fragment:fragment-testing
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: androidx.fragment:fragment-testing-manifest
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d7baba00d7f7..f594258de7e2 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -18,7 +18,7 @@ ktlint = '1.5.0'
 #
 # Old changelogs - See 'Table of Contents' in sidebar
 # https://developer.android.com/build/releases/past-releases
-androidGradlePlugin = "8.8.0"
+androidGradlePlugin = "8.8.1"
 # https://developer.android.com/jetpack/androidx/releases/activity
 androidxActivity = "1.10.0"
 # https://developer.android.com/jetpack/androidx/releases/annotation
@@ -36,7 +36,7 @@ androidxDragAndDrop = "1.0.0"
 # https://developer.android.com/jetpack/androidx/releases/exifinterface
 androidxExifinterface = "1.3.7"
 # https://developer.android.com/jetpack/androidx/releases/fragment
-androidxFragmentKtx = "1.8.5"
+androidxFragmentKtx = "1.8.6"
 # https://developer.android.com/jetpack/androidx/releases/media
 androidxMedia = "1.7.0"
 # https://developer.android.com/jetpack/androidx/releases/media3
@@ -88,7 +88,7 @@ kotlin = '2.1.10'
 kotlinxSerializationJson = "1.8.0"
 ktlintGradlePlugin = "12.1.2"
 leakcanaryAndroid = "2.14"
-lint = '31.8.0'
+lint = '31.8.1'
 material = "1.12.0"
 materialTapTargetPrompt = "3.3.2"
 mockitoInline = "5.2.0"

From da54fda37073eaeeff661c76682d0400faabb8e9 Mon Sep 17 00:00:00 2001
From: lukstbit <52494258+lukstbit@users.noreply.github.com>
Date: Fri, 14 Feb 2025 21:58:38 +0200
Subject: [PATCH 074/200] Fix color scheme for empty cards report dialog

This removes the initial implementation using an WebView in favor of a
TextView and parsing the report with HtmlCompat. The nids links are
now implemented through ClickSpans.

Also adds a test to check the html backend report structure to make
sure the report parsing code present in EmptyCardsFragment stays
relevant.
---
 .idea/dictionaries/android.xml                |   1 +
 .../anki/dialogs/EmptyCardsDialogFragment.kt  | 153 +++++++++++++-----
 .../main/res/layout/dialog_empty_cards.xml    |  14 +-
 .../anki/dialogs/EmptyCardsReportTest.kt      |  51 ++++++
 4 files changed, 172 insertions(+), 47 deletions(-)
 create mode 100644 AnkiDroid/src/test/java/com/ichi2/anki/dialogs/EmptyCardsReportTest.kt

diff --git a/.idea/dictionaries/android.xml b/.idea/dictionaries/android.xml
index 14936424ae40..e9d5faf37042 100644
--- a/.idea/dictionaries/android.xml
+++ b/.idea/dictionaries/android.xml
@@ -9,6 +9,7 @@
       <w>ENOENT</w>
       <w>FILESIZE</w>
       <w>ONEPLUS</w>
+      <w>allempty</w>
       <w>apkgfileprovider</w>
       <w>asynctasks</w>
       <w>backreference</w>
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/EmptyCardsDialogFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/EmptyCardsDialogFragment.kt
index 3339139bf9fe..5dd4511095ac 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/EmptyCardsDialogFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/EmptyCardsDialogFragment.kt
@@ -19,23 +19,27 @@ package com.ichi2.anki.dialogs
 
 import android.app.Activity
 import android.app.Dialog
+import android.content.Context
 import android.content.Intent
 import android.content.res.Configuration
 import android.content.res.Configuration.ORIENTATION_LANDSCAPE
 import android.graphics.Insets
 import android.os.Build
 import android.os.Bundle
+import android.text.SpannableStringBuilder
+import android.text.Spanned
+import android.text.method.LinkMovementMethod
+import android.text.style.ClickableSpan
 import android.util.DisplayMetrics
 import android.view.View
+import android.view.ViewGroup
 import android.view.WindowInsets.Type.displayCutout
 import android.view.WindowInsets.Type.navigationBars
-import android.webkit.WebResourceRequest
-import android.webkit.WebView
-import android.webkit.WebViewClient
 import android.widget.CheckBox
+import android.widget.ScrollView
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
-import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.text.HtmlCompat
 import androidx.core.view.isVisible
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.viewModels
@@ -53,6 +57,7 @@ import com.ichi2.anki.dialogs.EmptyCardsUiState.SearchingForEmptyCards
 import com.ichi2.anki.launchCatchingTask
 import com.ichi2.anki.ui.internationalization.toSentenceCase
 import com.ichi2.anki.withProgress
+import com.ichi2.libanki.NoteId
 import com.ichi2.libanki.emptyCids
 import com.ichi2.utils.message
 import com.ichi2.utils.positiveButton
@@ -77,36 +82,18 @@ class EmptyCardsDialogFragment : DialogFragment() {
         get() = dialog?.findViewById(R.id.empty_report_label)
     private val keepNotesWithNoValidCards: CheckBox?
         get() = dialog?.findViewById(R.id.preserve_notes)
-    private val reportWebView: WebView?
+    private val reportScrollView: ScrollView?
+        get() = dialog?.findViewById(R.id.reportScrollView)
+    private val reportView: TextView?
         get() = dialog?.findViewById(R.id.report)
 
-    // TODO handle WebViewClient.onRenderProcessGone()
-    private val customWebViewClient =
-        object : WebViewClient() {
-            override fun shouldOverrideUrlLoading(
-                view: WebView?,
-                request: WebResourceRequest?,
-            ): Boolean {
-                val searchQuery = request?.url?.toString()
-                return if (searchQuery != null && searchQuery.startsWith("nid:")) {
-                    val browserSearchIntent = Intent(requireContext(), CardBrowser::class.java)
-                    browserSearchIntent.putExtra("search_query", searchQuery)
-                    browserSearchIntent.putExtra("all_decks", true)
-                    startActivity(browserSearchIntent)
-                    true
-                } else {
-                    super.shouldOverrideUrlLoading(view, request)
-                }
-            }
-        }
-
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         bindToState()
         viewModel.searchForEmptyCards()
         val dialogView = layoutInflater.inflate(R.layout.dialog_empty_cards, null)
         dialogView.findViewById<CheckBox>(R.id.preserve_notes)?.text =
             TR.emptyCardsPreserveNotesCheckbox()
-        dialogView.findViewById<WebView>(R.id.report).webViewClient = customWebViewClient
+        dialogView.findViewById<TextView>(R.id.report).movementMethod = LinkMovementMethod.getInstance()
 
         return AlertDialog
             .Builder(requireContext())
@@ -166,11 +153,10 @@ class EmptyCardsDialogFragment : DialogFragment() {
                                 (dialog as? AlertDialog)?.positiveButton?.text =
                                     getString(R.string.dialog_ok)
                             } else {
-                                reportWebView?.updateWebViewHeight()
-                                reportWebView?.loadData(
+                                reportScrollView?.updateViewHeight()
+                                reportView?.setText(
                                     state.emptyCardsReport.asActionableReport(),
-                                    "text/html",
-                                    null,
+                                    TextView.BufferType.SPANNABLE,
                                 )
                                 keepNotesWithNoValidCards?.isVisible = true
                                 emptyReportMessage?.isVisible = false
@@ -198,24 +184,103 @@ class EmptyCardsDialogFragment : DialogFragment() {
     }
 
     /**
-     * Replaces the anki format [anki:nid:#nid](ex: [anki:nid:234783924354]) with "nid:#id"(
-     * ex. nid:234783924354) to be used as a query text in [CardBrowser].
+     * Replaces the anki format [anki:nid:#nid](ex: [anki:nid:234783924354]) from the report with
+     * just the nid as a [ClickableSpan] which will trigger a [CardBrowser] search for that nid.
      */
-    // https://github.com/ankitects/anki/blob/de7a693465ca302e457a4767c7f213c76478f0ee/qt/aqt/emptycards.py#L56-L60
-    private fun EmptyCardsReport.asActionableReport(): String {
-        @Suppress("RegExpRedundantEscape")
-        return Regex("\\[anki:nid:(\\d+)\\]")
-            .replace(
-                report,
-                "<a href=\"nid:$1\">$1</a>",
+    private fun EmptyCardsReport.asActionableReport(): SpannableStringBuilder {
+        val spannableReport =
+            SpannableStringBuilder(HtmlCompat.fromHtml(report, HtmlCompat.FROM_HTML_MODE_LEGACY))
+        AnkiNidTag.parseFromReport(spannableReport).forEach { tag ->
+            // make nid clickable
+            spannableReport.setSpan(
+                BrowserSearchByNidSpan(requireContext(), tag.nid),
+                tag.matchedNid.range.first,
+                tag.matchedNid.range.last + 1,
+                Spanned.SPAN_EXCLUSIVE_EXCLUSIVE,
             )
+            // remove suffix
+            spannableReport.delete(tag.matchedSuffix)
+            // remove prefix
+            spannableReport.delete(tag.matchedPrefix)
+        }
+        return spannableReport
+    }
+
+    private fun SpannableStringBuilder.delete(group: MatchGroup) {
+        delete(group.range.first, group.range.last + 1)
+    }
+
+    /**
+     * Represents a Regex over `[anki:nid:1234]`.
+     *
+     * @param matchedPrefix `[anki:nid:
+     * @param matchedNid `1234`
+     * @param nid `1234`
+     * @param matchedSuffix `]`
+     */
+    private class AnkiNidTag(
+        val matchedPrefix: MatchGroup,
+        val matchedNid: MatchGroup,
+        val nid: NoteId,
+        val matchedSuffix: MatchGroup,
+    ) {
+        companion object {
+            // https://github.com/ankitects/anki/blob/de7a693465ca302e457a4767c7f213c76478f0ee/qt/aqt/emptycards.py#L56-L60
+            @Suppress("RegExpRedundantEscape")
+            private val ankiNidPattern = Regex("(\\[anki:nid:)(\\d+)(\\])")
+
+            /**
+             * @return a [Sequence] of [AnkiNidTag]. Note: the method uses [Regex.findAll] in the
+             * implementation and returns its [Sequence] so each [AnkiNidTag] is one by one matched
+             * and returned for calling code to use. This allows the backing [SpannableStringBuilder]
+             * to resize itself after work done on each [AnkiNidTag](ex. deleting parts of it) so as
+             * the following tags are "found" they will have the proper ranges in the backing
+             * [SpannableStringBuilder]. Returning the full lists of [AnkiNidTag] and then working
+             * on them is an error and will crash.
+             *
+             * @see EmptyCardsReport.asActionableReport
+             * @see SpannableStringBuilder.delete
+             */
+            fun parseFromReport(report: SpannableStringBuilder): Sequence<AnkiNidTag> {
+                return ankiNidPattern.findAll(report).mapNotNull { result ->
+                    // for an entry like [anki:nid:1234] we should have 4 groups: the entire match(
+                    // [anki:nid:1234]) and the three groups we defined: '[anki:nid:', '1234', ']'
+                    if (result.groups.size != 4) return@mapNotNull null
+                    val matchedPrefix = result.groups[1] ?: return@mapNotNull null
+                    val matchedNid = result.groups[2] ?: return@mapNotNull null
+                    val nid = matchedNid.value.toLongOrNull() ?: return@mapNotNull null
+                    val matchedSuffix = result.groups[3] ?: return@mapNotNull null
+
+                    AnkiNidTag(matchedPrefix, matchedNid, nid, matchedSuffix)
+                }
+            }
+        }
+    }
+
+    /**
+     * A specialized [ClickableSpan] that on click will open the [CardBrowser] and initiate a
+     * search with the passed [nid].
+     *
+     * @see CardBrowser
+     */
+    private class BrowserSearchByNidSpan(
+        val context: Context,
+        val nid: Long,
+    ) : ClickableSpan() {
+        override fun onClick(widget: View) {
+            val browserSearchIntent = Intent(context, CardBrowser::class.java)
+            browserSearchIntent.putExtra("search_query", "nid:$nid")
+            browserSearchIntent.putExtra("all_decks", true)
+            context.startActivity(browserSearchIntent)
+        }
     }
 
     /**
-     * The [WebView] doesn't properly fit the allocated space in the dialog so this method manually
-     * updates the [WebView]'s height to a value that fits, depending on orientation and screen size.
+     * The [ScrollView] in this dialog's custom layout doesn't properly fit the allocated height so
+     * this method manually updates the [ScrollView]'s height to a value that fits, depending on
+     * orientation and screen size.
      */
-    private fun WebView.updateWebViewHeight() {
+    private fun View.updateViewHeight() {
         val currentOrientation = requireContext().resources.configuration.orientation
         val targetPercent = if (currentOrientation == ORIENTATION_LANDSCAPE) 0.25 else 0.5
         val screenHeight =
@@ -239,14 +304,14 @@ class EmptyCardsDialogFragment : DialogFragment() {
                 displayMetrics.heightPixels
             }
         val calculatedHeight = (screenHeight * targetPercent).toInt()
-        (layoutParams as ConstraintLayout.LayoutParams).height = calculatedHeight
+        (layoutParams as ViewGroup.LayoutParams).height = calculatedHeight
         layoutParams = layoutParams
         requestLayout()
     }
 
     override fun onConfigurationChanged(newConfig: Configuration) {
         super.onConfigurationChanged(newConfig)
-        reportWebView?.updateWebViewHeight()
+        reportScrollView?.updateViewHeight()
     }
 
     companion object {
diff --git a/AnkiDroid/src/main/res/layout/dialog_empty_cards.xml b/AnkiDroid/src/main/res/layout/dialog_empty_cards.xml
index 8ff232b50028..e89dc101c749 100644
--- a/AnkiDroid/src/main/res/layout/dialog_empty_cards.xml
+++ b/AnkiDroid/src/main/res/layout/dialog_empty_cards.xml
@@ -70,14 +70,21 @@
         android:paddingStart="@dimen/side_margin"
         android:paddingEnd="@dimen/side_margin">
 
-        <WebView
-            android:id="@+id/report"
+        <ScrollView
+            android:id="@+id/reportScrollView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toTopOf="@+id/preserve_notes"/>
+            android:layout_marginTop="8dp"
+            android:paddingHorizontal="8dp"
+            app:layout_constraintBottom_toTopOf="@+id/preserve_notes">
+            <TextView
+                android:id="@+id/report"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"/>
+        </ScrollView>
 
         <CheckBox
             android:id="@+id/preserve_notes"
@@ -86,6 +93,7 @@
             android:checked="true"
             tools:text="Keep notes with no valid cards"
             android:layout_marginTop="8dp"
+            android:padding="4dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"/>
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/EmptyCardsReportTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/EmptyCardsReportTest.kt
new file mode 100644
index 000000000000..fe1033a27ccc
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/EmptyCardsReportTest.kt
@@ -0,0 +1,51 @@
+/****************************************************************************************
+ * Copyright (c) 2025 lukstbit <52494258+lukstbit@users.noreply.github.com>             *
+ *                                                                                      *
+ * This program is free software; you can redistribute it and/or modify it under        *
+ * the terms of the GNU General Public License as published by the Free Software        *
+ * Foundation; either version 3 of the License, or (at your option) any later           *
+ * version.                                                                             *
+ *                                                                                      *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY      *
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A      *
+ * PARTICULAR PURPOSE. See the GNU General Public License for more details.             *
+ *                                                                                      *
+ * You should have received a copy of the GNU General Public License along with         *
+ * this program.  If not, see <http://www.gnu.org/licenses/>.                           *
+ ****************************************************************************************/
+package com.ichi2.anki.dialogs
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.CollectionManager.withCol
+import com.ichi2.anki.RobolectricTest
+import org.junit.Test
+import org.junit.runner.RunWith
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+
+@RunWith(AndroidJUnit4::class)
+class EmptyCardsReportTest : RobolectricTest() {
+    @Test
+    fun `backend report has expected html structure`() =
+        runTest {
+            addStandardNoteType("TestNotetype", arrayOf("f1", "f2"), "", "")
+            val note1 = addNoteUsingNoteTypeName("TestNotetype", "f1text1", "f2text1")
+            val note2 = addNoteUsingNoteTypeName("TestNotetype", "f1text2", "f2text2")
+            val emptyCardsReport = withCol { getEmptyCards() }
+            assertEquals(getExpectedEmptyCardsReport(note1.id, note2.id), emptyCardsReport.report)
+        }
+
+    private fun getExpectedEmptyCardsReport(
+        nid1: Long,
+        nid2: Long,
+    ) =
+        "<div><b>Empty cards for \u2068TestNotetype\u2069:</b></div><ol><li class=allempty>[anki:nid:$nid1] \u20681\u2069 of \u20681\u2069 cards empty (\u2068Card 1\u2069).</li><li class=allempty>[anki:nid:$nid2] \u20681\u2069 of \u20681\u2069 cards empty (\u2068Card 1\u2069).</li></ol>"
+
+    @Test
+    fun `backend report is empty when there are no empty cards`() =
+        runTest {
+            addNotes(12)
+            val emptyCardsReport = withCol { getEmptyCards() }
+            assertTrue(emptyCardsReport.report.isEmpty())
+        }
+}

From 922ee8319faa4ade72730e67333f693bd4754ddb Mon Sep 17 00:00:00 2001
From: David Allison <62114487+david-allison@users.noreply.github.com>
Date: Mon, 17 Feb 2025 18:57:51 +0000
Subject: [PATCH 075/200] docs: showManageAllFilesScreen error case

---
 .../com/ichi2/anki/ui/windows/permissions/PermissionsFragment.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/permissions/PermissionsFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/permissions/PermissionsFragment.kt
index fa64bb680f46..38d5dcd79ad2 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/permissions/PermissionsFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/permissions/PermissionsFragment.kt
@@ -85,6 +85,7 @@ abstract class PermissionsFragment(
 
         // From the docs: [ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION]
         // In some cases, a matching Activity may not exist, so ensure you safeguard against this.
+        // example: not yet supported on WearOS: https://issuetracker.google.com/issues/299174252
         if (intent.resolveActivity(requireActivity().packageManager) != null) {
             Timber.i("launching ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION")
             launch(intent)

From d01875a1099ce84816019936c42eb0389af37b03 Mon Sep 17 00:00:00 2001
From: Ashish Yadav <48384865+criticalAY@users.noreply.github.com>
Date: Mon, 10 Feb 2025 18:05:59 +0530
Subject: [PATCH 076/200] nf: remove TODO from instant note editor activity"

---
 .../ichi2/anki/instantnoteeditor/InstantNoteEditorActivity.kt    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/instantnoteeditor/InstantNoteEditorActivity.kt b/AnkiDroid/src/main/java/com/ichi2/anki/instantnoteeditor/InstantNoteEditorActivity.kt
index e601ae73b047..2b44cb86a437 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/instantnoteeditor/InstantNoteEditorActivity.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/instantnoteeditor/InstantNoteEditorActivity.kt
@@ -167,7 +167,6 @@ class InstantNoteEditorActivity :
         }
 
     /** Setup the deck spinner and custom editor dialog layout **/
-    // TODO: subscribe to the flow of deckId to change the control value
     private fun showEditorDialog() {
         showDialog()
         deckSpinnerSelection =

From a989592067464d51206c830d644d7c2305a1ba40 Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Mon, 17 Feb 2025 12:59:39 -0300
Subject: [PATCH 077/200] refactor: add more material colors resources

source: https://materialui.co/colors
---
 AnkiDroid/src/main/res/values/colors.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/AnkiDroid/src/main/res/values/colors.xml b/AnkiDroid/src/main/res/values/colors.xml
index 911bf59197fe..ae82c3d4054b 100644
--- a/AnkiDroid/src/main/res/values/colors.xml
+++ b/AnkiDroid/src/main/res/values/colors.xml
@@ -53,11 +53,19 @@
     <color name="material_red_800">#ffC62828</color>
     <color name="material_red_900">#ffb71c1c</color>
     <color name="material_red_A700">#ffd50000</color>
+
+    <color name="material_orange_100">#FFE0B2</color>
+    <color name="material_orange_200">#FFCC80</color>
+    <color name="material_orange_300">#FFB74D</color>
+    <color name="material_orange_A100">#FFD180</color>
+    <color name="material_orange_A200">#FFAB40</color>
     <color name="material_orange_A700">#ffff6d00</color>
 
     <color name="material_indigo_200">#9fa8da</color>
     <color name="material_indigo_700">#ff303f9f</color>
     <color name="material_indigo_A700">#ff304ffe</color>
+    <color name="material_blue_100">#BBDEFB</color>
+    <color name="material_blue_200">#90CAF9</color>
     <color name="material_blue_400">#ff42a5f5</color>
     <color name="material_blue_500">#ff2196f3</color>
     <color name="material_blue_600">#ff1e88e5</color>
@@ -72,6 +80,8 @@
     <color name="material_light_blue_700">#ff0288d1</color>
     <color name="material_light_blue_800">#ff0277BD</color>
     <color name="material_light_blue_900">#ff01579B</color>
+    <color name="material_light_blue_A100">#80D8FF</color>
+    <color name="material_light_blue_A200">#40C4FF</color>
     <color name="material_light_blue_A700">#ff0091ea</color>
     <color name="material_cyan_A700">#ff00b8d4</color>
 
@@ -86,6 +96,8 @@
     <color name="material_light_green_A700">#ff64dd17</color>
     <color name="material_lime_green_A700">#ffaeea00</color>
 
+    <color name="material_light_green_200">#C5E1A5</color>
+
     <color name="material_yellow_500">#ffffeb3b</color>
 
     <color name="material_deep_purple_400">#ff7E57C2</color>

From 57f2fcc4779f2597cd23047509cf67455467464d Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Mon, 17 Feb 2025 13:03:09 -0300
Subject: [PATCH 078/200] feat(new reviewer): buttons night mode colors

---
 AnkiDroid/src/main/res/values-night/colors.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/AnkiDroid/src/main/res/values-night/colors.xml b/AnkiDroid/src/main/res/values-night/colors.xml
index bb0c643162ec..c37438c75b82 100644
--- a/AnkiDroid/src/main/res/values-night/colors.xml
+++ b/AnkiDroid/src/main/res/values-night/colors.xml
@@ -7,4 +7,13 @@
     <color name="flag_pink">#A70D64</color>
     <color name="flag_turquoise">#138072</color>
     <color name="flag_purple">#6320A0</color>
+
+    <color name="again_button_bg">#1AB71C1C</color> <!-- Material red 900 with 10% alpha -->
+    <color name="again_button_text">@color/material_red_200</color>
+    <color name="hard_button_bg">#1AE65100</color> <!-- Material orange 900 with 10% alpha -->
+    <color name="hard_button_text">@color/material_orange_200</color>
+    <color name="good_button_bg">#1A2E7D32</color> <!-- Material green 800 with 10% alpha -->
+    <color name="good_button_text">@color/material_light_green_200</color>
+    <color name="easy_button_bg">#1A0277BD</color> <!-- Material light blue 800 with 10% alpha -->
+    <color name="easy_button_text">@color/material_light_blue_A100</color>
 </resources>
\ No newline at end of file

From 00a71220f7933ce0e247721bd915bba665910379 Mon Sep 17 00:00:00 2001
From: Anoop <xenonoxidee@gmail.com>
Date: Sat, 15 Feb 2025 17:02:22 +0530
Subject: [PATCH 079/200] Reduced the height of the Card Analysis Widget.

---
 AnkiDroid/src/main/res/layout/widget_card_analysis.xml      | 6 +++---
 .../main/res/layout/widget_card_analysis_drawable_v31.xml   | 4 ++--
 .../src/main/res/xml/widget_provider_card_analysis.xml      | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/AnkiDroid/src/main/res/layout/widget_card_analysis.xml b/AnkiDroid/src/main/res/layout/widget_card_analysis.xml
index 9b76b3620ef2..3d495c00489f 100644
--- a/AnkiDroid/src/main/res/layout/widget_card_analysis.xml
+++ b/AnkiDroid/src/main/res/layout/widget_card_analysis.xml
@@ -27,7 +27,7 @@
         android:layout_height="wrap_content"
         android:background="@drawable/widget_card_analysis_rounded_inner_background"
         android:orientation="horizontal"
-        android:padding="20dp">
+        android:padding="16dp">
 
         <TextView
             android:id="@+id/deckNew_card_analysis_widget"
@@ -67,9 +67,9 @@
         android:id="@+id/deckNameCardAnalysis"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="70dp"
+        android:layout_marginTop="64dp"
         android:gravity="center"
-        android:padding="20dp"
+        android:padding="15dp"
         android:paddingBottom="5dp"
         android:textColor="?android:attr/textColorPrimary"
         android:textSize="24sp"
diff --git a/AnkiDroid/src/main/res/layout/widget_card_analysis_drawable_v31.xml b/AnkiDroid/src/main/res/layout/widget_card_analysis_drawable_v31.xml
index b6743887f034..04c4a344d119 100644
--- a/AnkiDroid/src/main/res/layout/widget_card_analysis_drawable_v31.xml
+++ b/AnkiDroid/src/main/res/layout/widget_card_analysis_drawable_v31.xml
@@ -12,7 +12,7 @@
         android:layout_height="wrap_content"
         android:background="@drawable/widget_card_analysis_rounded_inner_background"
         android:orientation="horizontal"
-        android:padding="20dp">
+        android:padding="16dp">
 
         <TextView
             android:layout_width="0dp"
@@ -52,7 +52,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
-        android:padding="20dp"
+        android:padding="15dp"
         android:paddingBottom="5dp"
         android:text="@string/deck1Name_deck_picker_widget"
         android:textColor="?android:attr/textColorPrimary"
diff --git a/AnkiDroid/src/main/res/xml/widget_provider_card_analysis.xml b/AnkiDroid/src/main/res/xml/widget_provider_card_analysis.xml
index a6b704c127f9..c8213cd4594e 100644
--- a/AnkiDroid/src/main/res/xml/widget_provider_card_analysis.xml
+++ b/AnkiDroid/src/main/res/xml/widget_provider_card_analysis.xml
@@ -1,6 +1,6 @@
-<!-- JPG type of file used in previewImage property because the SVG format is not supported on all devices.
+<!-- JPG type of file used in previewImage property because the SVG and Vector format is not supported on all devices.
      The widths and heights parameters are determined as follows:
-     The default is 3 cells in width and 2 in height.
+     The default size is 3 cells wide and 2 cells high, but the grid layout typically determines the final dimensions.
      Following https://developer.android.com/develop/ui/views/appwidgets/layouts#anatomy_determining_size
      we used the portrait mode cell size for the width and the landscape mode cell size for the height. Leading to:
      * height between 102 and 315

From 2fded48bffb18386f5c6accada997f7058ba0f10 Mon Sep 17 00:00:00 2001
From: "sargamgayatri0803@gmail.com" <sargamgayatri0803@gmail.com>
Date: Sat, 15 Feb 2025 21:17:27 +0530
Subject: [PATCH 080/200] fix:focus keyboard on edit description dialog

---
 .../java/com/ichi2/anki/dialogs/EditDeckDescriptionDialog.kt    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/EditDeckDescriptionDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/EditDeckDescriptionDialog.kt
index e3d4718fb85f..92a6baf42395 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/EditDeckDescriptionDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/EditDeckDescriptionDialog.kt
@@ -32,6 +32,7 @@ import com.ichi2.anki.utils.ext.description
 import com.ichi2.anki.utils.ext.update
 import com.ichi2.libanki.DeckId
 import com.ichi2.themes.Themes
+import com.ichi2.utils.AndroidUiUtils.setFocusAndOpenKeyboard
 import timber.log.Timber
 
 /**
@@ -79,6 +80,7 @@ class EditDeckDescriptionDialog : DialogFragment() {
                 }.also { toolbar ->
                     launchCatchingTask { toolbar.title = withCol { decks.get(deckId)!!.name } }
                 }
+            setFocusAndOpenKeyboard(deckDescriptionInput) { deckDescriptionInput.setSelection(deckDescriptionInput.text!!.length) }
         }
     }
 

From 7133b31bb51b26fa815972f99943fc59ea9dac61 Mon Sep 17 00:00:00 2001
From: snowtimeglass <snowtimeglass@gmail.com>
Date: Thu, 20 Feb 2025 12:01:23 +0900
Subject: [PATCH 081/200] fix: top side is cut off when center align & long

issue: if "Center align" is enabled and the content of the card is so long that cannot be shown entirely without scrolling, the top side of the content is trimmed.
---
 AnkiDroid/src/main/assets/flashcard.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AnkiDroid/src/main/assets/flashcard.css b/AnkiDroid/src/main/assets/flashcard.css
index be8dd01bab14..d9b9ccfb6b51 100644
--- a/AnkiDroid/src/main/assets/flashcard.css
+++ b/AnkiDroid/src/main/assets/flashcard.css
@@ -116,7 +116,7 @@ preferred over using JavaScript.
 .vertically_centered {
   position: absolute;
   width: 100%;
-  height: 100%;
+  min-height: 100%;
   display: -webkit-box;
   -webkit-box-align: stretch;
   -webkit-box-pack: center;

From 52024789a352dc625ea98e92c433ab4eec15754d Mon Sep 17 00:00:00 2001
From: AnkiDroid Translations <ankidroid@ankidroid.org>
Date: Tue, 25 Feb 2025 15:27:13 +0000
Subject: [PATCH 082/200] Updated strings from Crowdin

---
 .../src/main/res/values-de/11-arrays.xml      |  18 +--
 AnkiDroid/src/main/res/values-fr/01-core.xml  |   2 +-
 .../src/main/res/values-fr/02-strings.xml     |   2 +-
 .../src/main/res/values-fr/07-cardbrowser.xml |  12 +-
 .../src/main/res/values-fr/11-arrays.xml      |   4 +-
 AnkiDroid/src/main/res/values-km/01-core.xml  |  78 +++++-----
 .../src/main/res/values-km/02-strings.xml     | 140 +++++++++---------
 .../src/main/res/values-km/03-dialogs.xml     |  78 +++++-----
 .../src/main/res/values-km/04-network.xml     |  14 +-
 .../src/main/res/values-km/05-feedback.xml    |   4 +-
 .../src/main/res/values-km/07-cardbrowser.xml |  36 ++---
 .../src/main/res/values-km/08-widget.xml      |  12 +-
 .../src/main/res/values-km/09-backup.xml      |   4 +-
 .../src/main/res/values-km/10-preferences.xml | 130 ++++++++--------
 .../src/main/res/values-km/11-arrays.xml      |  22 +--
 .../src/main/res/values-pt-rBR/02-strings.xml |  10 +-
 .../main/res/values-pt-rBR/07-cardbrowser.xml |  12 +-
 .../main/res/values-pt-rBR/10-preferences.xml |   8 +-
 .../src/main/res/values-ug/10-preferences.xml |   2 +-
 .../src/main/res/values-uk/10-preferences.xml |   2 +-
 20 files changed, 293 insertions(+), 297 deletions(-)

diff --git a/AnkiDroid/src/main/res/values-de/11-arrays.xml b/AnkiDroid/src/main/res/values-de/11-arrays.xml
index f4107293b6be..7983e2098764 100644
--- a/AnkiDroid/src/main/res/values-de/11-arrays.xml
+++ b/AnkiDroid/src/main/res/values-de/11-arrays.xml
@@ -50,15 +50,15 @@
     <!-- 01-core:menu_suspend_card -->
     <!-- new_order_labels -->
     <!-- cram_deck_conf_order_labels -->
-    <string name="cram_deck_conf_order_oldest_seen_first">Älteste zuerst</string>
-    <string name="cram_deck_conf_order_random">Zufällig</string>
-    <string name="cram_deck_conf_order_increasing_intervals">Steigende Intervalle</string>
-    <string name="cram_deck_conf_order_decreasing_intervals">abnehmenden Intervallen</string>
-    <string name="cram_deck_conf_order_most_lapsed">Meiste Fehlversuche</string>
-    <string name="cram_deck_conf_order_order_added">Reihenfolge des Hinzufügens</string>
-    <string name="cram_deck_conf_order_order_due">Fälligkeit</string>
-    <string name="cram_deck_conf_order_latest_added_first">Zuletzt hinzugefügte zuerst</string>
-    <string name="cram_deck_conf_order_relative_overdueness">relativer Überfälligkeit</string>
+    <string name="cram_deck_conf_order_oldest_seen_first">Datum der letzten Wiederholung (älteste zuerst)</string>
+    <string name="cram_deck_conf_order_random">Zufall</string>
+    <string name="cram_deck_conf_order_increasing_intervals">Intervall (aufsteigend)</string>
+    <string name="cram_deck_conf_order_decreasing_intervals">Intervall (absteigend)</string>
+    <string name="cram_deck_conf_order_most_lapsed">Fehlversuche (häufigste zuerst)</string>
+    <string name="cram_deck_conf_order_order_added">Erstelldatum (älteste zuerst)</string>
+    <string name="cram_deck_conf_order_order_due">Fälligkeitsdatum (älteste zuerst)</string>
+    <string name="cram_deck_conf_order_latest_added_first">Erstelldatum (neueste zuerst)</string>
+    <string name="cram_deck_conf_order_relative_overdueness">Abrufbarkeit (aufsteigend)</string>
     <!-- add_to_cur_labels -->
     <string name="add_to_deck_use_current_deck">Aktuellen Stapel verwenden</string>
     <string name="add_to_deck_decide_by_note_type">Nach Notiztyp entscheiden</string>
diff --git a/AnkiDroid/src/main/res/values-fr/01-core.xml b/AnkiDroid/src/main/res/values-fr/01-core.xml
index 151b160fb35e..b148e9458e50 100644
--- a/AnkiDroid/src/main/res/values-fr/01-core.xml
+++ b/AnkiDroid/src/main/res/values-fr/01-core.xml
@@ -129,7 +129,7 @@
     <string name="empty_deck">Ce paquet est vide</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Chercher un deck</string>
     <string name="invalid_deck_name">Nom de paquet invalide</string>
-    <string name="studyoptions_congrats_finished">Congratulations! You have finished for today.</string>
+    <string name="studyoptions_congrats_finished">Félicitations ! Vous avez terminé pour aujourd\'hui.</string>
     <string name="studyoptions_congrats_next_due_in" comment="The param will be replaced with \'The next card will be ready in X time\'">Paquet terminé pour l’instant! %s</string>
     <string name="studyoptions_no_cards_due">Aucune carte due actuellement</string>
     <string name="sd_card_not_mounted">Aucune carte SD</string>
diff --git a/AnkiDroid/src/main/res/values-fr/02-strings.xml b/AnkiDroid/src/main/res/values-fr/02-strings.xml
index 6e36218c733a..cd8099d40e64 100644
--- a/AnkiDroid/src/main/res/values-fr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fr/02-strings.xml
@@ -87,7 +87,7 @@
         <item quantity="one">+%d enterrée</item>
         <item quantity="other">+%d enterrées</item>
     </plurals>
-    <string name="studyoptions_total_new_label">Total new cards</string>
+    <string name="studyoptions_total_new_label">Total des nouvelles cartes</string>
     <string name="studyoptions_total_label">Total de cartes</string>
     <!-- Card editor -->
     <string name="cardeditor_title_edit_card" maxLength="28">Modifier la note</string>
diff --git a/AnkiDroid/src/main/res/values-fr/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-fr/07-cardbrowser.xml
index c4952423e327..15da0c571576 100644
--- a/AnkiDroid/src/main/res/values-fr/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-fr/07-cardbrowser.xml
@@ -112,10 +112,10 @@
     <string name="edit_tags_dialog" comment="Description of the shortcut that opens the edit tags dialog">Boîte de dialogue d’édition des tags</string>
     <string name="show_order_dialog" comment="Description of the shortcut that shows the order dialog">Show order dialog</string>
     <!-- Manage columns dialog -->
-    <string name="browse_manage_columns_main_heading">Columns</string>
-    <string name="browse_manage_columns">Manage columns</string>
-    <string name="user_active_columns">Active</string>
-    <string name="user_potential_columns">Available</string>
-    <string name="include_column">Include column</string>
-    <string name="exclude_column">Exclude column</string>
+    <string name="browse_manage_columns_main_heading">Colonnes</string>
+    <string name="browse_manage_columns">Gérer les colonnes</string>
+    <string name="user_active_columns">Actif</string>
+    <string name="user_potential_columns">Disponible</string>
+    <string name="include_column">Inclure la colonne</string>
+    <string name="exclude_column">Exclure la colonne</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-fr/11-arrays.xml b/AnkiDroid/src/main/res/values-fr/11-arrays.xml
index 631a04e73636..b807b211601a 100644
--- a/AnkiDroid/src/main/res/values-fr/11-arrays.xml
+++ b/AnkiDroid/src/main/res/values-fr/11-arrays.xml
@@ -84,7 +84,7 @@
     <string name="answer_good" maxLength="41">Bonne réponse</string>
     <string name="answer_easy" maxLength="41">Réponse facile</string>
     <string name="gesture_play" maxLength="41">Lire le média</string>
-    <string name="gesture_abort_learning" maxLength="41">Close reviewer</string>
+    <string name="gesture_abort_learning" maxLength="41">Fermer l\'évaluateur</string>
     <string name="gesture_flag_red" maxLength="41">Activer/désactiver la balise rouge</string>
     <string name="gesture_flag_orange" maxLength="41">Activer/désactiver la balise orange</string>
     <string name="gesture_flag_green" maxLength="41">Activer/désactiver la balise verte</string>
@@ -95,7 +95,7 @@
     <string name="gesture_flag_remove" maxLength="41">Retirer la balise</string>
     <string name="gesture_page_up" maxLength="41">Remonter</string>
     <string name="gesture_page_down" maxLength="41">Descendre</string>
-    <string name="gesture_abort_sync" maxLength="41">Close reviewer and Sync</string>
+    <string name="gesture_abort_sync" maxLength="41">Fermer l\'évaluateur et la synchronisation</string>
     <string name="gesture_toggle_whiteboard" maxLength="41">Activer le tableau blanc</string>
     <string name="gesture_show_hint" maxLength="41">Afficher l\'indice</string>
     <string name="gesture_show_all_hints" maxLength="41">Afficher tous les indices</string>
diff --git a/AnkiDroid/src/main/res/values-km/01-core.xml b/AnkiDroid/src/main/res/values-km/01-core.xml
index 210aea487e60..3bb39dc6fb89 100644
--- a/AnkiDroid/src/main/res/values-km/01-core.xml
+++ b/AnkiDroid/src/main/res/values-km/01-core.xml
@@ -45,19 +45,19 @@
 -->
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Navigation drawer items-->
-    <string name="decks" maxLength="28">Decks</string>
+    <string name="decks" maxLength="28">ជាន់</string>
     <string name="card_browser" maxLength="28" comment="The usage of card browser inside the app (note the casing)">ស្វែងរកកាត</string>
     <string name="statistics" maxLength="28">ស្ថិតិ</string>
     <string name="settings" maxLength="28">ការ​កំណត់</string>
     <string name="help" maxLength="28">ជំនួយ</string>
-    <string name="drawing">Drawing</string>
+    <string name="drawing">គំនូរ</string>
     <string name="send_feedback">ផ្ញើមតិ</string>
-    <string name="studyoptions_start">រៀន</string>
+    <string name="studyoptions_start">សិក្សា</string>
     <!-- DeckPicker.kt -->
     <string name="expand">ពន្លាត</string>
     <string name="collapse">បង្រួម</string>
     <plurals name="reviewer_window_title">
-        <item quantity="other">%d minutes left</item>
+        <item quantity="other">នៅសល់ %d នាទីទៀត</item>
     </plurals>
     <plurals name="reviewer_window_title_hours_new">
         <item quantity="other">%1$d hours %2$d left</item>
@@ -66,48 +66,48 @@
         <item quantity="other">%1$d days %2$dh left</item>
     </plurals>
     <string name="no_cards_placeholder_title">Collection is empty</string>
-    <string name="no_cards_placeholder_description">ចាប់ផ្តើមដាក់កាត\nដោយចុចសញ្ញា +</string>
+    <string name="no_cards_placeholder_description">ចាប់ផ្តើមបន្ថែមកាត\nដោយប្រើសញ្ញា +</string>
     <!-- The deck picker via AnkiStatsTaskHandler.java -->
     <!-- flashcard_portrait.xml -->
-    <string name="type_answer_hint">Type answer</string>
-    <string name="show_answer" maxLength="41">Show answer</string>
-    <string name="hide_answer">Hide answer</string>
+    <string name="type_answer_hint">វាយចម្លើយ</string>
+    <string name="show_answer" maxLength="41">បង្ហាញចម្លើយ</string>
+    <string name="hide_answer">លាក់ចម្លើយ</string>
     <string name="ease_button_again" maxLength="41">ម្ដងទៀត</string>
     <string name="ease_button_hard" maxLength="41">ពិបាក</string>
     <string name="ease_button_good" maxLength="41">ល្អ</string>
     <string name="ease_button_easy">ស្រួល</string>
-    <string name="menu_import" maxLength="28">Import</string>
-    <string name="undo" maxLength="28" comment="When tapping on this text, the last action is undone.">Undo</string>
-    <string name="redo" maxLength="28">Redo</string>
+    <string name="menu_import" maxLength="28">នាំចូល</string>
+    <string name="undo" maxLength="28" comment="When tapping on this text, the last action is undone.">មិនធ្វើវិញ</string>
+    <string name="redo" maxLength="28">ធ្វើឡើងវិញ</string>
     <string name="undo_action_whiteboard_last_stroke" comment="One of the display patterns of \'Undo\' item on the action menu in Reviewer. It is shown as the title of the item when the whiteboard (handwriting) feature is enabled and visible and has any strokes (handwritten lines)" maxLength="28">Undo stroke</string>
-    <string name="move_all_to_deck">Move all to deck</string>
-    <string name="unbury" maxLength="28">Unbury</string>
-    <string name="rename_deck" maxLength="28">Rename deck</string>
-    <string name="create_shortcut">Create shortcut</string>
-    <string name="browse_cards">Browse cards</string>
-    <string name="edit_deck_description" comment="edit the deck description">Edit description</string>
-    <string name="menu_add" comment="A generic add button. Please inform us if you need more specific strings" maxLength="28">Add</string>
-    <string name="menu_add_note" maxLength="28">Add note</string>
-    <string name="menu_my_account" comment="Label of the window in which the user should enter their account. This text can\'t be found in AnkiDroid directly.">Sync account</string>
-    <string name="menu_dismiss_note" maxLength="41">Hide / delete</string>
-    <string name="menu_bury_card" maxLength="28">Bury card</string>
-    <string name="menu_bury_note" maxLength="28">Bury note</string>
-    <string name="menu_suspend_card" maxLength="28">Suspend card</string>
-    <string name="menu_suspend_note" maxLength="28">Suspend note</string>
-    <string name="menu_bury" maxLength="28">Bury</string>
-    <string name="menu_suspend" maxLength="28">Suspend</string>
-    <string name="menu_delete_note" maxLength="28">Delete note</string>
-    <string name="menu_flag" maxLength="41">Flag</string>
-    <string name="rename_flag">Rename flags</string>
+    <string name="move_all_to_deck">ផ្លាស់ទីទាំងអស់ទៅកាន់ជាន់</string>
+    <string name="unbury" maxLength="28">ឈប់កប់</string>
+    <string name="rename_deck" maxLength="28">ប្ដូរឈ្មោះ</string>
+    <string name="create_shortcut">បង្កើតផ្លូវកាត់</string>
+    <string name="browse_cards">រកមើលកាត</string>
+    <string name="edit_deck_description" comment="edit the deck description">កែសម្រួលការពិពណ៌នា</string>
+    <string name="menu_add" comment="A generic add button. Please inform us if you need more specific strings" maxLength="28">បន្ថែម</string>
+    <string name="menu_add_note" maxLength="28">បន្ថែមកំណត់ត្រា</string>
+    <string name="menu_my_account" comment="Label of the window in which the user should enter their account. This text can\'t be found in AnkiDroid directly.">ធ្វើសមកាលកម្មគណនី</string>
+    <string name="menu_dismiss_note" maxLength="41">លាក់ / លុប</string>
+    <string name="menu_bury_card" maxLength="28">កប់កាត</string>
+    <string name="menu_bury_note" maxLength="28">កប់កំណត់ត្រា</string>
+    <string name="menu_suspend_card" maxLength="28">ផ្អាកកាត</string>
+    <string name="menu_suspend_note" maxLength="28">ផ្អាកកំណត់ត្រា</string>
+    <string name="menu_bury" maxLength="28">កប់</string>
+    <string name="menu_suspend" maxLength="28">ផ្អាក</string>
+    <string name="menu_delete_note" maxLength="28">លុបកំណត់ត្រា</string>
+    <string name="menu_flag" maxLength="41">ទង់</string>
+    <string name="rename_flag">ប្ដូរឈ្មោះទង់</string>
     <string name="menu_flag_card" maxLength="28">Flag card</string>
-    <string name="menu_edit_tags" maxLength="28">Edit tags</string>
+    <string name="menu_edit_tags" maxLength="28">កែសម្រួលស្លាក</string>
     <string name="delete_note_message">Really delete this note and all its cards?\n%s</string>
     <string name="menu_search" maxLength="28">Lookup in %1$s</string>
-    <string name="menu_mark_note" maxLength="28">Mark note</string>
-    <string name="menu_unmark_note">Unmark note</string>
+    <string name="menu_mark_note" maxLength="28">សម្គាល់កំណត់ត្រា</string>
+    <string name="menu_unmark_note">ឈប់សម្គាល់កំណត់ត្រា</string>
     <string name="menu_enable_voice_playback" maxLength="28">Enable voice playback</string>
     <string name="menu_disable_voice_playback">Disable voice playback</string>
-    <string name="new_deck">Create deck</string>
+    <string name="new_deck">បង្កើតជាន់</string>
     <string name="new_dynamic_deck">Create filtered deck</string>
     <string name="directory_inaccessible">AnkiDroid directory is inaccessible</string>
     <!--This is shown when AnkiDroid starts up with no storage permissions.
@@ -130,7 +130,7 @@
     <string name="studyoptions_congrats_next_due_in" comment="The param will be replaced with \'The next card will be ready in X time\'">Deck finished for now! %s</string>
     <string name="studyoptions_no_cards_due">No cards are due yet</string>
     <string name="sd_card_not_mounted">Device storage not mounted</string>
-    <string name="button_sync" comment="Text of the sync button" maxLength="28">Sync</string>
+    <string name="button_sync" comment="Text of the sync button" maxLength="28">សមកាលកម្ម</string>
     <string name="cancel_sync_confirm" tools:ignore="UnusedResources">Do you want to cancel the sync?</string>
     <string name="continue_sync" tools:ignore="UnusedResources">Continue sync</string>
     <string name="sync_cancelled" tools:ignore="UnusedResources">Sync cancelled</string>
@@ -140,7 +140,7 @@
     <string name="export_collection">Export collection</string>
     <string name="nothing">Nothing</string>
     <!-- Card template editor -->
-    <string name="title_activity_template_editor">Card types</string>
+    <string name="title_activity_template_editor">ប្រភេទកាត</string>
     <string name="card_template_editor_front">Front template</string>
     <string name="card_template_editor_back">Back template</string>
     <string name="card_template_editor_styling" maxLength="28">Styling</string>
@@ -165,8 +165,8 @@
     <string name="read_write_permission_label">Read and write to the AnkiDroid database</string>
     <string name="read_write_permission_description">access existing notes, cards, note types, and decks, as well as create new ones</string>
     <!-- Context Menu -->
-    <string name="card_browser_context_menu" comment="The value which appears in the system context menu. Note the casing difference">Card Browser</string>
-    <string name="context_menu_anki_card_label">Anki Card</string>
+    <string name="card_browser_context_menu" comment="The value which appears in the system context menu. Note the casing difference">ការរកមើលកាត</string>
+    <string name="context_menu_anki_card_label">កាត​ Anki</string>
     <!-- Sync conflict -->
     <string name="sync_conflict_message_new">The collections can’t be combined.\nWhich collection do you want to keep?</string>
     <string name="sync_conflict_keep_local_new" comment="Select AnkiDroid files to keep while syncing">AnkiDroid</string>
@@ -192,7 +192,7 @@
     <string name="storage_access_summary">Saves your collection in a safe place that will not be deleted if the app is uninstalled</string>
     <string name="all_files_access_title" comment="Name of the “All files access” permission from Android 10 and after">All files access</string>
     <string name="image_occlusion">Image Occlusion</string>
-    <string name="remove_account" comment="open a website to start the deletion of an AnkiWeb account">Remove account</string>
+    <string name="remove_account" comment="open a website to start the deletion of an AnkiWeb account">លុបគណនី</string>
     <!-- Instant Note Editor -->
     <string name="instant_card" comment="This does not need to be translated literally, translate the concept of quickly adding a Cloze note with a popup. Used in the Android system context menu/share dialog.">Instant card</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-km/02-strings.xml b/AnkiDroid/src/main/res/values-km/02-strings.xml
index 0fa1dec50ef3..1738d3a138bf 100644
--- a/AnkiDroid/src/main/res/values-km/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-km/02-strings.xml
@@ -45,30 +45,30 @@
 -->
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Navigation drawer strings -->
-    <string name="drawer_open">Open drawer</string>
-    <string name="drawer_close">Close drawer</string>
-    <string name="CardEditorCardDeck">Card deck:</string>
-    <string name="CardEditorNoteDeck">Deck:</string>
-    <string name="CardEditorModel">Type:</string>
+    <string name="drawer_open">បើកថត</string>
+    <string name="drawer_close">បិទថត</string>
+    <string name="CardEditorCardDeck">ជាន់របស់កាត</string>
+    <string name="CardEditorNoteDeck">ជាន់</string>
+    <string name="CardEditorModel">ប្រភេទ</string>
     <string name="CardEditorTags">Tags: %1$s</string>
     <string name="CardEditorCards">Cards: %1$s</string>
     <string name="edit_occlusions">Edit Occlusions</string>
-    <string name="tag_name">Tag name</string>
+    <string name="tag_name">ឈ្មោះស្លាក</string>
     <string name="add_new_filter_tags">Add/filter tags</string>
-    <string name="add_tag" maxLength="28">Add tag</string>
+    <string name="add_tag" maxLength="28">បន្ថែមស្លាក</string>
     <string name="check_all_tags" maxLength="28">Check/uncheck all tags</string>
     <string name="filter_tags" maxLength="28">Filter tags</string>
     <string name="no_tags">You haven’t added any tags yet</string>
     <string name="updated_version">Updated to version %s</string>
     <!-- Reviewer.kt -->
-    <string name="save_whiteboard" maxLength="28">Save whiteboard</string>
+    <string name="save_whiteboard" maxLength="28">រក្សាទុកក្ដារខៀន</string>
     <string name="enable_stylus" maxLength="28">Enable stylus writing</string>
     <string name="disable_stylus">Disable stylus writing</string>
-    <string name="enable_whiteboard" maxLength="28">Enable whiteboard</string>
-    <string name="disable_whiteboard">Disable whiteboard</string>
-    <string name="show_whiteboard">Show whiteboard</string>
-    <string name="hide_whiteboard" maxLength="28">Hide whiteboard</string>
-    <string name="clear_whiteboard" maxLength="28">Clear whiteboard</string>
+    <string name="enable_whiteboard" maxLength="28">បើកក្ដារខៀន</string>
+    <string name="disable_whiteboard">បិទក្ដារខៀន</string>
+    <string name="show_whiteboard">បង្ហាញក្ដារខៀន</string>
+    <string name="hide_whiteboard" maxLength="28">លាក់ក្ដារខៀន</string>
+    <string name="clear_whiteboard" maxLength="28">សម្អាតក្ដារខៀន</string>
     <string name="replay_audio" maxLength="28">Replay audio</string>
     <string name="leech_suspend_notification">Card marked as leech and suspended</string>
     <string name="leech_notification">Card marked as leech</string>
@@ -80,7 +80,7 @@
     <string name="webview_crash_fatal">Fatal Error: WebView renderer crashed. Cause: %s</string>
     <string name="webview_crash_loop_dialog_title">System WebView Rendering Failure</string>
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
-    <string name="filter_by_flags" maxLength="41">Flags</string>
+    <string name="filter_by_flags" maxLength="41">ទង់</string>
     <!-- Custom study options -->
     <string name="custom_study_limit_tags">Limit to particular tags</string>
     <plurals name="studyoptions_buried_count">
@@ -89,16 +89,16 @@
     <string name="studyoptions_total_new_label">Total new cards</string>
     <string name="studyoptions_total_label">Total cards</string>
     <!-- Card editor -->
-    <string name="cardeditor_title_edit_card" maxLength="28">Edit note</string>
+    <string name="cardeditor_title_edit_card" maxLength="28">កែសម្រួលកំណត់ត្រា</string>
     <string name="discard">Discard</string>
     <string name="note_editor_no_cards_created">No cards created. Please fill in more fields</string>
     <string name="note_editor_no_cards_created_all_fields">The current note type did not produce any cards.\nPlease choose another note type, or click ‘Cards’ and add a field substitution</string>
     <string name="note_editor_insert_cloze_no_cloze_note_type">Cloze deletions will only work on a Cloze note type</string>
-    <string name="saving_facts">Saving note</string>
-    <string name="saving_model">Saving note type</string>
-    <string name="save" maxLength="28">Save</string>
-    <string name="close">Close</string>
-    <string name="select">Select</string>
+    <string name="saving_facts">កំពុងរក្សាទុកកំណត់ត្រា</string>
+    <string name="saving_model">កំពុងរក្សាទុកប្រភេទកំណត់ត្រា</string>
+    <string name="save" maxLength="28">រក្សាទុក</string>
+    <string name="close">បិទ</string>
+    <string name="select">ជ្រើសរើស</string>
     <string name="field_remapping">%1$s (from “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Any cards mapped to nothing will be deleted. If a note has no remaining cards, it will be lost. Are you sure you want to continue?</string>
     <string name="missing_note_type">No note type found</string>
@@ -126,14 +126,14 @@
     <string name="empty_cards" maxLength="28">Empty cards</string>
     <string name="unknown_type_field_warning">Type answer: unknown field %s</string>
     <string name="delete_deck">Deleting deck&#8230;</string>
-    <string name="info_rate">Rate AnkiDroid</string>
-    <string name="import_title">Importing</string>
+    <string name="info_rate">វាយតម្លៃ AnkiDroid</string>
+    <string name="import_title">ការនាំចូល</string>
     <string name="import_preparing_file">Preparing file for import&#8230;</string>
     <string name="import_message_add" comment="Adding a new deck to the collection (import)">ថែម</string>
     <string name="import_message_replace_confirm">This will delete your existing collection and replace it with the data of file %s</string>
     <string name="import_dialog_message_add">Add “%s” to collection? This may take a long time</string>
     <string name="import_log_no_apkg">This isn’t a valid Anki package file</string>
-    <string name="import_title_error" comment="Title of error dialog">Error</string>
+    <string name="import_title_error" comment="Title of error dialog">កំហុស</string>
     <string name="import_error_handle_exception">Failed to import file\n\n%s</string>
     <string name="import_error_not_apkg_extension">Filename “%s” doesn’t have .apkg or .colpkg extension</string>
     <string name="import_error_load_imported_database">Anki Database (.anki2) replacements are not yet supported. Please see the manual for replacement instructions.</string>
@@ -141,7 +141,7 @@
     <string name="import_error_copy_to_cache">Failed to cache file (possibly out of storage space)</string>
     <string name="import_interrupted">Import interrupted: AnkiDroid was closed</string>
     <string name="export_preparation_in_progress">Preparing export&#8230;</string>
-    <string name="export_ready_title">Export ready</string>
+    <string name="export_ready_title">ការនាំចេញគឺរួចរាល់</string>
     <string name="export_send_no_handlers">No applications available to handle apkg. Saving&#8230;</string>
     <string name="export_save_apkg_successful">Successfully saved Anki package</string>
     <string name="export_save_apkg_unsuccessful">Save Anki package failed</string>
@@ -154,13 +154,13 @@
         [1] %1$s<br/>
         [2] %2$s
         ]]></string>
-    <string name="export_choice_share">Share</string>
-    <string name="export_choice_save_to">Save to</string>
+    <string name="export_choice_share">ចែករំលែក</string>
+    <string name="export_choice_save_to">រក្សាទុកនៅ</string>
     <string name="export_saving_exported_collection">Saving exported file&#8230;</string>
-    <string name="study_options" comment="Name for a preference category in Filtered deck (aka Cram deck, aka Custom study) options" maxLength="28">Options</string>
-    <string name="menu__deck_options" maxLength="28">Deck options</string>
-    <string name="menu__study_options" comment="Menu item that opens options for a Filtered deck (aka Cram deck, aka Custom study)">Study options</string>
-    <string name="select_tts" maxLength="28">Set TTS language</string>
+    <string name="study_options" comment="Name for a preference category in Filtered deck (aka Cram deck, aka Custom study) options" maxLength="28">ជម្រើស</string>
+    <string name="menu__deck_options" maxLength="28">ជម្រើសជាន់</string>
+    <string name="menu__study_options" comment="Menu item that opens options for a Filtered deck (aka Cram deck, aka Custom study)">ជម្រើសសិក្សា</string>
+    <string name="select_tts" maxLength="28">កំណត់ភាសា​ TTS</string>
     <string name="custom_study" maxLength="28">Custom study</string>
     <string name="dyn_deck_desc">This is a special deck for studying outside of the normal schedule. Cards will be automatically returned to their original decks after you review them. Deleting this deck from the deck list will return all remaining cards to their original deck.</string>
     <string name="steps_error">Steps must be numbers greater than 0</string>
@@ -168,7 +168,7 @@
     <string name="tag_editor_add_feedback">Touch “%2$s” to confirm adding “%1$s”</string>
     <string name="tag_editor_add_feedback_existing">Existing tag “%1$s” selected</string>
     <!-- Time spans -->
-    <string name="reminder_title">Do not forget to study today!</string>
+    <string name="reminder_title">កុំភ្លេចរៀនថ្ងៃនេះ!</string>
     <plurals name="reminder_text">
         <item quantity="other">%2$d cards to review in %1$s</item>
     </plurals>
@@ -181,16 +181,16 @@
     <string name="web_page_error">Error loading page: %s</string>
     <!-- The name of the deck which corrupt cards will be moved to -->
     <!-- Deckpicker Background -->
-    <string name="background_image_title" maxLength="41">Background</string>
-    <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_background_image">Remove background?</string>
+    <string name="background_image_title" maxLength="41">ផ្ទៃខាងក្រោយ</string>
+    <string name="choose_an_image" maxLength="41">ជ្រើសរើសរូបភាព</string>
+    <string name="remove_background_image">ដកផ្ទៃខាងក្រោយចេញ?</string>
     <!-- Card Template Browser Appearance -->
-    <string name="restore_default" maxLength="28">Restore Default</string>
+    <string name="restore_default" maxLength="28">ស្តារលំនាំដើមឡើងវិញ</string>
     <string name="reviewer_tts_cloze_spoken_replacement">Blank</string>
     <!-- Whiteboard save image message in Reviewer -->
-    <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
+    <string name="white_board_image_save_failed">បរាជ័យក្នុងការរក្សាទុករូបភាពរបស់ក្ដារខៀន។ %s</string>
     <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
+    <string name="title_whiteboard_editor" maxLength="28">ការកែសម្រួលក្ដារខៀន</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
     <string name="api_version_developer_contact">This card uses unsupported AnkiDroid features. Contact developer %1$s, or view the wiki. %2$s</string>
@@ -216,7 +216,7 @@
     <string name="format_insert_underline">Format as Underline</string>
     <string name="insert_horizontal_line">Insert Horizontal Line</string>
     <string name="insert_heading">Insert Heading</string>
-    <string name="format_font_size">Change Font Size</string>
+    <string name="format_font_size">ប្ដូរទំហំពុម្ពអក្សរ</string>
     <string name="insert_mathjax">Insert MathJax Equation</string>
     <string name="note_editor_toolbar_icon">Button text</string>
     <string name="before_text">HTML Before Selection</string>
@@ -243,28 +243,28 @@
     <string name="back_pressed_once">Press back again to exit</string>
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
-    <string name="download_deck">Download deck</string>
-    <string name="try_again">Try Again</string>
+    <string name="download_deck">ទាញយកជាន់</string>
+    <string name="try_again">ព្យាយាមម្ដងទៀត</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>
     <string name="downloading_file">Downloading %s</string>
-    <string name="import_deck">Import Deck</string>
+    <string name="import_deck">នាំចូលជាន់</string>
     <string name="something_wrong">Something went wrong, please try again</string>
-    <string name="download_failed">Download failed</string>
-    <string name="deck_download_progress_message">You can use other apps while the download is running</string>
-    <string name="check_network">Please check your network connection</string>
-    <string name="search_using_deck_name">Search using deck name</string>
+    <string name="download_failed">ការទាញយកបានបរាជ័យ</string>
+    <string name="deck_download_progress_message">អ្នកអាចប្រើកម្មវិធីដទៃទៀតអំឡុងពេលទាញយក</string>
+    <string name="check_network">សូមពិនិត្យការភ្ជាប់បណ្ដាញរបស់អ្នក</string>
+    <string name="search_using_deck_name">ស្វែងរកដោយប្រើឈ្មោះជាន់</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
     <!-- Reviewer actions 
     Each of these strings ends with a period, following the notation of Anki Desktop -->
-    <string name="card_buried">Card buried.</string>
+    <string name="card_buried">កាតបានកប់។</string>
     <plurals name="note_suspended">
         <item quantity="other">%d cards suspended.</item>
     </plurals>
     <!--  Note Editor Toggle Sticky  -->
     <string name="note_editor_toggle_sticky">Make field %s sticky</string>
-    <string name="scoped_storage_learn_more">Learn More</string>
+    <string name="scoped_storage_learn_more">ស្វែងយល់បន្ថែម</string>
     <string name="search_card_js_api_no_results">Search returned no results</string>
     <!--  JS Addons  -->
     <string name="not_valid_js_addon_package">%s is not a valid JavaScript addon package</string>
@@ -292,50 +292,46 @@
     <!-- Deck Deletion -->
     <string name="deck_shortcut_doesnt_exist">Deck deleted. Please remove the shortcut</string>
     <!-- Browser Options Dialog -->
-    <string name="show_cards" comment="Label for toggle cards button in BrowserOptionsDialog">Cards</string>
-    <string name="show_notes" comment="Label for toggle notes button in BrowserOptionsDialog">Notes</string>
+    <string name="show_cards" comment="Label for toggle cards button in BrowserOptionsDialog">កាត</string>
+    <string name="show_notes" comment="Label for toggle notes button in BrowserOptionsDialog">កំណត់ត្រា</string>
     <string name="toggle_cards_notes">Toggle Cards/Notes</string>
     <string name="truncate_content_help">Truncate the height of each row of the Browser to show only first 3 lines of content</string>
-    <string name="browser_options_dialog_heading">Browser options</string>
-    <string name="audio_saved">Recording saved</string>
-    <string name="deleting_selected_notes">Deleting selected notes</string>
+    <string name="browser_options_dialog_heading">ជម្រើសក្នុងការរុករក</string>
+    <string name="audio_saved">ការថតទុកត្រូវបានរក្សាទុក</string>
+    <string name="deleting_selected_notes">លុបកំណត់ត្រាដែលបានរើស</string>
     <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
     </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">សំឡេងគួរតែត្រូវបានដំឡើងមុនពេលប្រើ</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">នៅតែប្រើ</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">អ៊ីនធឺណិត</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">ដំឡើង</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
     </string>
-    <string name="shared_decks_login_required">Please log in to download more decks</string>
+    <string name="shared_decks_login_required">សូមចុះឈ្មោះចូលដើម្បីទាញយកជាន់ច្រើនទៀត</string>
     <string name="deck_description_field_hint">Description</string>
-    <string name="failed_to_copy">Failed to copy</string>
+    <string name="failed_to_copy">បរាជ័យក្នុងការចម្លង</string>
     <string name="card_browser_unavailable_when_notes_mode">Unavailable in ‘Notes’ mode</string>
     <plurals name="unbury_cards_feedback">
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
-    <string name="start_recording">Record</string>
-    <string name="stop_recording">Stop</string>
-    <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="start_recording">ថត</string>
+    <string name="stop_recording">ឈប់</string>
+    <string name="play_recording">លេង</string>
+    <string name="next_recording">បន្ទាប់</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
-    <string name="orphan_note_title">Cannot Delete Card Type</string>
+    <string name="orphan_note_title">មិនអាចលុបប្រភេទកាត</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
-    <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
-    <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
-    <string name="select_deck" comment="Description of the shortcut that opens the deck selection dialog">Select deck</string>
-    <string name="select_note_type" comment="Description of the shortcut that shows the note selection spinner">Select note type</string>
-    <string name="tag_editor" comment="Description of the shortcut that opens the tags dialog">Tag editor</string>
+    <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">លុបជាន់ដោយមិនបាច់បញ្ជាក់</string>
+    <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">ការកែសម្រួលកំណត់ត្រា</string>
+    <string name="select_deck" comment="Description of the shortcut that opens the deck selection dialog">ជ្រើសរើសជាន់</string>
+    <string name="select_note_type" comment="Description of the shortcut that shows the note selection spinner">ជ្រើសរើសប្រភេទកំណត់ត្រា</string>
+    <string name="tag_editor" comment="Description of the shortcut that opens the tags dialog">ការកែសម្រួលស្លាក</string>
     <string name="card_template_editor_group" comment="Label for the group of shortcuts related to the card template editor">Card Template Editor</string>
     <string name="edit_front_template" comment="Description of the shortcut that shows the question side of the card template">Edit front template</string>
     <string name="edit_back_template" comment="Description of the shortcut that shows the answer side of the card template">Edit back template</string>
diff --git a/AnkiDroid/src/main/res/values-km/03-dialogs.xml b/AnkiDroid/src/main/res/values-km/03-dialogs.xml
index d4e9fbd9850c..94f28d1f119a 100644
--- a/AnkiDroid/src/main/res/values-km/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-km/03-dialogs.xml
@@ -45,15 +45,15 @@
 -->
 <resources xmlns:tools="http://schemas.android.com/tools">
     <string name="check_db_title">ពិនិត្យទិន្នន័យ?</string>
-    <string name="check_db_warning">This may take a long time</string>
-    <string name="contextmenu_deckpicker_delete_deck" maxLength="28">Delete deck</string>
-    <string name="delete_deck_title">Delete deck?</string>
+    <string name="check_db_warning">នេះអាចចំណាយពេលយូរ</string>
+    <string name="contextmenu_deckpicker_delete_deck" maxLength="28">លុបជាន់</string>
+    <string name="delete_deck_title">លុបជាន់?</string>
     <plurals name="delete_deck_message">
         <item quantity="other">Delete all cards in %1$s? It contains %2$d cards</item>
     </plurals>
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">No text-to-speech language available</string>
-    <string name="tts_no_tts">Don’t speak</string>
+    <string name="tts_no_tts">កុំនិយាយ</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
     <string name="reset_card_dialog_title">Reset card progress</string>
     <plurals name="reset_cards_dialog_acknowledge">
@@ -61,7 +61,7 @@
     </plurals>
     <string name="answering_error_title">Database error</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
-    <string name="answering_error_report">Report error</string>
+    <string name="answering_error_report">រាយការណ៍កំហុស</string>
     <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
@@ -77,23 +77,23 @@
     <string name="no_space_to_downgrade_content" tools:ignore="UnusedResources">AnkiDroid needs %s free storage space to continue. Please clear some space</string>
     <string name="restore_backup_title">Restore backup?</string>
     <string name="restore_backup">Your collection will be replaced with an older copy. Any unsaved progress will be lost.</string>
-    <string name="restore_backup_choose_another">Choose another</string>
-    <string name="dialog_cancel">Cancel</string>
+    <string name="restore_backup_choose_another">រើសផ្សេងទៀត</string>
+    <string name="dialog_cancel">បោះបង់</string>
     <string name="dialog_ok">OK</string>
-    <string name="dialog_confirm" tools:ignore="UnusedResources">Confirm</string>
-    <string name="dialog_no">No</string>
+    <string name="dialog_confirm" tools:ignore="UnusedResources">បញ្ជាក់</string>
+    <string name="dialog_no">ទេ</string>
     <string name="dialog_yes">បាទ/ចាស</string>
-    <string name="dialog_keep">Keep</string>
-    <string name="dialog_remove">Remove</string>
-    <string name="dialog_continue">Continue</string>
+    <string name="dialog_keep">រក្សាទុក</string>
+    <string name="dialog_remove">ដកចេញ</string>
+    <string name="dialog_continue">បន្ត</string>
     <string name="dialog_processing">Processing&#8230;</string>
-    <string name="dialog_positive_create" comment="Create a new collection, probably erasing the previous one, may be necessary in case of error.">Create</string>
-    <string name="dialog_positive_delete" maxLength="28">Delete</string>
+    <string name="dialog_positive_create" comment="Create a new collection, probably erasing the previous one, may be necessary in case of error.">បង្កើត</string>
+    <string name="dialog_positive_delete" maxLength="28">លុប</string>
     <!-- Currently unsued, should be useful in the future -->
-    <string name="dialog_positive_disable" tools:ignore="UnusedResources">Disable</string>
+    <string name="dialog_positive_disable" tools:ignore="UnusedResources">បិទ</string>
     <string name="dialog_positive_overwrite">Overwrite</string>
-    <string name="dialog_positive_repair">Repair</string>
-    <string name="dialog_positive_replace">Replace</string>
+    <string name="dialog_positive_repair">ជួសជុល</string>
+    <string name="dialog_positive_replace">ជំនួស</string>
     <string name="dialog_collection_path_not_dir">The path specified wasn’t a valid directory</string>
     <string name="dialog_invalid_custom_certificate">The provided text does not resolve to a valid PEM-encoded X509 certificate</string>
     <string name="dialog_invalid_custom_certificate_title">Error parsing certificate</string>
@@ -139,10 +139,10 @@
     <string name="incompatible_database_version_summary">The database is a more advanced version than this version of AnkiDroid can work with. Upgrade AnkiDroid or downgrade the database to open it\n\nSupported version: %1$d\nDatabase version: %2$d\n\nThe following restore options will overwrite your current collection, possibly with a compatible database version:</string>
     <!-- Deck Picker Background-->
     <string name="background_image_applied">Background image applied</string>
-    <string name="background_image_removed">Background image removed</string>
-    <string name="no_image_selected">No image selected</string>
+    <string name="background_image_removed">រូបផ្ទៃខាងក្រោយត្រូវបានដកចេញ</string>
+    <string name="no_image_selected">គ្មានរូបភាពត្រូវបានជ្រើសរើស</string>
     <string name="error_selecting_image">Error selecting image. Please see manual. %s</string>
-    <string name="error_deleting_image">Error deleting image</string>
+    <string name="error_deleting_image">បញ្ហាក្នុងការលុបរូបភាព</string>
     <string name="failed_to_apply_background_image">Failed to apply background image %s</string>
     <string name="background_image_too_large">Deck Picker background too large</string>
     <string name="image_max_size_allowed">Maximum image size %d MB allowed</string>
@@ -154,24 +154,24 @@
     <string name="boot_service_failed_to_schedule_notifications">Failed to schedule reminders</string>
     <string name="boot_service_too_many_notifications">Too many reminders scheduled. Some will not appear</string>
     <!-- Locale Selection Dialog -->
-    <string name="locale_selection_dialog_title_new">Set Language</string>
+    <string name="locale_selection_dialog_title_new">កំណត់ភាសា</string>
     <string name="locale_selection_dialog_summary">Some multilingual keyboards, such as GBoard support changing language when editing text\n\nPlease request the “setImeHintLocales” feature from your keyboard manufacturer if your keyboard does not change language.</string>
     <!-- Help Dialog -->
-    <string name="help_title_using_ankidroid">Using AnkiDroid</string>
-    <string name="help_item_ankidroid_manual">AnkiDroid Manual</string>
-    <string name="help_item_anki_manual">Anki Manual</string>
+    <string name="help_title_using_ankidroid">ការប្រើប្រាស់ AnkiDroid</string>
+    <string name="help_item_ankidroid_manual">សៀវភៅ manual របស់ AnkiDroid</string>
+    <string name="help_item_anki_manual">សៀវភៅ manual របស់ AnkiDroid</string>
     <string name="help_item_ankidroid_faq">AnkiDroid FAQ</string>
     <string name="help_title_get_help">Get Help</string>
     <string name="help_item_mailing_list">Mailing List</string>
     <string name="help_item_reddit">Reddit</string>
     <string name="help_item_report_bug">Report a Bug</string>
-    <string name="help_title_support_ankidroid" maxLength="28">Support AnkiDroid</string>
-    <string name="help_item_support_opencollective_donate">Donate</string>
-    <string name="help_item_support_develop_ankidroid">Develop</string>
-    <string name="help_item_support_rate_ankidroid">Rate</string>
-    <string name="help_item_support_other_ankidroid">Other</string>
-    <string name="multimedia_editor_trans_translate">Translate</string>
-    <string name="help_title_community">Community</string>
+    <string name="help_title_support_ankidroid" maxLength="28">គាំទ្រ AnkiDroid</string>
+    <string name="help_item_support_opencollective_donate">ឧបត្ថម្ភ</string>
+    <string name="help_item_support_develop_ankidroid">អភិវឌ្ឍ</string>
+    <string name="help_item_support_rate_ankidroid">វាយតម្លៃ</string>
+    <string name="help_item_support_other_ankidroid">ផ្សេងទៀត</string>
+    <string name="multimedia_editor_trans_translate">បកប្រែ</string>
+    <string name="help_title_community">សហគមន៍</string>
     <string name="help_item_anki_forums">Anki Forums</string>
     <string name="help_item_discord">Discord</string>
     <string name="help_item_facebook">Facebook</string>
@@ -224,26 +224,26 @@
         <item quantity="other">Show cards in range</item>
     </plurals>
     <plurals name="set_due_date_label_suffix" comment="a suffix on a text field allowing a user to enter a number of days">
-        <item quantity="other">days</item>
+        <item quantity="other">ថ្ងៃ</item>
     </plurals>
     <string name="range_delimiter" comment="Placed between two input boxes to denote a range">–</string>
-    <string name="set_due_date_range_start" comment="\'Set Due Date\' may change the due date of a card to a random number of days in the future. This labels the \'minimum\' value of this range (inclusive)">From</string>
-    <string name="set_due_date_range_end" comment="\'Set Due Date\' may change the due date of a card to a random number of days in the future. This labels the \'maximum\' value of this range (inclusive)">To</string>
+    <string name="set_due_date_range_start" comment="\'Set Due Date\' may change the due date of a card to a random number of days in the future. This labels the \'minimum\' value of this range (inclusive)">ពី</string>
+    <string name="set_due_date_range_end" comment="\'Set Due Date\' may change the due date of a card to a random number of days in the future. This labels the \'maximum\' value of this range (inclusive)">ទៅ</string>
     <!-- Instant Note Editor -->
     <string name="cloze_note_required">Cloze Type Note Required</string>
     <string name="cloze_not_found_message">No Cloze type note found, open the Note Editor or try again after adding a Cloze type note.</string>
-    <string name="open">Open</string>
+    <string name="open">បើក</string>
     <string name="change_cloze_number">Change cloze number</string>
     <string name="cloze_number">Cloze number:</string>
     <string name="change_editor_mode">Change editor mode</string>
-    <string name="open_note_editor">Open note editor</string>
+    <string name="open_note_editor">បើកការកែសម្រួលកំណត់ត្រា</string>
     <string name="change_cloze_mode">Change cloze mode</string>
     <!-- Outdated WebView dialog -->
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
     <string name="compress">Compress</string>
     <!-- Tts playback error dialog -->
-    <string name="tts_error_dialog_title">Language not supported</string>
+    <string name="tts_error_dialog_title">ភាសាមិនត្រូវបានគាំទ្រ</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
-    <string name="tts_error_dialog_change_button_text">Change engine</string>
-    <string name="tts_error_dialog_supported_voices_button_text">Voice options</string>
+    <string name="tts_error_dialog_change_button_text">ប្ដូរម៉ាស៊ីន</string>
+    <string name="tts_error_dialog_supported_voices_button_text">ជម្រើសសំឡេង</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-km/04-network.xml b/AnkiDroid/src/main/res/values-km/04-network.xml
index 1f54e13d8a8e..6e149702a538 100644
--- a/AnkiDroid/src/main/res/values-km/04-network.xml
+++ b/AnkiDroid/src/main/res/values-km/04-network.xml
@@ -45,19 +45,19 @@
 
 -->
 <resources>
-    <string name="youre_offline">You are offline</string>
-    <string name="sync_error">Sync error</string>
-    <string name="vague_error" comment="Network error dialog title">Error</string>
-    <string name="retry">Retry</string>
-    <string name="menu_get_shared_decks">Get shared decks</string>
+    <string name="youre_offline">អ្នកគ្មានអ៊ីនធឺណិតទេ</string>
+    <string name="sync_error">បញ្ហាធ្វើសមកាលកម្ម</string>
+    <string name="vague_error" comment="Network error dialog title">បញ្ហា</string>
+    <string name="retry">ព្យាយាមម្ដងទៀត</string>
+    <string name="menu_get_shared_decks">ទាញយកជាន់ដោយសេរី</string>
     <string name="connection_error_message">A network error has occurred</string>
     <string name="not_logged_in_title">Log in to AnkiWeb</string>
     <string name="login_create_account_message">You must log in to a third party account to use the cloud sync service. You can create one in the next step.</string>
     <!-- MyAccount.kt -->
     <string name="username">Email address</string>
-    <string name="password">Password</string>
+    <string name="password">ពាក្យសម្ងាត់</string>
     <string name="log_in">Log in</string>
-    <string name="sign_up_description">Don’t have an AnkiWeb account? It’s free!</string>
+    <string name="sign_up_description">មិនមានគណនី AnkiWeb? វា free ទេ!</string>
     <string name="sign_up_not_affiliated">Note: AnkiWeb is not affiliated with AnkiDroid</string>
     <string name="sign_up">Sign up</string>
     <string name="logged_as">Logged in as</string>
diff --git a/AnkiDroid/src/main/res/values-km/05-feedback.xml b/AnkiDroid/src/main/res/values-km/05-feedback.xml
index a57e0a3e12da..e9eb0d517e85 100644
--- a/AnkiDroid/src/main/res/values-km/05-feedback.xml
+++ b/AnkiDroid/src/main/res/values-km/05-feedback.xml
@@ -53,7 +53,7 @@
     <string name="feedback_auto_toast_text">AnkiDroid has encountered a problem; a report is being sent to the developers&#8230;</string>
     <string name="feedback_for_manual_toast_text">An error report is being prepared for the developers&#8230;</string>
     <string name="feedback_copy_debug">Copy debug info</string>
-    <string name="feedback_report">Report</string>
-    <string name="feedback_report_automatically">Send error reports automatically</string>
+    <string name="feedback_report">រាយការណ៍</string>
+    <string name="feedback_report_automatically">ផ្ញើការរាយការណ៍អំពីបញ្ហាដោយស្វ័យប្រវត្តិ</string>
     <string name="feedback_no_suitable_app_found">No suitable app found</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-km/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-km/07-cardbrowser.xml
index e0a98d9726dd..e0f529787d4d 100644
--- a/AnkiDroid/src/main/res/values-km/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-km/07-cardbrowser.xml
@@ -51,29 +51,29 @@
     <plurals name="card_browser_subtitle_notes_mode">
         <item quantity="other">%d notes shown</item>
     </plurals>
-    <string name="card_browser_all_decks">All decks</string>
+    <string name="card_browser_all_decks">ជាន់ទាំងអស់</string>
     <plurals name="card_browser_delete_notes">
-        <item quantity="other">Delete notes</item>
+        <item quantity="other">លុបកំណត់ត្រា</item>
     </plurals>
-    <string name="card_browser_change_deck" maxLength="28">Change deck</string>
-    <string name="delete_card_title">Delete note?</string>
+    <string name="card_browser_change_deck" maxLength="28">ប្ដូរជាន់</string>
+    <string name="delete_card_title">លុបកំណត់ត្រា?</string>
     <string name="card_browser_show_marked" maxLength="28">Filter marked</string>
     <string name="card_browser_show_suspended" maxLength="28">Filter suspended</string>
     <string name="card_browser_search_by_tag" maxLength="28">Filter by tag</string>
     <string name="card_browser_search_by_flag" maxLength="28">Filter by flag</string>
-    <string name="card_browser_list_my_searches" maxLength="28">My searches</string>
-    <string name="card_browser_list_my_searches_save" maxLength="28">Save search</string>
-    <string name="card_browser_list_my_searches_title">Choose a saved search</string>
+    <string name="card_browser_list_my_searches" maxLength="28">ការស្វែងរករបស់ខ្ញុំ</string>
+    <string name="card_browser_list_my_searches_save" maxLength="28">រក្សាការស្វែងរក</string>
+    <string name="card_browser_list_my_searches_title">រើសការស្វែងរក</string>
     <string name="card_browser_list_my_searches_new_name">Name for the current search</string>
-    <string name="card_browser_list_my_searches_new_search_error_empty_name">You can’t save a search without a name</string>
-    <string name="card_browser_list_my_searches_new_search_error_dup">Name exists</string>
+    <string name="card_browser_list_my_searches_new_search_error_empty_name">អ្នកមិនអាចរក្សាទុកលទ្ធផលស្វែងរកដោយមិនមានឈ្មោះឡើយ</string>
+    <string name="card_browser_list_my_searches_new_search_error_dup">ឈ្មោះមានហើយ</string>
     <string name="no_note_to_edit">No note to edit</string>
     <string name="card_browser_list_my_searches_remove_content">Delete “%1$s”?</string>
     <string name="card_browser_change_display_order" maxLength="28">Change display order</string>
-    <string name="card_browser_search_hint" comment="Message displayed in the search text field in the card browser.">Search</string>
-    <string name="card_browser_cram_search" maxLength="28" comment="Menu entry to start a search.">Search</string>
+    <string name="card_browser_search_hint" comment="Message displayed in the search text field in the card browser.">ស្វែងរក</string>
+    <string name="card_browser_cram_search" maxLength="28" comment="Menu entry to start a search.">ស្វែងរក</string>
     <string name="card_browser_change_display_order_title">Choose display order</string>
-    <string name="card_details_tags">Tags</string>
+    <string name="card_details_tags">ស្លាក</string>
     <string-array name="card_browser_order_labels">
         <item>No sorting (faster)</item>
         <item>By sort field</item>
@@ -86,18 +86,18 @@
         <item>By reviews</item>
         <item>By lapses</item>
     </string-array>
-    <string name="card_browser_select_all" maxLength="28">Select all</string>
-    <string name="card_browser_select_none" maxLength="28">Select none</string>
+    <string name="card_browser_select_all" maxLength="28">ជ្រើសរើសទាំងអស់</string>
+    <string name="card_browser_select_none" maxLength="28">មិនជ្រើសរើស</string>
     <string name="card_browser_no_cards_in_deck">No cards found in deck ‘%s’</string>
-    <string name="card_browser_search_all_decks">Search all decks</string>
+    <string name="card_browser_search_all_decks">ស្វែងរកជាន់ទាំងអស់</string>
     <string name="card_browser_unknown_deck_name">Unknown</string>
     <string name="card_browser_truncate" comment="allows users to show less of a field value">Truncate content</string>
     <string name="set_due_date_hintText" comment="plural set_due_date_label_suffix is used for parameters, parameter 1 is the plural for 0, parameter 2 is the plural for 1">Today is ‘0 %1$s’, tomorrow is ‘1 %2$s’, etc&#8230;</string>
     <plurals name="card_browser_export_cards">
-        <item quantity="other">Export cards</item>
+        <item quantity="other">នាំចេញកាត</item>
     </plurals>
     <plurals name="card_browser_export_notes">
-        <item quantity="other">Export notes</item>
+        <item quantity="other">នាំចេញកំណត់ត្រា</item>
     </plurals>
     <plurals name="card_browser_cards_deleted">
         <item quantity="other">%d cards deleted</item>
@@ -108,7 +108,7 @@
     <!-- Manage columns dialog -->
     <string name="browse_manage_columns_main_heading">Columns</string>
     <string name="browse_manage_columns">Manage columns</string>
-    <string name="user_active_columns">Active</string>
+    <string name="user_active_columns">សកម្ម</string>
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
diff --git a/AnkiDroid/src/main/res/values-km/08-widget.xml b/AnkiDroid/src/main/res/values-km/08-widget.xml
index 31452e661084..75ec8265016e 100644
--- a/AnkiDroid/src/main/res/values-km/08-widget.xml
+++ b/AnkiDroid/src/main/res/values-km/08-widget.xml
@@ -49,22 +49,22 @@
     <plurals name="widget_minimum_cards_due_notification_ticker_text">
         <item quantity="other">%d AnkiDroid cards due</item>
     </plurals>
-    <string name="widget_small" comment="Label of the small ankidroid widget. This text can\'t be found directly in AnkiDroid">AnkiDroid small</string>
+    <string name="widget_small" comment="Label of the small ankidroid widget. This text can\'t be found directly in AnkiDroid">AnkiDroid តូច</string>
     <plurals name="widget_cards_due">
         <item quantity="other">%d cards due</item>
     </plurals>
     <plurals name="widget_eta">
         <item quantity="other">%d minutes remaining</item>
     </plurals>
-    <string name="widget_add_note_button">Add new AnkiDroid note</string>
+    <string name="widget_add_note_button">បន្ថែមកំណត់ត្រា AnkiDroid ថ្មី</string>
     <string name="deck_picker_widget_description" comment="Title of the Deck Picker Widget. Displayed to the user in Android\'s Widget Selection menu">Deck Picker</string>
     <string name="card_analysis_extra_widget_description">Card Analysis</string>
     <!-- Strings to explain usage in Deck Picker and Card Analysis Widget Configuration screen -->
-    <string name="select_decks_title" comment="Title for Deck Selection Dialog">Select decks</string>
-    <string name="select_deck_title" comment="Title for Deck Selection Dialog">Select a deck</string>
+    <string name="select_decks_title" comment="Title for Deck Selection Dialog">ជ្រើសរើសជាន់</string>
+    <string name="select_deck_title" comment="Title for Deck Selection Dialog">ជ្រើសរើសជាន់មួយ</string>
     <string name="no_selected_deck_placeholder_title" comment="Placeholder title when no decks are selected">Select decks to display in the widget. Select decks with the + icon.</string>
-    <string name="deck_removed_from_widget" comment="Snackbar when deck is removed from widget">Deck removed</string>
-    <string name="deck_already_selected_message" comment="Snackbar when user try to select the same deck again">This deck is already selected</string>
+    <string name="deck_removed_from_widget" comment="Snackbar when deck is removed from widget">ជាន់ត្រូវបានដកចេញ</string>
+    <string name="deck_already_selected_message" comment="Snackbar when user try to select the same deck again">ជាន់នេះត្រូវបានជ្រើសរើសហើយ</string>
     <plurals name="deck_limit_reached">
         <item quantity="other">You can select up to %d decks.</item>
     </plurals>
diff --git a/AnkiDroid/src/main/res/values-km/09-backup.xml b/AnkiDroid/src/main/res/values-km/09-backup.xml
index 57e182918a6f..24018f299ebd 100644
--- a/AnkiDroid/src/main/res/values-km/09-backup.xml
+++ b/AnkiDroid/src/main/res/values-km/09-backup.xml
@@ -53,8 +53,8 @@
     <string name="backup_one_way_sync_from_server">One-way sync from server</string>
     <string name="backup_full_sync_from_server_question">Overwrite your collection with the one from AnkiWeb? This will drop all your learning progress and added information since your last sync.</string>
     <string name="error_handling_title">Error handling</string>
-    <string name="error_handling_options" comment="In a warning message, the label of the suggested action that the user should take">Options</string>
-    <string name="backup_retry_opening">Retry opening</string>
+    <string name="error_handling_options" comment="In a warning message, the label of the suggested action that the user should take">ជម្រើស</string>
+    <string name="backup_retry_opening">ព្យាយាមបើកម្ដងទៀត</string>
     <string name="backup_error_menu_repair">Repair database</string>
     <!-- Collection used to be called deck. Name is kept for consistency with translation software -->
     <string name="backup_repair_deck_progress">Repairing database&#8230;</string>
diff --git a/AnkiDroid/src/main/res/values-km/10-preferences.xml b/AnkiDroid/src/main/res/values-km/10-preferences.xml
index 0b680887a4dd..d0dd398e541e 100644
--- a/AnkiDroid/src/main/res/values-km/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-km/10-preferences.xml
@@ -45,63 +45,63 @@
 -->
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- generic strings -->
-    <string name="disabled">Disabled</string>
+    <string name="disabled">បានបិទ</string>
     <plurals name="pref_summ_minutes">
         <item quantity="other">%d mins</item>
     </plurals>
     <string name="pref_milliseconds">%s ms</string>
     <!-- TODO: move to 20-search-preference so we can contribute upstream (searchpreference_no_results)-->
-    <string name="pref_search_no_results">No results</string>
+    <string name="pref_search_no_results">គ្មានលទ្ធផល</string>
     <!-- preferences.xml categories-->
-    <string name="pref_cat_general" comment="name of the general preference category" maxLength="41">General</string>
-    <string name="pref_cat_studying" maxLength="41">Studying</string>
+    <string name="pref_cat_general" comment="name of the general preference category" maxLength="41">ទូទៅ</string>
+    <string name="pref_cat_studying" maxLength="41">ការសិក្សា</string>
     <string name="pref_cat_system_wide" maxLength="41">System-wide</string>
     <string name="pref_cat_reviewing" maxLength="41">Reviewing</string>
-    <string name="pref_cat_sync" comment="title of the sync preferences category" maxLength="41">Sync</string>
-    <string name="pref_cat_scheduling" maxLength="41">Scheduling</string>
-    <string name="pref_cat_whiteboard" maxLength="41">Whiteboard</string>
+    <string name="pref_cat_sync" comment="title of the sync preferences category" maxLength="41">សមកាលកម្ម</string>
+    <string name="pref_cat_scheduling" maxLength="41">កាលវិភាគ</string>
+    <string name="pref_cat_whiteboard" maxLength="41">ក្ដារខៀន</string>
     <string name="pref_cat_appearance" maxLength="41">Appearance</string>
     <string name="pref_cat_themes" maxLength="41">Themes</string>
-    <string name="pref_cat_gestures" maxLength="41">Gestures</string>
-    <string name="pref_cat_controls" maxLength="41">Controls</string>
+    <string name="pref_cat_gestures" maxLength="41">កាយវិការ</string>
+    <string name="pref_cat_controls" maxLength="41">ការបញ្ជា</string>
     <string name="pref_cat_advanced" maxLength="41">Advanced</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
-    <string name="use_input_tag" maxLength="41">Type answer into the card</string>
+    <string name="use_input_tag" maxLength="41">វាយចម្លើយចូលកាត</string>
     <string name="use_input_tag_summ">Use a text input box inside the card to type in the answer</string>
     <string name="reset_languages" maxLength="41">Reset languages</string>
     <string name="reset_languages_summ">Reset language assignments (for text to speech and dictionaries) for all decks</string>
     <string name="reset_languages_question">Reset all language assignments?</string>
     <string name="reset_confirmation">All states reset</string>
-    <string name="card_zoom" maxLength="41">Card zoom</string>
-    <string name="image_zoom" maxLength="41">Image zoom</string>
+    <string name="card_zoom" maxLength="41">ការពង្រីកកាត</string>
+    <string name="image_zoom" maxLength="41">ការពង្រីករូបភាព</string>
     <string name="button_size" maxLength="41">Answer button size</string>
     <string name="card_browser_font_size" maxLength="41">Card browser font scaling</string>
     <string name="card_browser_hide_media" maxLength="41">Display filenames in card browser</string>
     <string name="card_browser_hide_media_summary">Display media filenames in the card browser question/answer fields</string>
     <string name="col_path" maxLength="41">AnkiDroid directory</string>
     <string name="fullscreen_review" maxLength="41">Fullscreen mode</string>
-    <string name="full_screen_off">Off</string>
+    <string name="full_screen_off">បិទ</string>
     <string name="full_screen_system">Hide the system bars</string>
     <string name="full_screen_complete">Hide the system bars and answer buttons</string>
     <string name="answer_buttons_position" maxLength="41">Answer buttons position</string>
     <string-array name="answer_buttons_position_labels">
-        <item>Top</item>
-        <item>Bottom</item>
-        <item>None</item>
+        <item>លើ</item>
+        <item>ក្រោម</item>
+        <item>គ្មាន</item>
     </string-array>
-    <string name="gestures" maxLength="41">Enable gestures</string>
+    <string name="gestures" maxLength="41">បើកកាយវិការ</string>
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9-point touch</string>
     <string name="gestures_corner_touch_summary">Allow touch gestures in screen corners</string>
-    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">បង្ហាញផ្លូវកាត់របស់ក្ដារចុច</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Full screen navigation drawer</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Open navigation drawer when swiped right from anywhere on the screen</string>
-    <string name="gestures_none" maxLength="41" comment="No gestures">None</string>
-    <string name="gestures_swipe_up" maxLength="41">Swipe up</string>
-    <string name="gestures_swipe_down" maxLength="41">Swipe down</string>
+    <string name="gestures_none" maxLength="41" comment="No gestures">គ្មាន</string>
+    <string name="gestures_swipe_up" maxLength="41">អូសទៅលើ</string>
+    <string name="gestures_swipe_down" maxLength="41">អូសទៅក្រោម</string>
     <string name="gestures_swipe_left" maxLength="41">Swipe left</string>
     <string name="gestures_swipe_right" maxLength="41">Swipe right</string>
     <string name="gestures_double_tap" maxLength="41">Double touch</string>
@@ -125,12 +125,12 @@
     <string name="tts_summ">Reads out question and answer if no sound file is included</string>
     <!-- Sync -->
     <string name="sync_fetch_missing_media" maxLength="41">Fetch media on sync</string>
-    <string name="sync_account" maxLength="41">AnkiWeb account</string>
+    <string name="sync_account" maxLength="41">គណនី AnkiWeb</string>
     <string name="sync_account_summ_logged_out">Not logged in</string>
     <string name="automatic_sync_choice" maxLength="41">Automatic synchronization</string>
     <string name="automatic_sync_choice_summ">Sync automatically on app start/exit if the last sync was more than 10
         minutes ago.</string>
-    <string name="sync_media_always" comment="Option to always fetch media when syncing">Always</string>
+    <string name="sync_media_always" comment="Option to always fetch media when syncing">ជានិច្ច</string>
     <string name="sync_media_only_unmetered">Only on unmetered connections</string>
     <string name="sync_media_never">Never</string>
     <string name="sync_status_badge" maxLength="41">Display synchronization status</string>
@@ -138,20 +138,20 @@
     <string name="metered_sync_title" maxLength="41">Allow sync on metered connections</string>
     <string name="metered_sync_summary">If disabled, you will be warned if you try to sync on a metered connection</string>
     <string name="backup_limits_frequency">Frequency</string>
-    <string name="backup_limits_lifetime">Lifetime</string>
+    <string name="backup_limits_lifetime">រៀងរហូត</string>
     <string name="app_theme" maxLength="41">Theme</string>
     <string name="day_theme" maxLength="41">Day theme</string>
     <string name="night_theme" maxLength="41">Night theme</string>
-    <string name="language" maxLength="41">Language</string>
-    <string name="language_system">System language</string>
-    <string name="notification_pref" maxLength="41">Notifications</string>
-    <string name="notification_pref_title" maxLength="41">Notify when</string>
-    <string name="never_notify">Never notify</string>
+    <string name="language" maxLength="41">ភាសា</string>
+    <string name="language_system">ភាសាប្រព័ន្ធ</string>
+    <string name="notification_pref" maxLength="41">ការជូនដំណឺង</string>
+    <string name="notification_pref_title" maxLength="41">ជូនដំណឺងពេល</string>
+    <string name="never_notify">កុំជូនដំណឺង</string>
     <string name="notify_when_pending">Pending messages available</string>
     <string name="notification_minimum_cards_due">More than %d cards due</string>
     <string name="notification_minimum_cards_due_vibrate" maxLength="41">Vibrate</string>
     <string name="notification_minimum_cards_due_blink" maxLength="41">Blink light</string>
-    <string name="select_locale_title">Select language</string>
+    <string name="select_locale_title">ជ្រើសរើសភាសា</string>
     <string name="software_render" maxLength="41">Disable card hardware render</string>
     <string name="software_render_summ">Hardware render is faster but may have problems, specifically on Android 8/8.1. If you cannot see parts of the card review user interface, try this setting.</string>
     <string name="safe_display" maxLength="41">Safe display mode</string>
@@ -173,9 +173,9 @@
     <string name="show_top_bar_summary">Show card counts, answer timer, flag and mark in top bar</string>
     <string name="show_progress" maxLength="41">Show remaining</string>
     <string name="show_progress_summ">Show remaining card count</string>
-    <string name="show_eta" maxLength="41">Show ETA</string>
-    <string name="show_eta_summ">Show remaining time</string>
-    <string name="use_current" maxLength="41">Deck for new cards</string>
+    <string name="show_eta" maxLength="41">បង្ហាញ ETA</string>
+    <string name="show_eta_summ">បង្ហាញពេលដែលនៅសល់</string>
+    <string name="use_current" maxLength="41">ជាន់់សម្រាប់កាតថ្មី</string>
     <string name="learn_cutoff" maxLength="41">Learn ahead limit</string>
     <string name="time_limit" maxLength="41">Timebox time limit</string>
     <string name="day_offset_with_description" maxLength="41">Start of next day</string>
@@ -190,7 +190,7 @@
     <string name="custom_buttons_summary">Customize which actions appear in the app bar</string>
     <string name="custom_buttons_setting_always_show">Always show</string>
     <string name="custom_buttons_setting_if_room">Show if room</string>
-    <string name="custom_buttons_setting_menu_only">Menu only</string>
+    <string name="custom_buttons_setting_menu_only">ម៉ឺនុយប៉ុណ្ណោះ</string>
     <string name="reset_custom_buttons" maxLength="41">Reset to default</string>
     <string name="reset_settings_to_default">Reset settings to default</string>
     <string name="reset">Reset</string>
@@ -210,7 +210,7 @@
     <string name="media_import_allow_all_files_summ">If Android doesn’t recognize a media file</string>
     <!-- Custom sync server settings -->
     <string name="custom_sync_server_title" maxLength="41">Custom sync server</string>
-    <string name="custom_sync_server_summary_none_of_the_two_servers_used" comment="This summary is shown when neither of the two custom sync servers are used,         which is the default.">Not used</string>
+    <string name="custom_sync_server_summary_none_of_the_two_servers_used" comment="This summary is shown when neither of the two custom sync servers are used,         which is the default.">មិនត្រូវបានប្រើ</string>
     <string name="custom_sync_server_help2"><![CDATA[        As an alternative to synchronizing with AnkiWeb,
         you may use your own server for synchronization.
         If not set, the default AnkiWeb server will be used instead.
@@ -219,23 +219,23 @@
     <string name="custom_sync_server_base_url_title" maxLength="41">Sync url</string>
     <string name="custom_sync_certificate_title" maxLength="41">Custom root certificate (PEM)</string>
     <!-- Key Bindings -->
-    <string name="keyboard">Keyboard</string>
+    <string name="keyboard">ក្ដារចុច</string>
     <string name="bluetooth">Bluetooth</string>
-    <string name="answer_buttons" maxLength="41">Answer buttons</string>
-    <string name="card" maxLength="41" comment="Generic term to refer to a card">Card</string>
-    <string name="note" maxLength="41">Note</string>
+    <string name="answer_buttons" maxLength="41">ប៊ូតុងចម្លើយ</string>
+    <string name="card" maxLength="41" comment="Generic term to refer to a card">កាត</string>
+    <string name="note" maxLength="41">កំណត់ត្រា</string>
     <string name="navigation" maxLength="41">Navigation</string>
     <string name="media" maxLength="41">Media</string>
     <string name="misc" maxLength="41">Misc</string>
     <!-- studyoptions -->
-    <string name="studyoptions_limit_select_tags">Select tags</string>
+    <string name="studyoptions_limit_select_tags">ជ្រើសរើសស្លាក</string>
     <!-- Deck configurations -->
-    <string name="deck_conf_general" maxLength="41" comment="Label of the submenu for the general options of new deck">General</string>
+    <string name="deck_conf_general" maxLength="41" comment="Label of the submenu for the general options of new deck">ទូទៅ</string>
     <string name="deck_conf_reminders" maxLength="41">Reminders</string>
     <string name="deck_conf_cram_filter" maxLength="41">Filter</string>
-    <string name="deck_conf_cram_search" maxLength="41" comment="Label of a text field that contains a search query.">Search</string>
+    <string name="deck_conf_cram_search" maxLength="41" comment="Label of a text field that contains a search query.">ស្វែងរក</string>
     <string name="deck_conf_cram_limit" maxLength="41">Limit to</string>
-    <string name="deck_conf_cram_order" maxLength="41">Cards selected by</string>
+    <string name="deck_conf_cram_order" maxLength="41">កាតត្រូវបានរើសដោយ</string>
     <string name="deck_conf_cram_reschedule" maxLength="41" comment="Title of the box labelled by deck_conf_cram_reschedule_summ">Reschedule</string>
     <string name="deck_conf_cram_reschedule_summ">Reschedule cards based on my answers in this deck</string>
     <string name="deck_conf_cram_filter_2_check">Enable second filter</string>
@@ -244,15 +244,15 @@
     <string name="deck_conf_cram_preview_delays_summ">Delays are in seconds. 0 returns card to original deck.</string>
     <!-- analytics options -->
     <string name="analytics_dialog_title">Help make AnkiDroid better!</string>
-    <string name="analytics_title" maxLength="41">Share feature usage</string>
+    <string name="analytics_title" maxLength="41">ចែករំលែកនូវការប្រើមុខងារ</string>
     <string name="analytics_summ">You can contribute to AnkiDroid by helping the development team see which features people use</string>
     <string name="note_editor_replace_newlines" maxLength="41">Replace newlines with HTML</string>
     <string name="note_editor_replace_newlines_summ">In the Note Editor, convert any instances of &lt;br&gt; to newlines when editing a card.</string>
     <string name="type_in_answer_focus" maxLength="41">Focus ‘type in answer’</string>
     <string name="type_in_answer_focus_summ">Automatically focus the ‘type in answer’ field in the reviewer</string>
     <!-- About -->
-    <string name="open_changelog">Open Changelog</string>
-    <string name="pref_cat_about_title" maxLength="41">About</string>
+    <string name="open_changelog">បើក Changelog</string>
+    <string name="pref_cat_about_title" maxLength="41">អំពី</string>
     <string name="contributors_title">Contributors</string>
     <string name="about_contributors_description"><![CDATA[These are our awesome <a href=\"%1$s\">contributors</a>. You can help AnkiDroid too by programming, translating, donating and <a href=\"%2$s\">more</a>!]]></string>
     <string name="license">License</string>
@@ -268,18 +268,18 @@
     <string name="user_actions_summary" maxLength="41">Trigger JavaScript from the review screen</string>
     <string name="user_action_1" maxLength="28">User action 1</string>
     <string name="user_action_2" maxLength="28">User action 2</string>
-    <string name="user_action_3" maxLength="28">User action 3</string>
-    <string name="user_action_4" maxLength="28">User action 4</string>
-    <string name="user_action_5" maxLength="28">User action 5</string>
-    <string name="user_action_6" maxLength="28">User action 6</string>
-    <string name="user_action_7" maxLength="28">User action 7</string>
-    <string name="user_action_8" maxLength="28">User action 8</string>
-    <string name="user_action_9" maxLength="28">User action 9</string>
+    <string name="user_action_3" maxLength="28">សកម្មភាពអ្នកប្រើប្រាស់ 3</string>
+    <string name="user_action_4" maxLength="28">សកម្មភាពអ្នកប្រើប្រាស់ 4</string>
+    <string name="user_action_5" maxLength="28">សកម្មភាពអ្នកប្រើប្រាស់ 5</string>
+    <string name="user_action_6" maxLength="28">សកម្មភាពអ្នកប្រើប្រាស់ 6</string>
+    <string name="user_action_7" maxLength="28">សកម្មភាពអ្នកប្រើប្រាស់ 7</string>
+    <string name="user_action_8" maxLength="28">សកម្មភាពអ្នកប្រើប្រាស់ 8</string>
+    <string name="user_action_9" maxLength="28">សកម្មភាពអ្នកប្រើប្រាស់ 9</string>
     <string name="toggle_auto_advance" maxLength="41">Toggle auto advance</string>
     <!-- Select card side -->
-    <string name="card_side_selection_title">Select card side</string>
-    <string name="card_side_question">Question</string>
-    <string name="card_side_answer">Answer</string>
+    <string name="card_side_selection_title">ជ្រើសរើសផ្នែកនៃកាត</string>
+    <string name="card_side_question">សំណួរ</string>
+    <string name="card_side_answer">ចម្លើយ</string>
     <string name="card_side_both" maxLength="28">Question &amp; Answer</string>
     <string name="display_binding_card_side_question" comment="When displaying a key bind on a preference this formatter is used if the bind only applies to the question">Q: %s</string>
     <string name="display_binding_card_side_answer" comment="When displaying a key bind on a preference this formatter is used if the bind only applies to the answer">A: %s</string>
@@ -292,7 +292,7 @@
     <string name="readtext_deprecation_warn">AnkiDroid has introduced a better TTS mechanism which is compatible with other Anki clients and includes more voices and improvements to language playback!\n\nPlease upgrade as soon as possible, as this setting will be removed soon</string>
     <string name="readtext_reviewer_warn" tools:ignore="UnusedResources">Please upgrade to the new text to speech format</string>
     <!-- Developer options -->
-    <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
+    <string name="pref_cat_dev_options" maxLength="41">ជម្រើសអ្នកអភិវឌ្ឍ</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
     <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
@@ -318,7 +318,7 @@
          ####################################################################################### -->
     <string name="pref__manage_space__screen_title">Manage space</string>
     <!-- TextWidgetPreference widget text -->
-    <string name="pref__widget_text__error" comment="Text in a small box on the end of a preference, indicating a generic error.         Must be VERY short. Can be one or two lines.">Error</string>
+    <string name="pref__widget_text__error" comment="Text in a small box on the end of a preference, indicating a generic error.         Must be VERY short. Can be one or two lines.">បញ្ហា</string>
     <string name="pref__widget_text__calculating" comment="Text in a small box on the end of a preference,         indicating that the value, such as folder size on disk, is being calculated.         Must be VERY short. Can be one or two lines.">Calcu-\nlating&#8230;</string>
     <plurals name="pref__widget_text__n_files_n_bytes" comment="Text in a small box on the end of a preference,         showing some statistics about a folder on disk if a form of “12 files\n26 MB”.         Must be VERY short. Can be one or two lines.">
         <item quantity="other">%1$d files\n%2$s</item>
@@ -338,13 +338,13 @@
     <string name="dialog__delete_collection__message" comment="“Close the window” here refers to the activity that the user is currently seeing.        When the collection is deleted, we exit the process, which closes the activity without animation.         On some devices the entire settings app may be closed.         User might not realize that this activity comes directly from AnkiDroid,         so it might be wise to avoid words such as “AnkiDroid or “app”.">Are you sure you want to delete your collection, media, and backups?\n\nNote: this action will close the window.</string>
     <string name="progress__deleting_collection">Deleting collection&#8230;</string>
     <!-- Delete everything -->
-    <string name="pref__delete_everything__title" maxLength="41" comment="Preference title">Delete everything</string>
+    <string name="pref__delete_everything__title" maxLength="41" comment="Preference title">លុបអ្វីទាំងអស់</string>
     <string name="pref__delete_everything__summary">Delete collection, media, backups, and settings</string>
-    <string name="dialog__delete_everything__title" comment="Confirmation dialog title">Delete everything</string>
+    <string name="dialog__delete_everything__title" comment="Confirmation dialog title">លុបអ្វីទាំងអស់</string>
     <string name="dialog__delete_everything__message" comment="“Close the window” here refers to the activity that the user is currently seeing.         Deleting app data forcibly closes AnkiDroid, which closes the activity without animation.         On some devices the entire settings app may be closed.         User might not realize that this activity comes directly from AnkiDroid,         so it might be wise to avoid words such as “AnkiDroid or “app”.">Are you sure you want to delete all data? This includes your collection, media, backups and preferences.\n\nNote: this action will close the window.</string>
     <!-- Delete app data -->
-    <string name="pref__delete_app_data__title" maxLength="41" comment="Preference title">Delete app data</string>
-    <string name="pref__delete_app_data__summary">Delete settings and other app data</string>
+    <string name="pref__delete_app_data__title" maxLength="41" comment="Preference title">លុបទិន្នន័យកម្មវិធី</string>
+    <string name="pref__delete_app_data__summary">លុបការកំណត់និងទិន្នន័យកម្មវិធីផ្សេងទៀត</string>
     <string name="dialog__delete_app_data__title" comment="Confirmation dialog title">Delete app data</string>
     <string name="dialog__delete_app_data__message" comment="“Close the window” here refers to the activity that the user is currently seeing.         Deleting app data forcibly closes AnkiDroid, which closes the activity without animation.         On some devices the entire settings app may be closed.         User might not realize that this activity comes directly from AnkiDroid,         so it might be wise to avoid words such as “AnkiDroid or “app”.">Are you sure you want to delete app data? This includes settings and other app data.\n\nNote: this action will close the window.</string>
     <!-- #######################################################################################
@@ -365,8 +365,8 @@
     <string name="hide_answer_buttons" maxLength="41">Hide answer buttons</string>
     <string name="hide_hard_and_easy" maxLength="41">Hide ‘Hard’ and ‘Easy’ buttons</string>
     <string name="reviewer_frame_style" maxLength="41">Frame style</string>
-    <string name="reviewer_frame_style_card" maxLength="41" comment="Style name of the \'Card\' card frame of the Reviewer">Card</string>
-    <string name="reviewer_frame_style_box" maxLength="41" comment="Style name of the \'Box\' card frame of the Reviewer">Box</string>
+    <string name="reviewer_frame_style_card" maxLength="41" comment="Style name of the \'Card\' card frame of the Reviewer">កាត</string>
+    <string name="reviewer_frame_style_box" maxLength="41" comment="Style name of the \'Box\' card frame of the Reviewer">ប្រអប់</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="open_settings" comment="Description of the shortcut that opens the app settings">Open settings</string>
+    <string name="open_settings" comment="Description of the shortcut that opens the app settings">បើកការកំណត់</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-km/11-arrays.xml b/AnkiDroid/src/main/res/values-km/11-arrays.xml
index 72524773fc69..9bdc9890511a 100644
--- a/AnkiDroid/src/main/res/values-km/11-arrays.xml
+++ b/AnkiDroid/src/main/res/values-km/11-arrays.xml
@@ -43,14 +43,14 @@
     <!-- 11-arrays.xml used to contain arrays. This caused problems when changing the ordering.
     Now arrays are defined in constants.xml, and the strings are here -->
     <!-- error_reporting_choice_labels -->
-    <string name="error_reporting_choice_always_report">Always report</string>
-    <string name="error_reporting_choice_never_report">Never report</string>
-    <string name="error_reporting_choice_ask_user">Ask me</string>
+    <string name="error_reporting_choice_always_report">រាយការណ៍ជានិច្ច</string>
+    <string name="error_reporting_choice_never_report">កុំរាយការណ៍</string>
+    <string name="error_reporting_choice_ask_user">សួរខ្ញុំ</string>
     <!-- leech_action_labels -->
     <!-- 01-core:menu_suspend_card -->
     <!-- new_order_labels -->
     <!-- cram_deck_conf_order_labels -->
-    <string name="cram_deck_conf_order_oldest_seen_first">Oldest seen first</string>
+    <string name="cram_deck_conf_order_oldest_seen_first">ឃើញអ្វីដែលចាស់បំផុតមុន</string>
     <string name="cram_deck_conf_order_random">Random</string>
     <string name="cram_deck_conf_order_increasing_intervals">Increasing intervals</string>
     <string name="cram_deck_conf_order_decreasing_intervals">Decreasing intervals</string>
@@ -60,16 +60,16 @@
     <string name="cram_deck_conf_order_latest_added_first">Latest added first</string>
     <string name="cram_deck_conf_order_relative_overdueness">Relative overdueness</string>
     <!-- add_to_cur_labels -->
-    <string name="add_to_deck_use_current_deck">Use current deck</string>
-    <string name="add_to_deck_decide_by_note_type">Decide by note type</string>
+    <string name="add_to_deck_use_current_deck">ប្រើជាន់បច្ចុប្បន្ន</string>
+    <string name="add_to_deck_decide_by_note_type">សម្រេចដោយប្រភេទរបស់កំណត់ត្រា</string>
     <!-- theme labels -->
-    <string name="theme_follow_system">Follow system</string>
+    <string name="theme_follow_system">ធ្វើតាមប្រព័ន្ធ</string>
     <!-- day_theme_labels -->
-    <string name="day_theme_light">Light</string>
+    <string name="day_theme_light">ភ្លឺ</string>
     <string name="day_theme_plain">Plain</string>
     <!-- night_theme_labels -->
-    <string name="night_theme_black">Black</string>
-    <string name="night_theme_dark">Dark</string>
+    <string name="night_theme_black">ខ្មៅ</string>
+    <string name="night_theme_dark">ងងឹត</string>
     <!-- html_size_code_labels -->
     <string name="html_size_code_xx_small">xx-small</string>
     <string name="html_size_code_x_small">x-small</string>
@@ -79,7 +79,7 @@
     <string name="html_size_code_x_large">x-large</string>
     <string name="html_size_code_xx_large">xx-large</string>
     <!-- gestures_labels -->
-    <string name="answer_again" maxLength="41">Answer again</string>
+    <string name="answer_again" maxLength="41">ឆ្លើយម្ដងទៀត</string>
     <string name="answer_hard" maxLength="41">Answer hard</string>
     <string name="answer_good" maxLength="41">Answer good</string>
     <string name="answer_easy" maxLength="41">Answer easy</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml b/AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml
index 4483e073dbff..2fe903396904 100644
--- a/AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml
@@ -85,10 +85,10 @@
     <string name="custom_study_limit_tags">Limitar a tags específicas</string>
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d oculto</item>
-        <item quantity="other">+%d buried</item>
+        <item quantity="other">+%d oculto</item>
     </plurals>
-    <string name="studyoptions_total_new_label">Total new cards</string>
-    <string name="studyoptions_total_label">Total cards</string>
+    <string name="studyoptions_total_new_label">Total de cartões novos</string>
+    <string name="studyoptions_total_label">Total de cartões</string>
     <!-- Card editor -->
     <string name="cardeditor_title_edit_card" maxLength="28">Editar nota</string>
     <string name="discard">Descartar</string>
@@ -301,7 +301,7 @@
     <string name="show_notes" comment="Label for toggle notes button in BrowserOptionsDialog">Notas</string>
     <string name="toggle_cards_notes">Alternar Cards/Notas</string>
     <string name="truncate_content_help">Truncar a altura de cada linha do navegador para mostrar apenas as 3 primeiras linhas de conteúdo</string>
-    <string name="browser_options_dialog_heading">Browser options</string>
+    <string name="browser_options_dialog_heading">Opções do navegador</string>
     <string name="audio_saved">Gravação salva</string>
     <string name="deleting_selected_notes">Excluindo notas selecionadas</string>
     <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Toque numa voz para ouvir
@@ -349,5 +349,5 @@
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copiar o modelo como markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Editar aparência do navegador</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">A ação do usuário %s não está definida neste tipo de nota. Por favor, configure-a</string>
-    <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
+    <string name="directory_inaccessible_info">Aprenda mais sobre como restaurar o acesso aqui %s ou vá em opções para atualizar a pasta de coleções.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-pt-rBR/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-pt-rBR/07-cardbrowser.xml
index ce865b786349..50288a2477f1 100644
--- a/AnkiDroid/src/main/res/values-pt-rBR/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-pt-rBR/07-cardbrowser.xml
@@ -112,10 +112,10 @@
     <string name="edit_tags_dialog" comment="Description of the shortcut that opens the edit tags dialog">Editar etiquetas de diálogo</string>
     <string name="show_order_dialog" comment="Description of the shortcut that shows the order dialog">Mostrar diálogo de ordem</string>
     <!-- Manage columns dialog -->
-    <string name="browse_manage_columns_main_heading">Columns</string>
-    <string name="browse_manage_columns">Manage columns</string>
-    <string name="user_active_columns">Active</string>
-    <string name="user_potential_columns">Available</string>
-    <string name="include_column">Include column</string>
-    <string name="exclude_column">Exclude column</string>
+    <string name="browse_manage_columns_main_heading">Colunas</string>
+    <string name="browse_manage_columns">Gerenciar colunas</string>
+    <string name="user_active_columns">Ativo</string>
+    <string name="user_potential_columns">Disponível</string>
+    <string name="include_column">Incluir coluna</string>
+    <string name="exclude_column">Excluir coluna</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-pt-rBR/10-preferences.xml b/AnkiDroid/src/main/res/values-pt-rBR/10-preferences.xml
index 7f253f75ca17..232b194f22ba 100644
--- a/AnkiDroid/src/main/res/values-pt-rBR/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-pt-rBR/10-preferences.xml
@@ -97,7 +97,7 @@
     <string name="gestures_summ">Atribuir gestos a ações tais como responder e editar cards.</string>
     <string name="gestures_corner_touch" maxLength="41">9 Ações de Toque </string>
     <string name="gestures_corner_touch_summary">Permitir gestos de toque nos cantos da tela</string>
-    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Exibir teclas de atalho</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Painel de navegação em tela cheia</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Abrir painel de navegação ao ser deslizado de qualquer lugar da tela</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Nenhuma</string>
@@ -366,9 +366,9 @@
     <string name="ignore_display_cutout" maxLength="41">Ignorar recorte da tela</string>
     <string name="hide_answer_buttons" maxLength="41">Ocultar botões de resposta</string>
     <string name="hide_hard_and_easy" maxLength="41">Ocultar botões \"Difícil\" e \"Fácil\"</string>
-    <string name="reviewer_frame_style" maxLength="41">Frame style</string>
-    <string name="reviewer_frame_style_card" maxLength="41" comment="Style name of the \'Card\' card frame of the Reviewer">Card</string>
-    <string name="reviewer_frame_style_box" maxLength="41" comment="Style name of the \'Box\' card frame of the Reviewer">Box</string>
+    <string name="reviewer_frame_style" maxLength="41">Estilo de enquadramento</string>
+    <string name="reviewer_frame_style_card" maxLength="41" comment="Style name of the \'Card\' card frame of the Reviewer">Cartão</string>
+    <string name="reviewer_frame_style_box" maxLength="41" comment="Style name of the \'Box\' card frame of the Reviewer">Caixa</string>
     <!--Keyboard shortcuts dialog-->
     <string name="open_settings" comment="Description of the shortcut that opens the app settings">Abrir configurações</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ug/10-preferences.xml b/AnkiDroid/src/main/res/values-ug/10-preferences.xml
index 76799524b357..fef78f8c2568 100644
--- a/AnkiDroid/src/main/res/values-ug/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ug/10-preferences.xml
@@ -97,7 +97,7 @@
     <string name="gestures_summ">جاۋاب ۋە كارتا تەھرىرلەشكە ئوخشاش مەشغۇلاتقا قول ئىشارىتى بەلگىلەيدۇ.</string>
     <string name="gestures_corner_touch" maxLength="41">9 نۇقتا سەزگۈچ</string>
     <string name="gestures_corner_touch_summary">ئېكران بۇلۇڭلىرى تېگىشىش قول ئىشارىتىگە يول قويىدۇ</string>
-    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">ھەرپتاختا تېزلەتمىسىنى كۆرسەت</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">پۈتۈن ئېكران يولباشچى تارتمىسى</string>
     <string name="gestures_fullscreen_nav_drawer_summary">ئېكراننىڭ خالىغان يېرىدىن ئوڭغا سۈرۈلسە يولباشچى تارتمىسىنى ئاچىدۇ</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">يوق</string>
diff --git a/AnkiDroid/src/main/res/values-uk/10-preferences.xml b/AnkiDroid/src/main/res/values-uk/10-preferences.xml
index 7f154a8bbbfb..277957de65c7 100644
--- a/AnkiDroid/src/main/res/values-uk/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-uk/10-preferences.xml
@@ -99,7 +99,7 @@
     <string name="gestures_summ">Використовувати жести для таких дій, як відповідь і редагування карток.</string>
     <string name="gestures_corner_touch" maxLength="41">9-точковий дотик</string>
     <string name="gestures_corner_touch_summary">Дозволити сенсорні жести в кутах екрану</string>
-    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Показати клавіатурні комбінації клавіш</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Повноекранна панель навігації</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Відкривати панель навігації при проведенні вправо з будь-якого місця на екрані</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Немає</string>

From 80c6fa83533b8513f9c085f5775aaaa9fb99c919 Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Mon, 24 Feb 2025 16:36:56 -0300
Subject: [PATCH 083/200] refactor: move setFlag to tests module

only used there
---
 .../src/main/java/com/ichi2/libanki/Card.kt   | 14 +++-------
 .../java/com/ichi2/anki/AnkiDroidJsAPITest.kt |  1 +
 .../java/com/ichi2/anki/utils/ext/Card.kt     | 26 +++++++++++++++++++
 .../test/java/com/ichi2/libanki/FlagTest.kt   |  1 +
 4 files changed, 31 insertions(+), 11 deletions(-)
 create mode 100644 AnkiDroid/src/test/java/com/ichi2/anki/utils/ext/Card.kt

diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/Card.kt b/AnkiDroid/src/main/java/com/ichi2/libanki/Card.kt
index 64744d7ddda1..fa9608db8f7c 100644
--- a/AnkiDroid/src/main/java/com/ichi2/libanki/Card.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/libanki/Card.kt
@@ -87,7 +87,9 @@ open class Card : Cloneable {
     var oDid: DeckId = 0
     var originalPosition: Int? = null
     private var customData: String = ""
-    private var flags = 0
+
+    @VisibleForTesting
+    var flags = 0
     private var memoryState: FsrsMemoryState? = null
     private var desiredRetention: Float? = null
 
@@ -327,16 +329,6 @@ open class Card : Cloneable {
     @LibAnkiAlias("user_flag")
     fun userFlag() = Flag.fromCode(flags and 0b111)
 
-    /**
-     * Set [flags] to [flag].
-     * Should only be used for testing.
-     * Use [setUserFlag] instead.
-     */
-    @VisibleForTesting
-    fun setFlag(flag: Int) {
-        flags = flag
-    }
-
     /**
      * Set the first three bits of [flags] to [flag]. Don't change the other ones.
      */
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/AnkiDroidJsAPITest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/AnkiDroidJsAPITest.kt
index 4221277b3046..e2ec5c78e926 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/AnkiDroidJsAPITest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/AnkiDroidJsAPITest.kt
@@ -21,6 +21,7 @@ package com.ichi2.anki
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.AnkiDroidJsAPI.Companion.SUCCESS_KEY
 import com.ichi2.anki.AnkiDroidJsAPI.Companion.VALUE_KEY
+import com.ichi2.anki.utils.ext.setFlag
 import com.ichi2.libanki.CardType
 import com.ichi2.libanki.utils.TimeManager
 import com.ichi2.utils.BASIC_MODEL_NAME
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/utils/ext/Card.kt b/AnkiDroid/src/test/java/com/ichi2/anki/utils/ext/Card.kt
new file mode 100644
index 000000000000..4c479179c3c7
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/utils/ext/Card.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2025 Brayan Oliveira <brayandso.dev@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.ichi2.anki.utils.ext
+
+import com.ichi2.libanki.Card
+
+/**
+ * Set flags to [flag].
+ * Should only be used for testing.
+ */
+fun Card.setFlag(flag: Int) {
+    flags = flag
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/libanki/FlagTest.kt b/AnkiDroid/src/test/java/com/ichi2/libanki/FlagTest.kt
index 4e84781c105d..cfd9a36677bc 100644
--- a/AnkiDroid/src/test/java/com/ichi2/libanki/FlagTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/libanki/FlagTest.kt
@@ -17,6 +17,7 @@ package com.ichi2.libanki
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.Flag
+import com.ichi2.anki.utils.ext.setFlag
 import com.ichi2.testutils.JvmTest
 import com.ichi2.testutils.ext.addNote
 import org.junit.Assert.assertEquals

From 2f221db614c82f86e71baf2a1ac905df2570f3d6 Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Mon, 24 Feb 2025 16:39:11 -0300
Subject: [PATCH 084/200] refactor: removed unused stuff from Card.kt

---
 .../src/main/java/com/ichi2/libanki/Card.kt   | 85 -------------------
 1 file changed, 85 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/Card.kt b/AnkiDroid/src/main/java/com/ichi2/libanki/Card.kt
index fa9608db8f7c..7df9a3499bb5 100644
--- a/AnkiDroid/src/main/java/com/ichi2/libanki/Card.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/libanki/Card.kt
@@ -340,91 +340,6 @@ open class Card : Cloneable {
         flags = setFlagInInt(flags, flag.code)
     }
 
-    @NotInLibAnki
-    val isInDynamicDeck: Boolean
-        get() = // In Anki Desktop, a card with oDue <> 0 && oDid == 0 is not marked as dynamic.
-            oDid != 0L
-
-    /** A cache represents an intermediary step between a card id and a card object. Creating a Card has some fixed cost
-     * in term of database access. Using an id has an unknown cost: none if the card is never accessed, heavy if the
-     * card is accessed a lot of time. CardCache ensure that the cost is paid at most once, by waiting for first access
-     * to load the data, and then saving them. Since CPU and RAM is usually less of a bottleneck than database access,
-     * it may often be worth using this cache.
-     *
-     * Beware that the card is loaded only once. Change in the database are not reflected, so use it only if you can
-     * safely assume that the card has not changed. That is
-     * long id;
-     * Card card = col.getCard(id);
-     * ....
-     * Card card2 = col.getCard(id);
-     * is not equivalent to
-     * long id;
-     * Card.Cache cache = new Cache(col, id);
-     * Card card = cache.getCard();
-     * ....
-     * Card card2 = cache.getCard();
-     *
-     * It is equivalent to:
-     * long id;
-     * Card.Cache cache = new Cache(col, id);
-     * Card card = cache.getCard();
-     * ....
-     * cache.reload();
-     * Card card2 = cache.getCard();
-     */
-    @NotInLibAnki
-    open class Cache : Cloneable {
-        val col: Collection
-        val id: CardId
-        private var _card: Card? = null
-
-        constructor(col: Collection, id: CardId) {
-            this.col = col
-            this.id = id
-        }
-
-        /** Copy of cache. Useful to create a copy of a subclass without loosing card if it is loaded.  */
-        protected constructor(cache: Cache) {
-            col = cache.col
-            this.id = cache.id
-            _card = cache._card
-        }
-
-        /**
-         * The card with id given at creation. Note that it has content of the time at which the card was loaded, which
-         * may have changed in database. So it is not equivalent to getCol().getCard(getId()). If you need fresh data, reload
-         * first. */
-        @get:Synchronized
-        val card: Card
-            get() {
-                if (_card == null) {
-                    _card = col.getCard(this.id)
-                }
-                return _card!!
-            }
-
-        /** Next access to card will reload the card from the database.  */
-        @Synchronized
-        open fun reload() {
-            _card = null
-        }
-
-        override fun hashCode(): Int =
-            java.lang.Long
-                .valueOf(this.id)
-                .hashCode()
-
-        /** The cloned version represents the same card but data are not loaded.  */
-        public override fun clone(): Cache = Cache(col, this.id)
-
-        override fun equals(other: Any?): Boolean =
-            if (other !is Cache) {
-                false
-            } else {
-                this.id == other.id
-            }
-    }
-
     companion object {
         // A list of class members to skip in the toString() representation
         val SKIP_PRINT: Set<String> =

From b653143b783257776bf3e6e9a5ffdc3575e40292 Mon Sep 17 00:00:00 2001
From: Hari Srinivasan <harisrini21@gmail.com>
Date: Sat, 11 Jan 2025 18:58:46 +0530
Subject: [PATCH 085/200] JS function to setTags and getTags

---
 AnkiDroid/src/main/assets/scripts/js-api.js   | 19 +++++++++++
 .../java/com/ichi2/anki/AnkiDroidJsAPI.kt     | 33 +++++++++++++++++++
 2 files changed, 52 insertions(+)

diff --git a/AnkiDroid/src/main/assets/scripts/js-api.js b/AnkiDroid/src/main/assets/scripts/js-api.js
index a33010525f22..20108069bad0 100644
--- a/AnkiDroid/src/main/assets/scripts/js-api.js
+++ b/AnkiDroid/src/main/assets/scripts/js-api.js
@@ -72,6 +72,8 @@ const jsApiList = {
     ankiSttStart: "sttStart",
     ankiSttStop: "sttStop",
     ankiAddTagToNote: "addTagToNote",
+    ankiSetNoteTags: "setNoteTags",
+    ankiGetNoteTags: "getNoteTags",
 };
 
 class AnkiDroidJS {
@@ -119,12 +121,29 @@ class AnkiDroidJS {
 Object.keys(jsApiList).forEach(method => {
     if (method === "ankiAddTagToNote") {
         AnkiDroidJS.prototype[method] = async function (noteId, tag) {
+            console.warn("ankiAddTagToNote is deprecated. Use ankiSetNoteTags instead.");
             const endpoint = jsApiList[method];
             const data = JSON.stringify({ noteId, tag });
             return await this.handleRequest(endpoint, data);
         };
         return;
     }
+    if (method === "ankiSetNoteTags") {
+        AnkiDroidJS.prototype[method] = async function (noteId, tags) {
+            const endpoint = jsApiList[method];
+            const data = JSON.stringify({ noteId, tags });
+            return await this.handleRequest(endpoint, data);
+        };
+        return;
+    }
+    if (method === "ankiGetNoteTags") {
+        AnkiDroidJS.prototype[method] = async function (noteId) {
+            const endpoint = jsApiList[method];
+            const data = JSON.stringify({ noteId });
+            return await this.handleRequest(endpoint, data);
+        };
+        return;
+    }
     if (method === "ankiTtsSpeak") {
         AnkiDroidJS.prototype[method] = async function (text, queueMode = 0) {
             const endpoint = jsApiList[method];
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidJsAPI.kt b/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidJsAPI.kt
index f4ec2dc7d032..8cb61eab5728 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidJsAPI.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidJsAPI.kt
@@ -45,14 +45,17 @@ import com.ichi2.annotations.NeedsTest
 import com.ichi2.libanki.Card
 import com.ichi2.libanki.Collection
 import com.ichi2.libanki.Decks
+import com.ichi2.libanki.Note
 import com.ichi2.libanki.SortOrder
 import com.ichi2.utils.NetworkUtils
+import com.ichi2.utils.stringIterable
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.builtins.serializer
 import kotlinx.serialization.json.Json
+import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
 import timber.log.Timber
@@ -373,6 +376,36 @@ open class AnkiDroidJsAPI(
                 getColUnsafe.updateNote(note)
                 convertToByteArray(apiContract, true)
             }
+
+            "setNoteTags" -> {
+                val jsonObject = JSONObject(apiParams)
+                val noteId = jsonObject.getLong("noteId")
+                val tags = jsonObject.getJSONArray("tags")
+                withCol {
+                    fun Note.setTagsFromList(tagList: List<String>) {
+                        val tagsAsString = this@withCol.tags.join(tagList)
+                        setTagsFromStr(this@withCol, tagsAsString)
+                    }
+
+                    val note =
+                        getNote(noteId).apply {
+                            setTagsFromList(tags.stringIterable().toList())
+                        }
+                    updateNote(note)
+                }
+                convertToByteArray(apiContract, true)
+            }
+
+            "getNoteTags" -> {
+                val jsonObject = JSONObject(apiParams)
+                val noteId = jsonObject.getLong("noteId")
+                val noteTags =
+                    withCol {
+                        getNote(noteId).tags
+                    }
+                convertToByteArray(apiContract, JSONArray(noteTags).toString())
+            }
+
             "sttSetLanguage" -> convertToByteArray(apiContract, speechRecognizer.setLanguage(apiParams))
             "sttStart" -> {
                 val callback =

From b64a565af426b11cdffda320cd8aa7f0f580a37b Mon Sep 17 00:00:00 2001
From: Hari Srinivasan <harisrini21@gmail.com>
Date: Sun, 26 Jan 2025 11:34:13 +0530
Subject: [PATCH 086/200] Unit Test for getNoteTags and adding tags validation
 on Js

---
 AnkiDroid/src/main/assets/scripts/js-api.js   | 13 +++++-
 .../java/com/ichi2/anki/AnkiDroidJsAPI.kt     |  8 +++-
 .../java/com/ichi2/anki/AnkiDroidJsAPITest.kt | 42 +++++++++++++++++++
 .../java/com/ichi2/testutils/TestClass.kt     |  7 ++++
 4 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/AnkiDroid/src/main/assets/scripts/js-api.js b/AnkiDroid/src/main/assets/scripts/js-api.js
index 20108069bad0..c6dd3fbbc073 100644
--- a/AnkiDroid/src/main/assets/scripts/js-api.js
+++ b/AnkiDroid/src/main/assets/scripts/js-api.js
@@ -121,7 +121,7 @@ class AnkiDroidJS {
 Object.keys(jsApiList).forEach(method => {
     if (method === "ankiAddTagToNote") {
         AnkiDroidJS.prototype[method] = async function (noteId, tag) {
-            console.warn("ankiAddTagToNote is deprecated. Use ankiSetNoteTags instead.");
+            console.warn("ankiAddTagToNote is deprecated. Use ankiSetNoteTags instead");
             const endpoint = jsApiList[method];
             const data = JSON.stringify({ noteId, tag });
             return await this.handleRequest(endpoint, data);
@@ -130,6 +130,17 @@ Object.keys(jsApiList).forEach(method => {
     }
     if (method === "ankiSetNoteTags") {
         AnkiDroidJS.prototype[method] = async function (noteId, tags) {
+            let hasSpaces = false;
+            for (let i = 0; i < tags.length; i++) {
+                tags[i] = tags[i].trim();
+                if (tags[i].includes(" ") || tags[i].includes("\u3000")) {
+                    tags[i] = tags[i].replace(" ", "_").replace("\u3000", "_");
+                    hasSpaces = true;
+                }
+            }
+            if (hasSpaces) {
+                console.warn("Spaces in tags have been converted to underscores");
+            }
             const endpoint = jsApiList[method];
             const data = JSON.stringify({ noteId, tags });
             return await this.handleRequest(endpoint, data);
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidJsAPI.kt b/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidJsAPI.kt
index 8cb61eab5728..8a8fe531da01 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidJsAPI.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidJsAPI.kt
@@ -206,6 +206,7 @@ open class AnkiDroidJsAPI(
      * @param returnDefaultValues `true` if default values should be returned (if non-[Reviewer])
      * @return
      */
+    @NeedsTest("setNoteTags: Test that tags are set for all edge cases")
     open suspend fun handleJsApiRequest(
         methodName: String,
         bytes: ByteArray,
@@ -383,7 +384,12 @@ open class AnkiDroidJsAPI(
                 val tags = jsonObject.getJSONArray("tags")
                 withCol {
                     fun Note.setTagsFromList(tagList: List<String>) {
-                        val tagsAsString = this@withCol.tags.join(tagList)
+                        val sanitizedTags = tagList.map { it.trim() }
+                        val spaces = "\\s|\u3000".toRegex()
+                        if (sanitizedTags.any { it.contains(spaces) }) {
+                            throw IllegalArgumentException("Tags cannot contain spaces")
+                        }
+                        val tagsAsString = this@withCol.tags.join(sanitizedTags)
                         setTagsFromStr(this@withCol, tagsAsString)
                     }
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/AnkiDroidJsAPITest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/AnkiDroidJsAPITest.kt
index e2ec5c78e926..437342db8d5c 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/AnkiDroidJsAPITest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/AnkiDroidJsAPITest.kt
@@ -28,6 +28,7 @@ import com.ichi2.utils.BASIC_MODEL_NAME
 import net.ankiweb.rsdroid.withoutUnicodeIsolation
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
+import org.json.JSONArray
 import org.json.JSONObject
 import org.junit.Ignore
 import org.junit.Test
@@ -418,6 +419,31 @@ class AnkiDroidJsAPITest : RobolectricTest() {
             assertEquals(CardType.New, cardAfterReset.type, "Card type after reset")
         }
 
+    @Test
+    fun ankiGetNoteTagsTest() =
+        runTest {
+            val n =
+                addBasicNote("Front", "Back").update {
+                    tags = mutableListOf("tag1", "tag2", "tag3")
+                }
+
+            val reviewer: Reviewer = startReviewer()
+            waitForAsyncTasksToComplete()
+
+            val jsapi = reviewer.jsApi
+
+            // test get tags for note
+            val expectedTags = n.tags
+            val response = getDataFromRequest("getNoteTags", jsapi, jsonObjectOf("noteId" to n.id))
+            val jsonResponse = JSONObject(response)
+            val actualTags = JSONArray(jsonResponse.getString("value"))
+
+            assertEquals(expectedTags.size, actualTags.length())
+            for (i in 0 until actualTags.length()) {
+                assertEquals(expectedTags[i], actualTags.getString(i))
+            }
+        }
+
     companion object {
         fun jsApiContract(data: String = ""): ByteArray =
             JSONObject()
@@ -451,5 +477,21 @@ class AnkiDroidJsAPITest : RobolectricTest() {
             jsAPI
                 .handleJsApiRequest(methodName, jsApiContract(apiData), false)
                 .decodeToString()
+
+        suspend fun getDataFromRequest(
+            methodName: String,
+            jsAPI: AnkiDroidJsAPI,
+            apiData: JSONObject,
+        ): String =
+            jsAPI
+                .handleJsApiRequest(methodName, jsApiContract(apiData.toString()), false)
+                .decodeToString()
     }
 }
+
+private fun jsonObjectOf(vararg pairs: Pair<String, Any>): JSONObject =
+    JSONObject().apply {
+        for ((key, value) in pairs) {
+            put(key, value)
+        }
+    }
diff --git a/AnkiDroid/src/test/java/com/ichi2/testutils/TestClass.kt b/AnkiDroid/src/test/java/com/ichi2/testutils/TestClass.kt
index 011237a9a934..f794d1342745 100644
--- a/AnkiDroid/src/test/java/com/ichi2/testutils/TestClass.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/testutils/TestClass.kt
@@ -241,6 +241,13 @@ interface TestClass {
         col.decks.save(deckConfig)
     }
 
+    /** Helper method to update a note */
+    fun Note.update(block: Note.() -> Unit): Note {
+        block(this)
+        col.updateNote(this)
+        return this
+    }
+
     /** Helper method to all cards of a note */
     fun Note.updateCards(update: Card.() -> Unit): Note {
         cards().forEach { it.update(update) }

From 248488166f416d736728f62874f127a45a4c01dd Mon Sep 17 00:00:00 2001
From: lukstbit <52494258+lukstbit@users.noreply.github.com>
Date: Tue, 25 Feb 2025 15:55:49 +0200
Subject: [PATCH 087/200] Fix SharedDecksActivity toolbar color for dark themes

This toolbar wasn't using the proper theme attribute appBarColor.
---
 AnkiDroid/src/main/res/layout/activity_shared_decks.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AnkiDroid/src/main/res/layout/activity_shared_decks.xml b/AnkiDroid/src/main/res/layout/activity_shared_decks.xml
index de0bb9c718a3..a283c196dbc4 100644
--- a/AnkiDroid/src/main/res/layout/activity_shared_decks.xml
+++ b/AnkiDroid/src/main/res/layout/activity_shared_decks.xml
@@ -17,7 +17,7 @@
         android:layout_height="wrap_content"
         android:minHeight="?attr/actionBarSize"
         android:theme="@style/ActionBarStyle"
-        android:background="?attr/colorPrimary"
+        android:background="?attr/appBarColor"
         app:popupTheme="@style/ActionBar.Popup"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"

From bf9948bc40ac47a97a3346ea23b1ea51787c7b50 Mon Sep 17 00:00:00 2001
From: AnkiDroid Translations <ankidroid@ankidroid.org>
Date: Sun, 2 Mar 2025 08:32:21 +0000
Subject: [PATCH 088/200] Updated strings from Crowdin

---
 .../src/main/res/values-ar/08-widget.xml      |   4 +-
 .../src/main/res/values-fr/10-preferences.xml |   4 +-
 AnkiDroid/src/main/res/values-ka/01-core.xml  |   4 +-
 .../src/main/res/values-ka/02-strings.xml     |  14 +-
 .../src/main/res/values-ka/03-dialogs.xml     |  14 +-
 .../src/main/res/values-ka/04-network.xml     |  10 +-
 .../src/main/res/values-ka/07-cardbrowser.xml |   6 +-
 .../src/main/res/values-ka/08-widget.xml      |  12 +-
 .../src/main/res/values-ka/09-backup.xml      |   2 +-
 .../src/main/res/values-ka/10-preferences.xml |  20 +--
 .../src/main/res/values-ka/11-arrays.xml      |   2 +-
 .../res/values-ka/16-multimedia-editor.xml    |   4 +-
 .../main/res/values-ka/17-model-manager.xml   |   2 +-
 AnkiDroid/src/main/res/values-ko/01-core.xml  |  64 ++++----
 .../src/main/res/values-ko/02-strings.xml     |  56 +++----
 .../src/main/res/values-ko/03-dialogs.xml     |  24 +--
 .../src/main/res/values-ko/04-network.xml     |  12 +-
 .../src/main/res/values-ko/05-feedback.xml    |   4 +-
 .../src/main/res/values-ko/07-cardbrowser.xml |  64 ++++----
 .../src/main/res/values-ko/08-widget.xml      |   6 +-
 .../src/main/res/values-ko/09-backup.xml      |  22 +--
 .../src/main/res/values-ko/10-preferences.xml | 147 +++++++++---------
 .../src/main/res/values-ko/11-arrays.xml      |  60 +++----
 .../res/values-ko/16-multimedia-editor.xml    |   6 +-
 .../main/res/values-ko/17-model-manager.xml   |  40 ++---
 .../main/res/values-ko/18-standard-models.xml |   4 +-
 .../res/values-ko/20-search-preference.xml    |   2 +-
 .../src/main/res/values-uk/10-preferences.xml |   2 +-
 28 files changed, 305 insertions(+), 306 deletions(-)

diff --git a/AnkiDroid/src/main/res/values-ar/08-widget.xml b/AnkiDroid/src/main/res/values-ar/08-widget.xml
index 2673746076e2..b7c19975d6d6 100644
--- a/AnkiDroid/src/main/res/values-ar/08-widget.xml
+++ b/AnkiDroid/src/main/res/values-ar/08-widget.xml
@@ -73,9 +73,9 @@
     </plurals>
     <string name="widget_add_note_button">إضافة ملحوظة أنكيدرويد جديدة</string>
     <string name="deck_picker_widget_description" comment="Title of the Deck Picker Widget. Displayed to the user in Android\'s Widget Selection menu">Deck Picker</string>
-    <string name="card_analysis_extra_widget_description">Card Analysis</string>
+    <string name="card_analysis_extra_widget_description">تحليل البطاقة</string>
     <!-- Strings to explain usage in Deck Picker and Card Analysis Widget Configuration screen -->
-    <string name="select_decks_title" comment="Title for Deck Selection Dialog">Select decks</string>
+    <string name="select_decks_title" comment="Title for Deck Selection Dialog">اختيار الزرم</string>
     <string name="select_deck_title" comment="Title for Deck Selection Dialog">Select a deck</string>
     <string name="no_selected_deck_placeholder_title" comment="Placeholder title when no decks are selected">Select decks to display in the widget. Select decks with the + icon.</string>
     <string name="deck_removed_from_widget" comment="Snackbar when deck is removed from widget">Deck removed</string>
diff --git a/AnkiDroid/src/main/res/values-fr/10-preferences.xml b/AnkiDroid/src/main/res/values-fr/10-preferences.xml
index 66087e51ff61..a92d84ba8821 100644
--- a/AnkiDroid/src/main/res/values-fr/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-fr/10-preferences.xml
@@ -97,7 +97,7 @@
     <string name="gestures_summ">Assigner des gestes à des actions comme répondre et éditer des cartes.</string>
     <string name="gestures_corner_touch" maxLength="41">Écran tactile à 9 points</string>
     <string name="gestures_corner_touch_summary">Autoriser les gestes dans les coins de l\'écran</string>
-    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Afficher les raccourcis clavier</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Panneau de navigation plein écran</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Ouvrir le panneau de navigation lors d\'un balayage vers la droite de n\'importe où sur l\'écran</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Aucun</string>
@@ -163,7 +163,7 @@
     <string name="vertical_centering_summ">Centrer verticalement le contenu des cartes</string>
     <string name="pref_double_tap_time_interval" maxLength="41">Temps d\'intervalle de l\'appui double (ms)</string>
     <string name="pref_double_tap_time_interval_summary">Un deusième appui sur le bouton de réponse va être ignoré si le temps est écoulé. Cela évite les appuis doubles involontaires.</string>
-    <string name="pref_show_answer_long_press_time" maxLength="41">Show answer long-press time</string>
+    <string name="pref_show_answer_long_press_time" maxLength="41">Durée appui du bouton réponse</string>
     <string name="pref_show_answer_long_press_time_summary">Un minimum de temps d\'appui avant que le bouton d\'affichage de réponse n\'enregistre une touche.</string>
     <string name="show_estimates" maxLength="41">Afficher le temps</string>
     <string name="show_estimates_summ">Afficher le temps avant la prochaine révision sur les boutons de réponse</string>
diff --git a/AnkiDroid/src/main/res/values-ka/01-core.xml b/AnkiDroid/src/main/res/values-ka/01-core.xml
index 27b9314a44b8..d550be56a871 100644
--- a/AnkiDroid/src/main/res/values-ka/01-core.xml
+++ b/AnkiDroid/src/main/res/values-ka/01-core.xml
@@ -147,7 +147,7 @@
     <string name="card_template_editor_front">წინა შაბლონი</string>
     <string name="card_template_editor_back">უკანა შაბლონი</string>
     <string name="card_template_editor_styling" maxLength="28">სტილი</string>
-    <string name="card_template_editor_menu_card_browser_appearance" maxLength="28">ბარათების საძიებოს გარეგნობა</string>
+    <string name="card_template_editor_menu_card_browser_appearance" maxLength="28">იერსახე ბარათების საძიებოში</string>
     <string name="card_template_editor_deck_override" maxLength="28">დასტის გადატანა</string>
     <string name="card_template_editor_insert_field" maxLength="28">ველის ჩასმა</string>
     <string name="card_template_editor_select_field">ველის არჩევა</string>
@@ -163,7 +163,7 @@
     <string name="card_template_editor_save_error">ბარათის შაბლონის შენახვა შეუძლებელია: %s</string>
     <string name="template_for_current_card_deleted">ბარათის ტიპი ამ ბარათიდან წაიშალა.</string>
     <!-- Card Browser Appearance -->
-    <string name="card_template_browser_appearance_title">საძიებოს გარეგნობა</string>
+    <string name="card_template_browser_appearance_title">იერსახე საძიებოში</string>
     <!-- card Info -->
     <string name="card_info_title" maxLength="28">ბარათის ინფო</string>
     <!-- Permissions -->
diff --git a/AnkiDroid/src/main/res/values-ka/02-strings.xml b/AnkiDroid/src/main/res/values-ka/02-strings.xml
index 13dcc628f222..9cc5faccc996 100644
--- a/AnkiDroid/src/main/res/values-ka/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ka/02-strings.xml
@@ -134,7 +134,7 @@
     <string name="import_preparing_file">ფაილის მომზადება იმპორტისთვის&#8230;</string>
     <string name="import_message_add" comment="Adding a new deck to the collection (import)">დამატება</string>
     <string name="import_message_replace_confirm">არსებული კოლექცია წაიშლება და ჩანაცვლდება არჩეული ფაილის მონაცემებით %s</string>
-    <string name="import_dialog_message_add">Add “%s” to collection? This may take a long time</string>
+    <string name="import_dialog_message_add">„%s“ დაემატოს კოლექციას? ამას შეიძლება გარკვეული დრო დასჭირდეს</string>
     <string name="import_log_no_apkg">ეს არ არის მოქმედი Anki-პაკეტის ფაილი</string>
     <string name="import_title_error" comment="Title of error dialog">შეცდომა</string>
     <string name="import_error_handle_exception">ფაილის იმპორტირება ვერ მოხერხდა\n\n%s</string>
@@ -229,7 +229,7 @@
     <string name="edit_toolbar_item">ხელსაწყოთა ზოლის ელემენტის რედაქტირება</string>
     <string name="toolbar_item_explain_edit_or_remove">შეიყვანეთ მონიშნული ტექსტის ორივე ბოლოს ჩასასმელი HTML-კოდი\n\nხელსაწყოთა ზოლს დიდი ხნით დააჭირეთ, რათა დაარედაქტიროთ ან წაშალოთ</string>
     <string name="remove_toolbar_item">ამოიშალოს ხელსაწყოთა ზოლის ელემენტი?</string>
-    <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
+    <string name="note_editor_image_too_large">სურათი ზედმეტად დიდია. გთხოვთ, სურათი ხელით ჩაამატოთ</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
     <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        მიმდინარეობს Android-ის სარეზერვო ასლის შექმნა. გთხოვთ, ხელახლა სცადოთ</string>
@@ -258,7 +258,7 @@
     <string name="deck_download_progress_message">ჩამოტვირთვისას შეგიძლიათ სხვა აპლიკაციებიც გამოიყენოთ</string>
     <string name="check_network">გთხოვთ შეამოწმოთ ქსელთან კავშირი</string>
     <string name="search_using_deck_name">დასტის სახელით ძებნა</string>
-    <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
+    <string name="external_storage_unavailable">ჩამოტვირთვა გაუქმდა, გარე მეხსიერება ხელმიუწვდომელია</string>
     <string name="home" maxLength="28">მთავარი</string>
     <!-- Reviewer actions 
     Each of these strings ends with a period, following the notation of Anki Desktop -->
@@ -281,11 +281,11 @@
     <string name="expand_tag">იარლიყის „%s“ გაშლა</string>
     <!-- Manage note types -->
     <string name="field_editor_model_not_available">კოლექციაზე წვდომა ვერ მოხერხდა. გთხოვთ ხელახლა სცადოთ!</string>
-    <string name="cd_manage_notetypes_add">Add a new note type</string>
+    <string name="cd_manage_notetypes_add">ახალი შენიშვნის ტიპის დამატება</string>
     <!-- App Intro -->
     <string name="intro_ankidroid_tagline_one">ნაკლები მეცადინეობა</string>
     <string name="intro_ankidroid_tagline_two">მეტის დამახსოვრება</string>
-    <string name="intro_short_ankidroid_explanation">Anki\'s card scheduler saves time by strengthening your weakest memories and preserving your strongest</string>
+    <string name="intro_short_ankidroid_explanation">Anki-ს განრიგის მგეგმავი რთულად დასახსომებელი ცოდნის უკეთ დასწავლასა და ღრმა ცოდნის შენარჩუნებაში გეხმარებათ, რათა დაზოგოთ ძვირფასი დრო </string>
     <string name="intro_get_started" comment="Action to start AnkiDroid for the first time without syncing from AnkiWeb">დაწყება</string>
     <string name="intro_sync_from_ankiweb">სინქრონიზაცია AnkiWeb-თან</string>
     <!-- IntentHandler -->
@@ -336,7 +336,7 @@
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">დასტის ამრჩეველი</string>
-    <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
+    <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">დასტის წაშლა დადასტურების გარეშე</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">შენიშვნების რედაქტორი</string>
     <string name="select_deck" comment="Description of the shortcut that opens the deck selection dialog">დასტის არჩევა</string>
     <string name="select_note_type" comment="Description of the shortcut that shows the note selection spinner">შენიშვნის ტიპის არჩევა</string>
@@ -346,7 +346,7 @@
     <string name="edit_back_template" comment="Description of the shortcut that shows the answer side of the card template">უკანა მხარის შაბლონის რედაქტირება</string>
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">სტილის რედაქტირება</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">შაბლონის კოპირება markdown-ად</string>
-    <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
+    <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">ბარათების საძიებოს იერსახის რედაქტირება</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ka/03-dialogs.xml b/AnkiDroid/src/main/res/values-ka/03-dialogs.xml
index 541393b5cf7c..efd2c32584f6 100644
--- a/AnkiDroid/src/main/res/values-ka/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ka/03-dialogs.xml
@@ -65,7 +65,7 @@
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">შეცდომის შეტყობინება</string>
     <string name="storage_full_message">არ არის საკმარისი თავისუფალი მეხსიერების სივრცე, რომ AnkiDroid-ის გახსნა მოხერხდეს. გთხოვთ, მეხსიერების სივრცეში ადგილი გაანთავისუფლოთ.</string>
-    <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
+    <string name="repair_deck_dialog">ნამდვილად გსურთ, სცადოთ მონაცემთა ბაზის შეკეთება?\n\nმცდელობის დაწყებამდე შეიქმნება ასლი ქვესაქაღალდეში: „%s“.</string>
     <string name="intent_aedict_empty">კატეგორია „ნაგულისხმევი“ ცარიელია</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
     <string name="custom_study_new_extend">დღევანდელი ახალი ბარათების ლიმიტის გაზრდა/შემცირება (\"-3\") ამდენით:</string>
@@ -226,8 +226,8 @@
         <item quantity="other">ბარათების ჩვენება ამდენ დღეში</item>
     </plurals>
     <plurals name="set_due_date_range_label" comment="a date control is provided afterwards">
-        <item quantity="one">Show card in range</item>
-        <item quantity="other">Show cards in range</item>
+        <item quantity="one">ბარათის ჩვენება დროის მონაკვეთში</item>
+        <item quantity="other">ბარათების ჩვენება დროის მონაკვეთში</item>
     </plurals>
     <plurals name="set_due_date_label_suffix" comment="a suffix on a text field allowing a user to enter a number of days">
         <item quantity="one">დღეში</item>
@@ -239,14 +239,14 @@
     <!-- Instant Note Editor -->
     <string name="cloze_note_required">Cloze Type Note Required</string>
     <string name="cloze_not_found_message">No Cloze type note found, open the Note Editor or try again after adding a Cloze type note.</string>
-    <string name="open">Open</string>
-    <string name="change_cloze_number">Change cloze number</string>
-    <string name="cloze_number">Cloze number:</string>
+    <string name="open">გახსნა</string>
+    <string name="change_cloze_number">გამოტოვებული ადგილის ნომრის შეცვლა</string>
+    <string name="cloze_number">გამოტოვებული ადგილის ნომერი:</string>
     <string name="change_editor_mode">რედაქტორის რეჟიმის შეცვლა</string>
     <string name="open_note_editor">შენიშვნის რედაქტორის გახსნა</string>
     <string name="change_cloze_mode">გამოტოვებული ადგილების რეჟიმის შეცვლა</string>
     <!-- Outdated WebView dialog -->
-    <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
+    <string name="webview_update_message">სისტემის WebView მოძველებულია. ზოგი ფუნქცია სათანადოდ ვერ იმუშავებს. გთხოვთ განაახლოთ.\n\nდაყენებული ვერსია: %1$d\nმინიმალური ვერსია, რომელიც საჭიროა: %2$d</string>
     <string name="compress">კომპრესირება</string>
     <!-- Tts playback error dialog -->
     <string name="tts_error_dialog_title">ენა მხარდაჭერილი არაა</string>
diff --git a/AnkiDroid/src/main/res/values-ka/04-network.xml b/AnkiDroid/src/main/res/values-ka/04-network.xml
index f9dd49cc55ec..4099135e7610 100644
--- a/AnkiDroid/src/main/res/values-ka/04-network.xml
+++ b/AnkiDroid/src/main/res/values-ka/04-network.xml
@@ -52,7 +52,7 @@
     <string name="menu_get_shared_decks">გაზიარებული დასტების დამატება</string>
     <string name="connection_error_message">ქსელის შეცდომა მოხდა</string>
     <string name="not_logged_in_title">AnkiWeb-ში შესვლა</string>
-    <string name="login_create_account_message">You must log in to a third party account to use the cloud sync service. You can create one in the next step.</string>
+    <string name="login_create_account_message">Cloud სინქრონიზაციის სერცისით სარგებლობისათვის უნდა გაიაროთ მესამე მხარის ანგარიშის ავტორიზაცია. შემდეგილ ნაბიჯზე შეგეძლებათ, შექმნათ ახალი ანგარიში.</string>
     <!-- MyAccount.kt -->
     <string name="username">ელფოსტის მისამართი</string>
     <string name="password">პაროლი</string>
@@ -70,15 +70,15 @@
     <string name="sync_title">სინქრონიზაცია</string>
     <string name="sync_log_uploading_message">სრული სინქრონიზაცია ლოკალურიდან</string>
     <string name="sync_database_acknowledge">კოლექციის სინქრონიზაცია წარმატებით განხორციელდა</string>
-    <string name="col_synced_media_in_background">Collection synced. Media is being synced in the background.</string>
+    <string name="col_synced_media_in_background">კოლექცია სინქრონიზებულია. მედიაფაილების სინქრონიზაცია ფონურ რეჟიმში მიმდინარეობს.</string>
     <string name="sync_corrupt_database">თქვენი მონაცემთა ბაზა დაზიანებულია. გთხოვთ, სინქრონიზების ხელახლა ცდამდე პრობლემა აღმოფხვრათ.\n\nმონაცემთა ბაზის გამოსასწორებლად საჭირო ინფორმაციისთვის იხილეთ %s.</string>
     <!-- Please run ‘Check database’ before syncing -->
     <string name="sync_sanity_local">ლოკალური</string>
     <string name="sync_sanity_remote">დისტანციური</string>
     <string name="one_way_sync_title" maxLength="41">ცალმხრივი სინქრონიზაცია</string>
-    <string name="one_way_sync_confirmation">One way sync requested</string>
-    <string name="full_sync_confirmation">The requested change will require a full upload of the database when you next synchronize your collection. If you have reviews or other changes waiting on another device that haven’t been synchronized here yet, they will be lost. Continue?</string>
-    <string name="full_sync_confirmation_upgrade">Due to a bug in the previously installed version of AnkiDroid, it’s recommended to force a full sync.</string>
+    <string name="one_way_sync_confirmation">ცალმხრივი სინქრონიზაციის მოთხოვნა მიღებულია</string>
+    <string name="full_sync_confirmation">მოთხოვნილი ცვლილება კოლექციის შემდეგი სინქრონიზაციის დროს შექმნის მონაცემთა ბაზის სრულად ატვირთვის საჭიროებას. იმ შემთხვევაში თუ სხვა მოწყობილობაზე გაქვთ გადახედვები ან სხვა ცვლილებები, რომლებიც აქ არაა სინქრონიზებული, მოხსენებული ცვლილებები დაიკარგება. გსურთ გაგრძელება?</string>
+    <string name="full_sync_confirmation_upgrade">წინათ დაყენებული AnkiDroid-ის ვერსიაში არსებული ხარვეზის გამო რეკომენდებულია სრული სინქრონიზაციის დაძალება.</string>
     <!-- Deck Picker Sync Icon -->
     <string name="sync_menu_title_one_way_sync">სინქრონიზაცია (ცალმხრივი)</string>
     <string name="sync_menu_title_no_account">სინქრონიზაცია (ავტორიზაცია)</string>
diff --git a/AnkiDroid/src/main/res/values-ka/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-ka/07-cardbrowser.xml
index 0c2986ff1b36..2a383759aff4 100644
--- a/AnkiDroid/src/main/res/values-ka/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-ka/07-cardbrowser.xml
@@ -95,7 +95,7 @@
     <string name="card_browser_search_all_decks">ყველა დასტაში ძებნა</string>
     <string name="card_browser_unknown_deck_name">უცნობი</string>
     <string name="card_browser_truncate" comment="allows users to show less of a field value">შიგთავსის დამოკლება</string>
-    <string name="set_due_date_hintText" comment="plural set_due_date_label_suffix is used for parameters, parameter 1 is the plural for 0, parameter 2 is the plural for 1">Today is ‘0 %1$s’, tomorrow is ‘1 %2$s’, etc&#8230;</string>
+    <string name="set_due_date_hintText" comment="plural set_due_date_label_suffix is used for parameters, parameter 1 is the plural for 0, parameter 2 is the plural for 1">დღევანდელი დღე არის „0 %1$s“, ხვალინდელი — „1 %2$s“ — და ა.შ.</string>
     <plurals name="card_browser_export_cards">
         <item quantity="one">ბარათის ექსპორტირება</item>
         <item quantity="other">ბარათების ექსპორტირება</item>
@@ -109,8 +109,8 @@
         <item quantity="other">%d ბარათი წაიშალა</item>
     </plurals>
     <!--Keyboard shortcuts dialog-->
-    <string name="edit_tags_dialog" comment="Description of the shortcut that opens the edit tags dialog">Edit tags dialog</string>
-    <string name="show_order_dialog" comment="Description of the shortcut that shows the order dialog">Show order dialog</string>
+    <string name="edit_tags_dialog" comment="Description of the shortcut that opens the edit tags dialog">იარლიყის რედაქტირების ფანჯარა</string>
+    <string name="show_order_dialog" comment="Description of the shortcut that shows the order dialog">თანმიმდევრობის ჩვენების ფანჯარა</string>
     <!-- Manage columns dialog -->
     <string name="browse_manage_columns_main_heading">სვეტები</string>
     <string name="browse_manage_columns">სვეტების მართვა</string>
diff --git a/AnkiDroid/src/main/res/values-ka/08-widget.xml b/AnkiDroid/src/main/res/values-ka/08-widget.xml
index c12994f1ed44..d796910d5aeb 100644
--- a/AnkiDroid/src/main/res/values-ka/08-widget.xml
+++ b/AnkiDroid/src/main/res/values-ka/08-widget.xml
@@ -65,13 +65,13 @@
     <!-- Strings to explain usage in Deck Picker and Card Analysis Widget Configuration screen -->
     <string name="select_decks_title" comment="Title for Deck Selection Dialog">დასტების არჩევა</string>
     <string name="select_deck_title" comment="Title for Deck Selection Dialog">დასტის არჩევა</string>
-    <string name="no_selected_deck_placeholder_title" comment="Placeholder title when no decks are selected">Select decks to display in the widget. Select decks with the + icon.</string>
+    <string name="no_selected_deck_placeholder_title" comment="Placeholder title when no decks are selected">აირჩიეთ დასტები, რომლებიც ვიჯეტში გამოჩნდება. დასტების ასარჩევად დააჭირეთ „+“ ხატულას.</string>
     <string name="deck_removed_from_widget" comment="Snackbar when deck is removed from widget">დასტა ამოიშალა ვიჯეტიდან</string>
-    <string name="deck_already_selected_message" comment="Snackbar when user try to select the same deck again">This deck is already selected</string>
+    <string name="deck_already_selected_message" comment="Snackbar when user try to select the same deck again">ეს დასტა უკვე მონიშნულია</string>
     <plurals name="deck_limit_reached">
-        <item quantity="one">You can select up to %d deck.</item>
-        <item quantity="other">You can select up to %d decks.</item>
+        <item quantity="one">%d-მდე დასტის მონიშვნა შეგიძლიათ.</item>
+        <item quantity="other">%d-მდე დასტის მონიშვნა შეგიძლიათ.</item>
     </plurals>
-    <string name="empty_widget_state" comment="To denote the widget is empty">Missing deck. Tap to reconfigure.</string>
-    <string name="empty_collection_state_in_widget" comment="To denote the collection is empty">Collection is empty, use app to add decks then reconfigure</string>
+    <string name="empty_widget_state" comment="To denote the widget is empty">დასტა აკლია. დააჭირეთ ხელახლად დასაყენებლად.</string>
+    <string name="empty_collection_state_in_widget" comment="To denote the collection is empty">კოლექცია ცარიელია, გამოიყენეთ აპლიკაცია დასტების დასამატებლად და ხელახლა სცადეთ</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ka/09-backup.xml b/AnkiDroid/src/main/res/values-ka/09-backup.xml
index e6cd18a7491e..09fe8c5730ce 100644
--- a/AnkiDroid/src/main/res/values-ka/09-backup.xml
+++ b/AnkiDroid/src/main/res/values-ka/09-backup.xml
@@ -50,7 +50,7 @@
     <string name="backup_new_collection">ახალი კოლექცია</string>
     <string name="backup_del_collection">კოლექციის წაშლა და ახლის შექმნა</string>
     <string name="backup_del_collection_question">გსურთ კოლექციის წაშლა და ახლის შექმნა? დადასტურების შემთხვევაში წაიშლება როგორც მთელი სწავლის პროგრესი, ასევე ყველა ბარათი.</string>
-    <string name="backup_one_way_sync_from_server">One-way sync from server</string>
+    <string name="backup_one_way_sync_from_server">ცალმხრივი სინქრონიზაცია სერვერიდან</string>
     <string name="backup_full_sync_from_server_question">ჩანაცვლდეს კოლექცია AnkiWeb-ზე შენახული ვერსიით? დადასტურების შემთხვევაში წაიშლება როგორც მთელი სწავლის პროგრესი, ასევე ბოლო სინქრონიზაციის შემდეგ დამატებული ინფორმაცია.</string>
     <string name="error_handling_title">შეცდომის გამართვა</string>
     <string name="error_handling_options" comment="In a warning message, the label of the suggested action that the user should take">პარამეტრები</string>
diff --git a/AnkiDroid/src/main/res/values-ka/10-preferences.xml b/AnkiDroid/src/main/res/values-ka/10-preferences.xml
index 355eceed09df..0987fb3f8a16 100644
--- a/AnkiDroid/src/main/res/values-ka/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ka/10-preferences.xml
@@ -97,7 +97,7 @@
     <string name="gestures_summ">ჟესტების მიბმა მოქმედებებთან, როგორებიცაა მაგალითად პასუხის გაცემა ან ბარათის რედაქტირება.</string>
     <string name="gestures_corner_touch" maxLength="41">9-წერტილიანი შეხება</string>
     <string name="gestures_corner_touch_summary">ეკრანის კუთხეებში შეხების ჟესტების დაშვება</string>
-    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">კლავიშების კომბინაციების ჩვენება</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">სრულეკრანიანი რეჟიმის ნავიგაციის პანელი</string>
     <string name="gestures_fullscreen_nav_drawer_summary">ეკრანის ნებისმიერი წერტილიდან მარჯვნივ გასმისას ნავიგაციის პანელის გახსნა</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">არცერთი</string>
@@ -120,7 +120,7 @@
     <string name="card_browser_enable_external_context_menu">„%s“-მენიუ</string>
     <string name="card_browser_enable_external_context_menu_summary">გლობალურად ამატებს „%s“ ღილაკს კონტექსტურ მენიუში (მენიუ, რომელიც ტექსტის მონიშვნისას ჩნდება)</string>
     <string name="double_scrolling_gap" maxLength="41">ორმაგი ჩამოყოლა</string>
-    <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>
+    <string name="double_scrolling_gap_summ">ელ-წამკითხველებში ეკრანის აწევ-ჩამოწევის დაშორების გაორმაგება</string>
     <string name="swipe_sensitivity" maxLength="41">თითის გასმის აღქმადობა</string>
     <string name="tts" maxLength="41">ტექსტის გახმოვანება</string>
     <string name="tts_summ">ხმამაღლა კითხულობს კითხვასა და პასუხს, როცა მოცემული არაა აუდიოფაილი</string>
@@ -160,7 +160,7 @@
     <!--See: multimedia_editor_popup_cloze. We can\'t use format strings as this is auto-generated-->
     <string name="disable_extended_text_ui_summ">შესაძლებელს ხდის, გამოიყენოთ „გამოტოვებული ადგილის“ კონტექსტური მენიუ ჰორიზონტალურ რეჟიმში.</string>
     <string name="vertical_centering" maxLength="41">ცენტრში მოთავსება</string>
-    <string name="vertical_centering_summ">Center the content of cards vertically</string>
+    <string name="vertical_centering_summ">ბარათების შიგთავსის ვერტიკალურ ცენტრში მოთავსება</string>
     <string name="pref_double_tap_time_interval" maxLength="41">ორმაგი შეხების შუალედის დრო (მილიწამებში)</string>
     <string name="pref_double_tap_time_interval_summary">A second tap of the answer buttons will be ignored if this time has not elapsed. This prevents accidental double taps</string>
     <string name="pref_show_answer_long_press_time" maxLength="41">შეხების საჭირო ხანგრძლივობა პასუხის საჩვენებლად</string>
@@ -257,8 +257,8 @@
     <string name="contributors_title">მონაწილეები</string>
     <string name="about_contributors_description"><![CDATA[These are our awesome <a href=\"%1$s\">contributors</a>. You can help AnkiDroid too by programming, translating, donating and <a href=\"%2$s\">more</a>!]]></string>
     <string name="license">ლიცენზია</string>
-    <string name="license_description"><![CDATA[AnkiDroid is released under the <a href=\"%1$s\">GPL-3.0</a> and <a href=\"%2$s\">AGPL-3.0</a> licenses, with the source code available <a href=\"%3$s\">on GitHub</a>]]></string>
-    <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
+    <string name="license_description"><![CDATA[AnkiDroid გამოშვებულია <a href=\"%1$s\">GPL-3.0</a> და <a href=\"%2$s\">AGPL-3.0</a> ლიცენზიებით. საწყისი კოდის სანახავად ეწვიეთ <a href=\"%3$s\">GitHub-ს</a>]]></string>
+    <string name="donate_description"><![CDATA[<a href=\"%1$s\">შემოწირულებით</a> შეგიძლიათ ხელი შეუწყოთ AnkiDroid-ის განვითარებას. ნებისმიერი რაოდენობის თანხას ვაფასებთ.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">ჟესტის დამატება</string>
     <string name="binding_add_key">კლავიშის დამატება</string>
@@ -276,7 +276,7 @@
     <string name="user_action_7" maxLength="28">მომხმარებლის ქმედება 7</string>
     <string name="user_action_8" maxLength="28">მომხმარებლის ქმედება 8</string>
     <string name="user_action_9" maxLength="28">მომხმარებლის ქმედება 9</string>
-    <string name="toggle_auto_advance" maxLength="41">Toggle auto advance</string>
+    <string name="toggle_auto_advance" maxLength="41">ავტომატური გაგრძელების ჩართვა/გამორთვა</string>
     <!-- Select card side -->
     <string name="card_side_selection_title">ბარათის გვერდის არჩევა</string>
     <string name="card_side_question">კითხვა</string>
@@ -343,7 +343,7 @@
     <string name="pref__delete_everything__title" maxLength="41" comment="Preference title">ყველაფრის წაშლა</string>
     <string name="pref__delete_everything__summary">Delete collection, media, backups, and settings</string>
     <string name="dialog__delete_everything__title" comment="Confirmation dialog title">ყველაფრის წაშლა</string>
-    <string name="dialog__delete_everything__message" comment="“Close the window” here refers to the activity that the user is currently seeing.         Deleting app data forcibly closes AnkiDroid, which closes the activity without animation.         On some devices the entire settings app may be closed.         User might not realize that this activity comes directly from AnkiDroid,         so it might be wise to avoid words such as “AnkiDroid or “app”.">Are you sure you want to delete all data? This includes your collection, media, backups and preferences.\n\nNote: this action will close the window.</string>
+    <string name="dialog__delete_everything__message" comment="“Close the window” here refers to the activity that the user is currently seeing.         Deleting app data forcibly closes AnkiDroid, which closes the activity without animation.         On some devices the entire settings app may be closed.         User might not realize that this activity comes directly from AnkiDroid,         so it might be wise to avoid words such as “AnkiDroid or “app”.">ნამდვილად გსურთ ყველა მონაცემის წაშლა? მონაცემებში შედის თქვენი კოლექცია, მედიაფაილები, სარეზერვო ასლები და ინდივიდუალურად მორგებული პარამეტრები.\n\nშენიშვნა: ამ ქმედებით მიმდინარე ფანჯარა დაიხურება.</string>
     <!-- Delete app data -->
     <string name="pref__delete_app_data__title" maxLength="41" comment="Preference title">აპლიკაციის მონაცემების წაშლა</string>
     <string name="pref__delete_app_data__summary">პარამეტრებისა და აპლიკაციის სხვა მონაცემების წაშლა</string>
@@ -358,14 +358,14 @@
     <string name="pref__etc__snackbar__fetching" comment="Generic snackbar message to be shown when user taps on a preference,         the value of which is being fetched">მიმდინარეობს ამორჩევა&#8230;</string>
     <string name="pref__etc__snackbar__calculating" comment="Generic snackbar message to be shown when user taps on a preference,         the value of which, such as folder size on disk, is being calculated">მიმდინარეობს გამოთვლა&#8230;</string>
     <string name="pref__etc__snackbar__no_collection" comment="Generic snackbar message to be shown when user taps on a preference         that is not usable because the collection does not exist">კოლექცია არ არსებობს</string>
-    <string name="hide_system_bars" maxLength="41" comment="Title of a setting that allows to hide the system bars">Hide system bars</string>
+    <string name="hide_system_bars" maxLength="41" comment="Title of a setting that allows to hide the system bars">სისტემის ზოლების დამალვა</string>
     <string name="hide_system_bars_none" comment="Setting option to not hide any of the system bars">არცერთი</string>
     <string name="hide_system_bars_status_bar" comment="Setting option to hide the system status bar (the top one with clock, battery status, etc)">სტატუსის ზოლი</string>
     <string name="hide_system_bars_navigation_bar" comment="Setting option to hide the system navigation bar (the bottom one that can go back, to home, etc)">ნავიგაციის ზოლი</string>
     <string name="hide_system_bars_all_bars" comment="Setting option to hide all the system bars">ყველა</string>
     <string name="ignore_display_cutout" maxLength="41">ეკრანის ზედა ჭრილის უგულებელყოფა</string>
-    <string name="hide_answer_buttons" maxLength="41">Hide answer buttons</string>
-    <string name="hide_hard_and_easy" maxLength="41">Hide ‘Hard’ and ‘Easy’ buttons</string>
+    <string name="hide_answer_buttons" maxLength="41">პასუხის ღილაკების დამალვა</string>
+    <string name="hide_hard_and_easy" maxLength="41">„მარტივი“ და „რთული“ ღილაკების დამალვა</string>
     <string name="reviewer_frame_style" maxLength="41">ბარათის ჩარჩოს სტილი</string>
     <string name="reviewer_frame_style_card" maxLength="41" comment="Style name of the \'Card\' card frame of the Reviewer">ბარათი (მრგვალი კუთხეები)</string>
     <string name="reviewer_frame_style_box" maxLength="41" comment="Style name of the \'Box\' card frame of the Reviewer">ყუთი (სწორი კუთხეები)</string>
diff --git a/AnkiDroid/src/main/res/values-ka/11-arrays.xml b/AnkiDroid/src/main/res/values-ka/11-arrays.xml
index b6511e4d9816..6637de6cefe4 100644
--- a/AnkiDroid/src/main/res/values-ka/11-arrays.xml
+++ b/AnkiDroid/src/main/res/values-ka/11-arrays.xml
@@ -95,7 +95,7 @@
     <string name="gesture_flag_remove" maxLength="41">დროშის მოძრობა</string>
     <string name="gesture_page_up" maxLength="41">გვერდით მაღლა</string>
     <string name="gesture_page_down" maxLength="41">გვერდით დაბლა</string>
-    <string name="gesture_abort_sync" maxLength="41">Close reviewer and Sync</string>
+    <string name="gesture_abort_sync" maxLength="41">გადამხედველისა და სინქრონიზაციის დახურვა</string>
     <string name="gesture_toggle_whiteboard" maxLength="41">დაფის ჩართვა/გამორთვა</string>
     <string name="gesture_show_hint" maxLength="41">მინიშნების ჩვენება</string>
     <string name="gesture_show_all_hints" maxLength="41">ყველა მინიშნების ჩვენება</string>
diff --git a/AnkiDroid/src/main/res/values-ka/16-multimedia-editor.xml b/AnkiDroid/src/main/res/values-ka/16-multimedia-editor.xml
index 9db10c74fea1..1ee7a6991318 100644
--- a/AnkiDroid/src/main/res/values-ka/16-multimedia-editor.xml
+++ b/AnkiDroid/src/main/res/values-ka/16-multimedia-editor.xml
@@ -69,8 +69,8 @@
     <!-- Crop function-->
     <string name="crop_image">გსურთ ამ სურათის ჩამოჭრა?</string>
     <string name="crop_button" maxLength="28">სურათის ჩამოჭრა</string>
-    <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
+    <string name="save_dialog_content">სურათის ზომა არის %sMB. სურათის ზომის ნაგულისხმევი ლიმიტი შეადგენს 1MB-ს. გსურთ მისი შეკუმშვა?</string>
     <string name="select_image_failed">"სურათი ვერ მოინიშნა, გთხოვთ ხელახლა სცადოთ"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">ველის შიგთავსი</string>
-    <string name="reselect" maxLength="28">Reselect</string>
+    <string name="reselect" maxLength="28">ხელახლა მონიშვნა</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ka/17-model-manager.xml b/AnkiDroid/src/main/res/values-ka/17-model-manager.xml
index 370be12e8281..196079ef0202 100644
--- a/AnkiDroid/src/main/res/values-ka/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ka/17-model-manager.xml
@@ -68,7 +68,7 @@
     <!--This prefix is used for standard note types-->
     <string name="model_browser_add_clone">კლონი: %1$s </string>
     <!--Browser Appearance-->
-    <string name="card_template_browser_appearance_summary">შეიყვანეთ შაბლონი, რომელსაც ბარათების საძიებო პასუხების შემოკლებული ვერსიების საჩვენებლად გამოიყენებს.\n\n\"{{Country}}ს დედაქალაქი არის:\"\nრომ ავიღოთ მაგალითად, მისი შიგთავსი შეიძლება წინა შაბლონით შემოკლდეს როგორც\n\"დედაქალაქი: {{Country}}\"</string>
+    <string name="card_template_browser_appearance_summary">შეიყვანეთ შაბლონი, რომელსაც ბარათების საძიებო პასუხების შემოკლებული ვერსიების საჩვენებლად გამოიყენებს.\n\n\"{{ქვეყანა}}-ს დედაქალაქი არის:\"\nრომ ავიღოთ მაგალითად, მისი შიგთავსი შეიძლება წინა შაბლონით შემოკლდეს როგორც\n\"დედაქალაქი: {{ქვეყანა}}\"</string>
     <string name="card_template_browser_appearance_question_format">კითხვის ფორმატი</string>
     <string name="card_template_browser_appearance_answer_format">პასუხის ფორმატი</string>
     <string name="card_template_browser_appearance_restore_default_dialog">აღდგეს ნაგულისხმევი მონაცემები?</string>
diff --git a/AnkiDroid/src/main/res/values-ko/01-core.xml b/AnkiDroid/src/main/res/values-ko/01-core.xml
index a3577f94eeb1..e4cc16bfb286 100644
--- a/AnkiDroid/src/main/res/values-ko/01-core.xml
+++ b/AnkiDroid/src/main/res/values-ko/01-core.xml
@@ -95,19 +95,19 @@
     <string name="menu_suspend_card" maxLength="28">카드 비활성화하기</string>
     <string name="menu_suspend_note" maxLength="28">노트 미뤄두기</string>
     <string name="menu_bury" maxLength="28">나중에 보기</string>
-    <string name="menu_suspend" maxLength="28">비활성화</string>
+    <string name="menu_suspend" maxLength="28">미뤄두기</string>
     <string name="menu_delete_note" maxLength="28">노트 삭제하기</string>
     <string name="menu_flag" maxLength="41">표시</string>
-    <string name="rename_flag">플래그 이름 변경</string>
-    <string name="menu_flag_card" maxLength="28">카드에 플래그 추가</string>
+    <string name="rename_flag">플래그 이름 변경하기</string>
+    <string name="menu_flag_card" maxLength="28">카드에 플래그 달기</string>
     <string name="menu_edit_tags" maxLength="28">태그 수정</string>
     <string name="delete_note_message">다음 노트와 그 노트의 모든 카드를 정말로 삭제하시겠습니까?\n%s</string>
     <string name="menu_search" maxLength="28">%1$s에서 찾아보기</string>
-    <string name="menu_mark_note" maxLength="28">노트 표시</string>
+    <string name="menu_mark_note" maxLength="28">노트에 표시하기</string>
     <string name="menu_unmark_note">노트 표시 해제</string>
     <string name="menu_enable_voice_playback" maxLength="28">목소리 재생 켜기</string>
     <string name="menu_disable_voice_playback">목소리 재생 끄기</string>
-    <string name="new_deck">카드 묶음 만들기</string>
+    <string name="new_deck">덱 만들기</string>
     <string name="new_dynamic_deck">필터링된 카드 묶음 만들기</string>
     <string name="directory_inaccessible">AnkiDroid 폴더에 접근할 수 없습니다</string>
     <!--This is shown when AnkiDroid starts up with no storage permissions.
@@ -115,39 +115,39 @@
     grant AnkiDroid the \'Storage\' permission. This needs to be a fairly generic message as implementations
     of the permissions/app info screen will differ between devices. -->
     <string name="startup_no_storage_permission">계속하기 위해서는 AnkiDroid에 \'저장소\'권한이 필요합니다.</string>
-    <string name="rebuild_filtered_deck">필터링된 뭉치를 재구성하는 중&#8230;</string>
+    <string name="rebuild_filtered_deck">필터링된 덱을 재구성하는 중&#8230; </string>
     <string name="rebuild_cram_label" maxLength="28">재생성</string>
     <string name="empty_cram_label" maxLength="28">비우기</string>
     <string name="create_subdeck">하위 뭉치 만들기</string>
-    <string name="empty_filtered_deck">필터링된 뭉치를 비우는 중&#8230;</string>
+    <string name="empty_filtered_deck">필터링된 덱을 비우는 중&#8230; </string>
     <string name="custom_study_deck_name">맞춤 학습 세션</string>
     <string name="custom_study_deck_exists">기존의 맞춤 학습 덱의 이름을 먼저 변경하세요.</string>
-    <string name="search_deck" comment="Deck search for selecting it">뭉치 검색</string>
-    <string name="empty_deck">이 뭉치는 비어있습니다.</string>
-    <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">뭉치 검색</string>
-    <string name="invalid_deck_name">유효하지 않은 뭉치 이름입니다</string>
-    <string name="studyoptions_congrats_finished">Congratulations! You have finished for today.</string>
-    <string name="studyoptions_congrats_next_due_in" comment="The param will be replaced with \'The next card will be ready in X time\'">덱이 끝났습니다! %s</string>
+    <string name="search_deck" comment="Deck search for selecting it">덱 검색하기</string>
+    <string name="empty_deck">이 덱은 비어있습니다</string>
+    <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">카드 덱 검색</string>
+    <string name="invalid_deck_name">유효하지 않은 덱 이름</string>
+    <string name="studyoptions_congrats_finished">축하합니다! 오늘의 학습을 마쳤습니다.</string>
+    <string name="studyoptions_congrats_next_due_in" comment="The param will be replaced with \'The next card will be ready in X time\'">이제 덱이 끝났습니다! %s</string>
     <string name="studyoptions_no_cards_due">남은 카드가 없습니다.</string>
-    <string name="sd_card_not_mounted">장치 저장소가 마운트되지 않음</string>
+    <string name="sd_card_not_mounted">기기 저장소 미인식</string>
     <string name="button_sync" comment="Text of the sync button" maxLength="28">동기화</string>
     <string name="cancel_sync_confirm" tools:ignore="UnusedResources">동기화를 취소하시겠습니까?</string>
     <string name="continue_sync" tools:ignore="UnusedResources">동기화 계속하기</string>
-    <string name="sync_cancelled" tools:ignore="UnusedResources">동기화 취소됨</string>
+    <string name="sync_cancelled" tools:ignore="UnusedResources">동기화 취소</string>
     <string name="sync_cancel_message" tools:ignore="UnusedResources">취소하는 중&#8230;\n시간이 걸릴 수 있습니다.</string>
     <string name="syncing_media">미디어 동기화 중</string>
-    <string name="export_deck" maxLength="28">카드 묶음 내보내기</string>
+    <string name="export_deck" maxLength="28">덱 내보내기</string>
     <string name="export_collection">컬렉션 내보내기</string>
     <string name="nothing">없음</string>
     <!-- Card template editor -->
     <string name="title_activity_template_editor">카드 유형</string>
-    <string name="card_template_editor_front">전면 템플릿</string>
-    <string name="card_template_editor_back">후면 템플릿</string>
+    <string name="card_template_editor_front">앞장 템플릿</string>
+    <string name="card_template_editor_back">뒷장 템플릿</string>
     <string name="card_template_editor_styling" maxLength="28">꾸미기</string>
     <string name="card_template_editor_menu_card_browser_appearance" maxLength="28">카드 모양 설정</string>
-    <string name="card_template_editor_deck_override" maxLength="28">뭉치 덮어쓰기</string>
-    <string name="card_template_editor_insert_field" maxLength="28">Insert field</string>
-    <string name="card_template_editor_select_field">Select field</string>
+    <string name="card_template_editor_deck_override" maxLength="28">덱 덮어쓰기</string>
+    <string name="card_template_editor_insert_field" maxLength="28">필드 삽입하기</string>
+    <string name="card_template_editor_select_field">필드 선택하기</string>
     <string name="card_template_editor_cant_delete">적어도 하나의 카드 형식이 필요합니다.</string>
     <plurals name="card_template_editor_confirm_add">
         <item quantity="other">%1$d 카드를 만듭니다. 계속하시겠습니까?</item>
@@ -162,8 +162,8 @@
     <!-- card Info -->
     <string name="card_info_title" maxLength="28">카드 정보</string>
     <!-- Permissions -->
-    <string name="read_write_permission_label">AnkiDroid 데이터베이스에 읽고 쓰기</string>
-    <string name="read_write_permission_description">기존의 노트, 카드, 노트 유형, 카드 묶음을 접근 및 생성</string>
+    <string name="read_write_permission_label">AnkiDroid 데이터베이스 읽고 쓰기</string>
+    <string name="read_write_permission_description">기존의 노트, 카드, 노트 유형, 덱에 접근하여 새로운 항목 생성하기</string>
     <!-- Context Menu -->
     <string name="card_browser_context_menu" comment="The value which appears in the system context menu. Note the casing difference">카드 탐색기</string>
     <string name="context_menu_anki_card_label">Anki 카드</string>
@@ -178,21 +178,21 @@
     <!-- Generic errors -->
     <string name="error__etc__cannot_write_to_or_create_file">%s 파일을 쓰거나 생성할 수 없습니다.</string>
     <string name="directory_inaccessible_after_uninstall" comment="Dialog title if AnkiDroid can\'t access the collection once the app is installed">접근할 수 없는 컬렉션</string>
-    <string name="directory_inaccessible_after_uninstall_summary" comment="the parameter is the path to the AnkiDroid folder. Typically /storage/emulated/0/AnkiDroid">플레이스토어 정책 변경으로 AnkiDroid가 삭제된 후에는 저희가 컬렉션에 접근할 수 없습니다.\n\n데이터는 안전하게 저장되었으며 복구할 수 있습니다. 데이터는 다음 위치에 저장되어 있습니다 \n%s\n\n복구하려면 아래 옵션을 선택하세요:</string>
-    <string name="directory_revoked_after_inactivity" comment="the first parameter is WRITE_EXTERNAL_STORAGE the second parameter is the path to the AnkiDroid folder. Typically /storage/emulated/0/AnkiDroid">안드로이드에서 앱 비활성화로 AnkiDroid의 %1$s 허가를 취소했습니다.\n\n데이터는 안전하게 저장되었으며 복구할 수 있습니다. 데이터는 다음 위치에 저장되어 있습니다.\n%2$s\n\n복구하려면 아래 옵션을 선택하세요.</string>
-    <string name="restore_data_from_ankiweb">AnkiWeb에서 복구(권장)</string>
-    <string name="install_non_play_store_ankidroid_recommended">폴더 접근 권한 복구(권장)</string>
-    <string name="install_non_play_store_ankidroid">폴더 접근 권한 복구(고급)</string>
-    <string name="restore_data_from_backup">.colpkg 백업에서 복구(고급)</string>
-    <string name="create_new_collection">새 컬렉션 생성</string>
+    <string name="directory_inaccessible_after_uninstall_summary" comment="the parameter is the path to the AnkiDroid folder. Typically /storage/emulated/0/AnkiDroid">플레이 스토어 정책 변경으로 AnkiDroid가 삭제된 후에는 저희가 컬렉션에 접근할 수 없습니다.\n\n데이터는 안전하게 저장되었으며 복구할 수 있습니다. 데이터는 다음 위치에 저장되어 있습니다 \n%s\n\n복구하려면 아래 옵션을 선택하세요:</string>
+    <string name="directory_revoked_after_inactivity" comment="the first parameter is WRITE_EXTERNAL_STORAGE the second parameter is the path to the AnkiDroid folder. Typically /storage/emulated/0/AnkiDroid">안드로이드에서 앱 비활성화로 인해 AnkiDroid의 %1$s 권한을 제거했습니다.\n\n데이터는 안전하게 저장되었으며 복구 가능합니다. 데이터는 다음 위치에 저장되어 있습니다.\n%2$s\n\n데이터를 복구하려면 아래 옵션을 선택하세요.</string>
+    <string name="restore_data_from_ankiweb">AnkiWeb에서 복구하기(권장)</string>
+    <string name="install_non_play_store_ankidroid_recommended">폴더 접근 권한 복구 (권장)</string>
+    <string name="install_non_play_store_ankidroid">폴더 접근 권한 복구하기 (고급)</string>
+    <string name="restore_data_from_backup">.colpkg 백업에서 복구하기 (고급)</string>
+    <string name="create_new_collection">새 컬렉션 생성하기</string>
     <string name="new_unsafe_collection">AnkiDroid를 삭제할 경우 새 컬렉션이 기기에서 삭제됩니다.</string>
     <!-- Permissions screen -->
     <string name="permissions_screen_headline">작업을 위해 AnkiDroi에 다음 권한이 필요합니다</string>
-    <string name="storage_access_title">저장소 접근</string>
+    <string name="storage_access_title">저장소에 접근하기</string>
     <string name="storage_access_summary">앱이 삭제될 경우 컬렉션이 함께 삭제되지 않도록 안전한 공간에 컬렉션을 저장해 주세요.</string>
     <string name="all_files_access_title" comment="Name of the “All files access” permission from Android 10 and after">모든 파일 접근</string>
     <string name="image_occlusion">Image Occlusion</string>
-    <string name="remove_account" comment="open a website to start the deletion of an AnkiWeb account">계정 삭제</string>
+    <string name="remove_account" comment="open a website to start the deletion of an AnkiWeb account">계정 삭제하기</string>
     <!-- Instant Note Editor -->
     <string name="instant_card" comment="This does not need to be translated literally, translate the concept of quickly adding a Cloze note with a popup. Used in the Android system context menu/share dialog.">즉석 카드</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ko/02-strings.xml b/AnkiDroid/src/main/res/values-ko/02-strings.xml
index 144d09ca265b..016082d9c455 100644
--- a/AnkiDroid/src/main/res/values-ko/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ko/02-strings.xml
@@ -48,7 +48,7 @@
     <string name="drawer_open">메뉴 열기</string>
     <string name="drawer_close">메뉴 닫기</string>
     <string name="CardEditorCardDeck">카드 덱:</string>
-    <string name="CardEditorNoteDeck">덱:</string>
+    <string name="CardEditorNoteDeck">덱 :</string>
     <string name="CardEditorModel">유형:</string>
     <string name="CardEditorTags">태그: %1$s</string>
     <string name="CardEditorCards">카드: %1$s</string>
@@ -61,23 +61,23 @@
     <string name="no_tags">아직 추가된 태그가 없습니다.</string>
     <string name="updated_version">버전 %s로 업데이트됨</string>
     <!-- Reviewer.kt -->
-    <string name="save_whiteboard" maxLength="28">화이트보드 저장</string>
+    <string name="save_whiteboard" maxLength="28">화이트보드 저장하기</string>
     <string name="enable_stylus" maxLength="28">스타일러스 쓰기 켜기</string>
     <string name="disable_stylus">스타일러스 쓰기 끄기</string>
-    <string name="enable_whiteboard" maxLength="28">화이트보드 활성화</string>
-    <string name="disable_whiteboard">화이트보드 비활성화</string>
-    <string name="show_whiteboard">화이트보드 보이기</string>
+    <string name="enable_whiteboard" maxLength="28">화이트보드 활성화하기</string>
+    <string name="disable_whiteboard">화이트보드 비활성화하기</string>
+    <string name="show_whiteboard">화이트보드 표시하기</string>
     <string name="hide_whiteboard" maxLength="28">화이트 보드 숨기기</string>
     <string name="clear_whiteboard" maxLength="28">화이트 보드 지우기</string>
     <string name="replay_audio" maxLength="28">오디오 다시 재생</string>
-    <string name="leech_suspend_notification">해당 카드에 leech 태그를 붙이고 비활성 시킴</string>
-    <string name="leech_notification">해당 카드에 leech 태그를 붙임</string>
+    <string name="leech_suspend_notification">카드에 leech 태그를 붙이고 비활성 시키기</string>
+    <string name="leech_notification">카드에 leech 태그를 붙이기</string>
     <string name="webview_crash_unknown">알 수 없는 오류</string>
     <string name="webview_crash_unknwon_detailed">WebView의 내부적인 오류입니다.</string>
     <string name="webview_crash_oom">메모리 부족</string>
     <string name="webview_crash_oom_details">WebView이 시스템에 의해 강제종료 되었습니다. 보통 용랑이 큰 사진, 음성, 글꼴 등 미디어 파일 때문에 메모리가 부족해서 이런 일이 생길 수 있습니다.</string>
     <string name="webview_crash_nonfatal">WebView 렌더러가 다음 이유 때문에 강제종료되었습니다: %s</string>
-    <string name="webview_crash_fatal">중대 오류: WebView 렌더러가 다음 이유 때문에 강제종료되었습니다: %s</string>
+    <string name="webview_crash_fatal">심각한 오류: WebView 렌더러가 다음 이유 때문에 강제종료되었습니다: %s</string>
     <string name="webview_crash_loop_dialog_title">WebView 렌더링이 실패했습니다.</string>
     <string name="webview_crash_loop_dialog_content">WebView가 \'%1$s\' 카드를 렌더링하지 못했습니다.
 %2$s</string>
@@ -88,13 +88,13 @@
         <item quantity="other">+%d 숨겨짐</item>
     </plurals>
     <string name="studyoptions_total_new_label">새 카드 수</string>
-    <string name="studyoptions_total_label">전체 카드</string>
+    <string name="studyoptions_total_label">전체 카드 수</string>
     <!-- Card editor -->
     <string name="cardeditor_title_edit_card" maxLength="28">노트 편집하기</string>
-    <string name="discard">삭제</string>
+    <string name="discard">삭제하기</string>
     <string name="note_editor_no_cards_created">작성된 카드가 없습니다. 먼저 필드를 입력해주십시오.</string>
     <string name="note_editor_no_cards_created_all_fields">현재의 노트 유형으로는 카드를 생성할 수 없습니다.\n먼저 다른 노트 유형을 선택하거나 \'카드\'를 눌러 대체할 필드를 생성해주십시오.</string>
-    <string name="note_editor_insert_cloze_no_cloze_note_type">빈칸 뚫기는 오직 빈칸 노트 유형에서만 작동합니다.</string>
+    <string name="note_editor_insert_cloze_no_cloze_note_type">빈칸 뚫기는 오직 빈칸 노트 유형(Cloze)에서만 작동합니다.</string>
     <string name="saving_facts">노트 저장 중</string>
     <string name="saving_model">노트 유형 저장 중</string>
     <string name="save" maxLength="28">저장</string>
@@ -113,7 +113,7 @@
         <item quantity="other">%1$d분</item>
     </plurals>
     <string name="fact_adder_intent_title" comment="Label of the \'Add Note\' window. This title can\'t be seen in AnkiDroid directly.">AnkiDroid 카드</string>
-    <string name="note_editor_copy_note" maxLength="28">노트 복사</string>
+    <string name="note_editor_copy_note" maxLength="28">노트 복사하기</string>
     <string name="card_editor_reposition_card" comment="reposition a card in the new queue" maxLength="28">위치 변경</string>
     <string name="card_editor_reset_card" maxLength="28">학습 진도 재설정</string>
     <string name="card_editor_reschedule_card" comment="Action to reschedule a card" maxLength="28">일정 변경</string>
@@ -131,7 +131,7 @@
     <string name="import_title">가져오는 중</string>
     <string name="import_preparing_file">불러올 파일 준비 중&#8230;</string>
     <string name="import_message_add" comment="Adding a new deck to the collection (import)">추가</string>
-    <string name="import_message_replace_confirm">기존의 컬렉션을 삭제하고 파일 %s의 데이터로 덮어씁니다. 확실합니까?</string>
+    <string name="import_message_replace_confirm">기존의 컬렉션을 삭제하고 파일 %s의 데이터로 덮어쓰시겠습니까?</string>
     <string name="import_dialog_message_add">\"%s\" 항목을 컬렉션에 추가하시겠습니까? 시간이 오래 걸릴 수 있습니다.</string>
     <string name="import_log_no_apkg">이것은 유효한 Anki package 파일이 아닙니다。</string>
     <string name="import_title_error" comment="Title of error dialog">오류</string>
@@ -150,14 +150,14 @@
     <string name="export_email_subject">AnkiDroid로 보내진 플래시 카드: %s</string>
     <string name="export_email_text"><![CDATA[        안녕하세요!
         <br/><br/>
-       이것은 AnkiDroid에서 보낸 안키 플래시 카드입니다[1].
+       이것은 AnkiDroid에서 보낸 Anki 플래시 카드입니다[1].
         이 중에서 이용 가능한 것을 선택해 보시고[2] 쉽고 효율적으로 즐겁게 공부하세요!<br/><br/>
         [1]%1$s<br/>
         [2]%2$s
         ]]>    
  
 Context | Request Context    [1]</string>
-    <string name="export_choice_share">공유</string>
+    <string name="export_choice_share">공유하기</string>
     <string name="export_choice_save_to">저장</string>
     <string name="export_saving_exported_collection">내보낸 파일 저장 중&#8230;</string>
     <string name="study_options" comment="Name for a preference category in Filtered deck (aka Cram deck, aka Custom study) options" maxLength="28">설정</string>
@@ -165,7 +165,7 @@ Context | Request Context    [1]</string>
     <string name="menu__study_options" comment="Menu item that opens options for a Filtered deck (aka Cram deck, aka Custom study)">학습 옵션</string>
     <string name="select_tts" maxLength="28">TTS 언어 설정</string>
     <string name="custom_study" maxLength="28">맞춤 학습</string>
-    <string name="dyn_deck_desc">이것은 평상시 일정 이상으로 학습하기 위한 특별한 카드 묶음입니다. 카드들은 복습 후 자동으로 원래의 카드 묶음으로 돌아가게 됩니다. 카드 묶음 목록에서 이 카드 묶음을 지운다면 남아 있는 모든 카드는 원래의 카드 묶음으로 돌아가게 됩니다.</string>
+    <string name="dyn_deck_desc">이것은 평상시 일정 이상으로 학습하기 위한 특별한 카드 덱입니다. 카드들은 복습 후 자동으로 원래의 카드 덱으로 돌아가게 됩니다. 카드 덱 목록에서 이 카드 덱을 지운다면 남아 있는 모든 카드는 원래의 카드 덱으로 돌아가게 됩니다.</string>
     <string name="steps_error">단계는 0보다 커야 합니다.</string>
     <string name="steps_min_error">적어도 하나 이상의 단계가 필요합니다.</string>
     <string name="tag_editor_add_feedback">\"%1$s\" 추가를 확인하려면 \"%2$s\" 누르세요</string>
@@ -208,7 +208,7 @@ Context | Request Context    [1]</string>
     <!-- Card Viewer -->
     <string name="card_viewer_could_not_find_image">카드 내용 오류: \'%s\' 읽기 실패</string>
     <!-- Deck Picker -->
-    <string name="search_decks" maxLength="28">덱 검색</string>
+    <string name="search_decks" maxLength="28">덱 검색하기</string>
     <string name="ankidroid_init_failed_webview_title">심각한 오류</string>
     <string name="ankidroid_init_failed_webview">AnkiDroid이 필요한 시스템 WebView를 사용할 수 없습니다. 이 문제는 시스템이 업데이트를 설치하는 경우 발생할 수도 있습니다. 잠시 후 다시 시도하십시오.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
@@ -246,17 +246,17 @@ Context | Request Context    [1]</string>
     <string name="back_pressed_once">뒤로 가기 버튼을 한 번 더 눌러 종료합니다</string>
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
-    <string name="download_deck">덱 다운로드</string>
+    <string name="download_deck">카드 덱 다운로드하기</string>
     <string name="try_again">다시 시도하세요.</string>
     <string name="cancel_download">다운로드 취소</string>
     <string name="cancel_download_question_title">다운로드를 취소하시겠습니까?</string>
     <string name="downloading_file">다운로드 중 %s</string>
-    <string name="import_deck">카드 묶음 가져오기</string>
+    <string name="import_deck">카드 덱 가져오기</string>
     <string name="something_wrong">오류가 발생했습니다. 다시 시도해 주세요.</string>
     <string name="download_failed">다운로드 실패</string>
     <string name="deck_download_progress_message">다운로드하는 동안 다른 앱을 이용하실 수 있습니다.</string>
     <string name="check_network">네트워크 연결 상태를 확인해 주세요.</string>
-    <string name="search_using_deck_name">사용 중인 카드 뭉치 이름 찾기</string>
+    <string name="search_using_deck_name">사용 중인 카드 덱 이름 찾기</string>
     <string name="external_storage_unavailable">다운로드가 중단되었습니다. 외부 저장 공간을 사용할 수 없습니다.</string>
     <string name="home" maxLength="28">홈</string>
     <!-- Reviewer actions 
@@ -290,16 +290,16 @@ Context | Request Context    [1]</string>
     <string name="app_not_initialized_new">AnkiDroid가 초기화되지 않았습니다. AnkiDroid를 열어 다시 시도해 주세요.</string>
     <string name="already_logged_in">이미 로그인되어 있습니다</string>
     <!-- Deck Creation -->
-    <string name="deck_created">생성된 뭉치</string>
-    <string name="deck_renamed">이름이 변경된 뭉치</string>
+    <string name="deck_created">생성된 덱</string>
+    <string name="deck_renamed">이름이 변경된 덱</string>
     <!-- Deck Deletion -->
-    <string name="deck_shortcut_doesnt_exist">삭제된 카드 묶음입니다. 단축키를 삭제해 주세요.</string>
+    <string name="deck_shortcut_doesnt_exist">삭제된 카드 덱입니다. 단축키를 삭제해 주세요.</string>
     <!-- Browser Options Dialog -->
     <string name="show_cards" comment="Label for toggle cards button in BrowserOptionsDialog">카드</string>
     <string name="show_notes" comment="Label for toggle notes button in BrowserOptionsDialog">메모</string>
     <string name="toggle_cards_notes">카드, 메모 켜기/ 끄기</string>
     <string name="truncate_content_help">브라우저의 각 행 높이를 잘라 첫 3줄의 내용만 표시합니다.</string>
-    <string name="browser_options_dialog_heading">Browser options</string>
+    <string name="browser_options_dialog_heading">브라우저 옵션</string>
     <string name="audio_saved">녹음 파일 저장됨</string>
     <string name="deleting_selected_notes">선택한 메모 삭제 중</string>
     <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        음성을 들으려면 탭하세요
@@ -316,7 +316,7 @@ Context | Request Context    [1]</string>
     </string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        문장 읽어주기 설정 열기 실패
     </string>
-    <string name="shared_decks_login_required">카드 묶음을 더 다운로드하려면 로그인해 주세요</string>
+    <string name="shared_decks_login_required">카드 덱을 더 다운로드하려면 로그인해 주세요</string>
     <string name="deck_description_field_hint">설명</string>
     <string name="failed_to_copy">복사 실패</string>
     <string name="card_browser_unavailable_when_notes_mode">\'메모\' 모드에서는 사용할 수 없습니다</string>
@@ -333,10 +333,10 @@ Context | Request Context    [1]</string>
     <string name="orphan_note_message">이 카드 유형을 삭제하면 카드 없이 일부 메모만 남습니다</string>
     <string name="voice_not_supported">음성을 지원하지 않습니다. 다른 것으로 시도하거나 음성 엔진을 설치하세요.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">덱 선택</string>
-    <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">확인 없이 덱 삭제</string>
+    <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">덱 선택기</string>
+    <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">확인 없이 덱 삭제하기</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">노트 편집기</string>
-    <string name="select_deck" comment="Description of the shortcut that opens the deck selection dialog">덱 선택</string>
+    <string name="select_deck" comment="Description of the shortcut that opens the deck selection dialog">덱 선택하기</string>
     <string name="select_note_type" comment="Description of the shortcut that shows the note selection spinner">노트 유형 선택</string>
     <string name="tag_editor" comment="Description of the shortcut that opens the tags dialog">태그 편집기</string>
     <string name="card_template_editor_group" comment="Label for the group of shortcuts related to the card template editor">카드 템플릿 편집기</string>
diff --git a/AnkiDroid/src/main/res/values-ko/03-dialogs.xml b/AnkiDroid/src/main/res/values-ko/03-dialogs.xml
index 2338d1cc22b4..bc5c6638a51f 100644
--- a/AnkiDroid/src/main/res/values-ko/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ko/03-dialogs.xml
@@ -46,10 +46,10 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <string name="check_db_title">데이터베이스를 점검할까요?</string>
     <string name="check_db_warning">시간이 오래 걸릴 수 있습니다</string>
-    <string name="contextmenu_deckpicker_delete_deck" maxLength="28">카드 묶음 삭제</string>
-    <string name="delete_deck_title">카드 묶음을 삭제할까요?</string>
+    <string name="contextmenu_deckpicker_delete_deck" maxLength="28">덱 삭제하기</string>
+    <string name="delete_deck_title">덱을 삭제할까요?</string>
     <plurals name="delete_deck_message">
-        <item quantity="other">%1$s의 모든 카드를 삭제할까요? 이는 %2$d 카드를 포함하고 있습니다</item>
+        <item quantity="other">%1$s의 모든 카드를 삭제할까요? 이는 %2$d개의 카드가 있습니다</item>
     </plurals>
     <string name="delete_cram_deck_message">필터링된 덱 %s을(를) 삭제하고 모든 카드를 원래 덱으로 돌려보낼까요?</string>
     <string name="no_tts_available_message">문장 읽어주기 기능(TTS)을 사용할 수 없음</string>
@@ -60,31 +60,31 @@
         <item quantity="other">%d개의 카드를 초기화했습니다.</item>
     </plurals>
     <string name="answering_error_title">데이터베이스 오류</string>
-    <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
+    <string name="answering_error_message">컬렉션에 쓰는 것을 실패했습니다. 데이터베이스가 손상되었거나 디스크에 충분한 여유 공간이 없을 수 있습니다.\n\n이 문제가 자주 발생하면 데이터베이스를 점검하거나 컬렉션을 복구하거나 설정에서 백업 파일을 복원해 보세요. \n\n또는 AnkiDroid 버그일 수 있으니, 오류를 보고해 주시면 확인해 보겠습니다.</string>
     <string name="answering_error_report">오류 보고하기</string>
     <string name="storage_full_message">AnkiDroid를 열 저장 공간이 부족합니다. 계속하려면 여유 공간을 확보하세요.</string>
     <string name="repair_deck_dialog">데이터베이스를 복구하시겠습니까?\n\n 복구를 시작하기 전에 지정된 하위폴더에 복사본 파일이 저장됩니다\'%s\'.</string>
     <string name="intent_aedict_empty">\'기본값\' 카테고리가 비어 있습니다</string>
     <string name="intent_aedict_category">AnkiDroid에 카드를 추가하기 위해 모든 메모장 범주 삭제 또는 \'기본값\'으로 지정하기</string>
-    <string name="custom_study_new_extend">Increase/decrease (“-3”) today’s new card limit by</string>
-    <string name="custom_study_rev_extend">Increase/decrease (“-3”) today’s review limit by</string>
-    <string name="custom_study_forgotten">최근 x일 내에 잊혀진 카드:</string>
+    <string name="custom_study_new_extend">오늘의 새로운 카드 제한을 (“-3”) 만큼 증가/감소시키기</string>
+    <string name="custom_study_rev_extend">오늘의 복습 제한을 (“-3”) 만큼 증가/감소시키기</string>
+    <string name="custom_study_forgotten">최근 x일 동안 잊혀진 복습 카드:</string>
     <string name="custom_study_ahead">x일 만큼 미리 복습하기:</string>
-    <string name="custom_study_preview">최근 x일 내에 추가된 카드를 미리 학습하기:</string>
+    <string name="custom_study_preview">최근 x일 내에 추가된 카드 미리 학습하기:</string>
     <string name="storage_full_title">저장 공간이 가득 찼습니다.</string>
     <string name="storage_almost_full_title">저장공간이 거의 가득 찼습니다.</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">빈 공간 없음</string>
-    <string name="no_space_to_downgrade_content" tools:ignore="UnusedResources">AnkiDroid needs %s free storage space to continue. Please clear some space</string>
+    <string name="no_space_to_downgrade_content" tools:ignore="UnusedResources">AnkiDroid는 계속 진행하기 위해 %s만큼의 여유 공간이 필요합니다. 공간을 조금 확보해 주세요</string>
     <string name="restore_backup_title">백업을 복원할까요?</string>
     <string name="restore_backup">컬렉션이 기존의 것으로 대체됩니다. 저장되지 않은 모든 작업은 손실됩니다.</string>
-    <string name="restore_backup_choose_another">다른 항목 선택</string>
-    <string name="dialog_cancel">취소</string>
+    <string name="restore_backup_choose_another">다른 항목 선택하기</string>
+    <string name="dialog_cancel">취소하기</string>
     <string name="dialog_ok">확인</string>
     <string name="dialog_confirm" tools:ignore="UnusedResources">확인</string>
     <string name="dialog_no">아니요</string>
     <string name="dialog_yes">예</string>
     <string name="dialog_keep">취소</string>
-    <string name="dialog_remove">제거</string>
+    <string name="dialog_remove">제거하기</string>
     <string name="dialog_continue">계속하기</string>
     <string name="dialog_processing">처리 중&#8230;</string>
     <string name="dialog_positive_create" comment="Create a new collection, probably erasing the previous one, may be necessary in case of error.">만들기</string>
diff --git a/AnkiDroid/src/main/res/values-ko/04-network.xml b/AnkiDroid/src/main/res/values-ko/04-network.xml
index a60885d5f0e8..4a7ed97d43b8 100644
--- a/AnkiDroid/src/main/res/values-ko/04-network.xml
+++ b/AnkiDroid/src/main/res/values-ko/04-network.xml
@@ -48,21 +48,21 @@
     <string name="youre_offline">현재 오프라인 상태입니다</string>
     <string name="sync_error">동기화 오류</string>
     <string name="vague_error" comment="Network error dialog title">오류</string>
-    <string name="retry">재시도</string>
-    <string name="menu_get_shared_decks">공유된 카드 묶음 얻기</string>
+    <string name="retry">재시도하기</string>
+    <string name="menu_get_shared_decks">공유된 덱 받기</string>
     <string name="connection_error_message">네트워크 오류가 발생했습니다.</string>
-    <string name="not_logged_in_title">AnkiWeb에 로그인</string>
+    <string name="not_logged_in_title">AnkiWeb에 로그인하기</string>
     <string name="login_create_account_message">클라우드 동기화 서비스를 사용하기 위해서는 제3자 계정에 로그인해야 합니다. 다음 단계에서 만들 수 있습니다.</string>
     <!-- MyAccount.kt -->
     <string name="username">이메일 주소</string>
     <string name="password">암호</string>
-    <string name="log_in">로그인</string>
+    <string name="log_in">로그인하기</string>
     <string name="sign_up_description">AnkiWeb 계정이 없으십니까? 무료입니다!</string>
     <string name="sign_up_not_affiliated">참고: AnkiWeb은 AnkiDroid와 관련이 없습니다.</string>
     <string name="sign_up">가입</string>
     <string name="logged_as">다음 사용자로 로그인 됨</string>
-    <string name="log_out">로그아웃</string>
-    <string name="reset_password">암호 재설정</string>
+    <string name="log_out">로그아웃하기</string>
+    <string name="reset_password">암호 재설정하기</string>
     <string name="lost_mail_instructions">이메일을 잊으셨나요?</string>
     <string name="sign_in">로그인 중</string>
     <!-- AndroidManifest.xml -->
diff --git a/AnkiDroid/src/main/res/values-ko/05-feedback.xml b/AnkiDroid/src/main/res/values-ko/05-feedback.xml
index cc75baf9a846..b655b576a565 100644
--- a/AnkiDroid/src/main/res/values-ko/05-feedback.xml
+++ b/AnkiDroid/src/main/res/values-ko/05-feedback.xml
@@ -53,7 +53,7 @@
     <string name="feedback_auto_toast_text">AnkiDroid에 예기치 못한 오류가 발생했습니다. 개발자에게 오류 보고가 전송됩니다.</string>
     <string name="feedback_for_manual_toast_text">개발자를 위한 오류 보고서를 준비하고 있습니다&#8230;</string>
     <string name="feedback_copy_debug">디버그 정보 복사</string>
-    <string name="feedback_report">보고</string>
-    <string name="feedback_report_automatically">오류 보고를 자동으로 전송</string>
+    <string name="feedback_report">오류 보고하기</string>
+    <string name="feedback_report_automatically">오류 보고 자동으로 전송하기</string>
     <string name="feedback_no_suitable_app_found">적합한 앱을 찾을 수 없습니다.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ko/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-ko/07-cardbrowser.xml
index e318874480ac..e04faa7188e1 100644
--- a/AnkiDroid/src/main/res/values-ko/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-ko/07-cardbrowser.xml
@@ -53,43 +53,43 @@
     </plurals>
     <string name="card_browser_all_decks">모든 카드 덱</string>
     <plurals name="card_browser_delete_notes">
-        <item quantity="other">노트 삭제</item>
+        <item quantity="other">노트 삭제하기</item>
     </plurals>
-    <string name="card_browser_change_deck" maxLength="28">카드 덱</string>
+    <string name="card_browser_change_deck" maxLength="28">덱 변경하기</string>
     <string name="delete_card_title">노트를 삭제할까요?</string>
-    <string name="card_browser_show_marked" maxLength="28">표시된 카드 필터링</string>
+    <string name="card_browser_show_marked" maxLength="28">표시한 카드</string>
     <string name="card_browser_show_suspended" maxLength="28">비활성화된 카드 필터링</string>
     <string name="card_browser_search_by_tag" maxLength="28">태그별 필터링</string>
-    <string name="card_browser_search_by_flag" maxLength="28">태그별로 보기</string>
-    <string name="card_browser_list_my_searches" maxLength="28">내가 검색한 항목</string>
-    <string name="card_browser_list_my_searches_save" maxLength="28">검색 항목 저장</string>
-    <string name="card_browser_list_my_searches_title">저장된 검색 항목 선택</string>
-    <string name="card_browser_list_my_searches_new_name">현재 검색 항목의 이름</string>
-    <string name="card_browser_list_my_searches_new_search_error_empty_name">이름 없이 검색 항목을 저장할 수 없습니다.</string>
+    <string name="card_browser_search_by_flag" maxLength="28">플래그 별로 보기</string>
+    <string name="card_browser_list_my_searches" maxLength="28">저장된 검색어</string>
+    <string name="card_browser_list_my_searches_save" maxLength="28">검색어 저장하기</string>
+    <string name="card_browser_list_my_searches_title">저장된 검색어 선택하기</string>
+    <string name="card_browser_list_my_searches_new_name">현재 검색어 이름</string>
+    <string name="card_browser_list_my_searches_new_search_error_empty_name">이름 없이 검색어를 저장할 수 없습니다.</string>
     <string name="card_browser_list_my_searches_new_search_error_dup">이름이 이미 존재합니다!</string>
     <string name="no_note_to_edit">수정할 노트 없음</string>
-    <string name="card_browser_list_my_searches_remove_content">\"%1$s\"을 삭제할까요?</string>
+    <string name="card_browser_list_my_searches_remove_content">\"%1$s\"을/를 삭제할까요?</string>
     <string name="card_browser_change_display_order" maxLength="28">표시 순서 변경</string>
-    <string name="card_browser_search_hint" comment="Message displayed in the search text field in the card browser.">검색</string>
-    <string name="card_browser_cram_search" maxLength="28" comment="Menu entry to start a search.">검색</string>
+    <string name="card_browser_search_hint" comment="Message displayed in the search text field in the card browser.">검색하기</string>
+    <string name="card_browser_cram_search" maxLength="28" comment="Menu entry to start a search.">검색하기</string>
     <string name="card_browser_change_display_order_title">표시 순서를 선택하세요</string>
     <string name="card_details_tags">태그</string>
     <string-array name="card_browser_order_labels">
-        <item>정렬 안함(더 빠름)</item>
-        <item>정렬 필드에 따라</item>
-        <item>생성된 시간에 따라</item>
-        <item>노트 수정 시간 기준</item>
-        <item>카드 수정 시간 기준</item>
-        <item>학습 예정 시간에 따라</item>
-        <item>학습 간격에 따라</item>
-        <item>난이도에 따라</item>
-        <item>복습에 따라</item>
-        <item>오답 횟수에 따라</item>
+        <item>정렬 안 함 (빠른 속도)</item>
+        <item>필드</item>
+        <item>생성된 시간</item>
+        <item>노트 수정 시간</item>
+        <item>카드 수정 시간</item>
+        <item>학습 기한</item>
+        <item>학습 간격</item>
+        <item>난이도</item>
+        <item>복습</item>
+        <item>오답 횟수</item>
     </string-array>
-    <string name="card_browser_select_all" maxLength="28">모두 선택</string>
-    <string name="card_browser_select_none" maxLength="28">모두 선택 안함</string>
+    <string name="card_browser_select_all" maxLength="28">모두 선택하기</string>
+    <string name="card_browser_select_none" maxLength="28">모두 선택하지 않기</string>
     <string name="card_browser_no_cards_in_deck">덱 \'%s\'에 카드 없음</string>
-    <string name="card_browser_search_all_decks">모든 덱 검색</string>
+    <string name="card_browser_search_all_decks">모든 덱 검색하기</string>
     <string name="card_browser_unknown_deck_name">알 수 없음</string>
     <string name="card_browser_truncate" comment="allows users to show less of a field value">내용 간략히 보기</string>
     <string name="set_due_date_hintText" comment="plural set_due_date_label_suffix is used for parameters, parameter 1 is the plural for 0, parameter 2 is the plural for 1">오늘은 \'0 %1$s\', 내일은 \'1 %2$s\', &#8230;</string>
@@ -103,13 +103,13 @@
         <item quantity="other">%d개 카드 삭제됨</item>
     </plurals>
     <!--Keyboard shortcuts dialog-->
-    <string name="edit_tags_dialog" comment="Description of the shortcut that opens the edit tags dialog">태그 다이얼로그 수정</string>
-    <string name="show_order_dialog" comment="Description of the shortcut that shows the order dialog">순서 다이얼로그 보이기</string>
+    <string name="edit_tags_dialog" comment="Description of the shortcut that opens the edit tags dialog">태그 다이얼로그 수정하기</string>
+    <string name="show_order_dialog" comment="Description of the shortcut that shows the order dialog">순서 다이얼로그 표시하기</string>
     <!-- Manage columns dialog -->
-    <string name="browse_manage_columns_main_heading">Columns</string>
-    <string name="browse_manage_columns">Manage columns</string>
-    <string name="user_active_columns">Active</string>
+    <string name="browse_manage_columns_main_heading">열</string>
+    <string name="browse_manage_columns">열 관리</string>
+    <string name="user_active_columns">활성</string>
     <string name="user_potential_columns">Available</string>
-    <string name="include_column">Include column</string>
-    <string name="exclude_column">Exclude column</string>
+    <string name="include_column">열 포함하기</string>
+    <string name="exclude_column">열 제외하기</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ko/08-widget.xml b/AnkiDroid/src/main/res/values-ko/08-widget.xml
index 348361551628..dcc554018ffa 100644
--- a/AnkiDroid/src/main/res/values-ko/08-widget.xml
+++ b/AnkiDroid/src/main/res/values-ko/08-widget.xml
@@ -57,10 +57,10 @@
         <item quantity="other">%d분 남음</item>
     </plurals>
     <string name="widget_add_note_button">새 AnkiDroid 노트 추가</string>
-    <string name="deck_picker_widget_description" comment="Title of the Deck Picker Widget. Displayed to the user in Android\'s Widget Selection menu">덱 선택</string>
+    <string name="deck_picker_widget_description" comment="Title of the Deck Picker Widget. Displayed to the user in Android\'s Widget Selection menu">덱 선택기</string>
     <string name="card_analysis_extra_widget_description">카드 분석</string>
     <!-- Strings to explain usage in Deck Picker and Card Analysis Widget Configuration screen -->
-    <string name="select_decks_title" comment="Title for Deck Selection Dialog">덱 선택</string>
+    <string name="select_decks_title" comment="Title for Deck Selection Dialog">덱 선택하기</string>
     <string name="select_deck_title" comment="Title for Deck Selection Dialog">덱 선택하기</string>
     <string name="no_selected_deck_placeholder_title" comment="Placeholder title when no decks are selected">위젯에 보일 덱을 + 아이콘을 눌러 선택하세요.</string>
     <string name="deck_removed_from_widget" comment="Snackbar when deck is removed from widget">덱 제거됨</string>
@@ -68,6 +68,6 @@
     <plurals name="deck_limit_reached">
         <item quantity="other">최대 %d개까지 선택할 수 있습니다.</item>
     </plurals>
-    <string name="empty_widget_state" comment="To denote the widget is empty">덱 없음. 터치해서 추가</string>
+    <string name="empty_widget_state" comment="To denote the widget is empty">덱 없음. 터치해서 추가하기</string>
     <string name="empty_collection_state_in_widget" comment="To denote the collection is empty">컬렉션 비어있음. 앱에서 덱을 추가한 후 재설정하세요.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ko/09-backup.xml b/AnkiDroid/src/main/res/values-ko/09-backup.xml
index de2af2f397b0..bfdbfc99fedb 100644
--- a/AnkiDroid/src/main/res/values-ko/09-backup.xml
+++ b/AnkiDroid/src/main/res/values-ko/09-backup.xml
@@ -44,25 +44,25 @@
 ~ this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <resources>
-    <string name="backup_deck_no_storage_left">저장공간 부족으로 백업 저장 실패. 백업 용량을 줄이거나 저장공간을 확보하세요.</string>
+    <string name="backup_deck_no_storage_left">저장공간 부족으로 백업 저장에 실패했습니다. 백업 양을 줄이거나 저장공간을 확보하세요.</string>
     <string name="storage_warning">%d MB 이하의 여유 공간이 남아 있습니다. 데이터 손실을 방지하려면 추가 공간을 확보하세요.</string>
-    <string name="backup_restore" maxLength="28">백업으로부터 복원</string>
+    <string name="backup_restore" maxLength="28">백업 파일 복원하기</string>
     <string name="backup_new_collection">새 컬렉션</string>
-    <string name="backup_del_collection">컬렉션 삭제 후 새 컬렉션 만들기</string>
+    <string name="backup_del_collection">컬렉션 삭제하고 새 컬렉션 만들기</string>
     <string name="backup_del_collection_question">정말로 컬렉션을 삭제하고 새 컬렉션을 만드시겠습니까? 모든 학습 진행 상황과 카드들이 삭제됩니다.</string>
-    <string name="backup_one_way_sync_from_server">서버로부터 단방향 동기화</string>
+    <string name="backup_one_way_sync_from_server">서버로부터 덮어쓰기</string>
     <string name="backup_full_sync_from_server_question">정말로 AnkiWeb의 컬렉션으로 지금 컬렉션을 덮어쓸까요? 지난 동기화로부터의 모든 학습 진행 상황과 추가된 정보를 잃게 됩니다!</string>
     <string name="error_handling_title">오류 처리</string>
     <string name="error_handling_options" comment="In a warning message, the label of the suggested action that the user should take">옵션</string>
-    <string name="backup_retry_opening">열기 재시도</string>
-    <string name="backup_error_menu_repair">데이터베이스 복구</string>
+    <string name="backup_retry_opening">다시 열기</string>
+    <string name="backup_error_menu_repair">데이터베이스 복구하기</string>
     <!-- Collection used to be called deck. Name is kept for consistency with translation software -->
     <string name="backup_repair_deck_progress">데이터베이스 복구중. \ n 잠시 기다려 주세요&#8230;</string>
     <string name="backup_invalid_file_error">선택한 백업 파일이 올바르지 않습니다.</string>
-    <string name="backup_restore_select_title">복원할 백업 파일 선택</string>
-    <string name="backup_restore_no_backups">이 장치에는 사용 가능한 백업 파일이 없습니다. 데스크탑 컴퓨터에 백업 파일이 있다면 수동으로 AnkiDroid 폴더로 복사하세요.</string>
+    <string name="backup_restore_select_title">복원할 백업 파일 선택하기</string>
+    <string name="backup_restore_no_backups">이 장치에는 사용 가능한 백업 파일이 없습니다. 데스크탑 컴퓨터에 백업 파일이 있다면 AnkiDroid 폴더로 복사하세요.</string>
     <string name="open_collection_failed_title">컬렉션 열리지 않음</string>
-    <string name="corrupt_db_message">안타깝게도 컬렉션이 손상되었습니다.\n\n옵션을 눌러 백업으로부터 복원하세요. 만약 불가능하다면, 수동으로 데이터베이스를 복구하는 방법을 다음에서 알아보세요:\n%1$s</string>
-    <string name="access_collection_failed_message">컬렉션에 접근 중 오류가 발생했습니다. 사소한 버그거나 아니면 문제가 있는 경우입니다.\n\n데이터베이스를 검토를 시도해보거나 옵션 버튼을 눌러 백업으로부터 복원하세요. 이 메세지가 계속 나타난다면 오류 보고를 전송하세요:\n%1$s</string>
-    <string name="deck_repair_error">컬렉션 복구할 수 없음</string>
+    <string name="corrupt_db_message">안타깝게도 컬렉션이 손상되었습니다.\n\n옵션을 눌러 백업 파일을 복원하세요. 만약 불가능하다면, 수동으로 데이터베이스를 복구하는 방법을 다음에서 알아보세요:\n%1$s</string>
+    <string name="access_collection_failed_message">컬렉션 접근 중 오류가 발생했습니다. 사소한 버그일 수도 문제가 있을 수도 있습니다.\n\n데이터베이스 검토를 시도해보거나 옵션 버튼을 눌러 백업 파일을 복원하세요. 이 메세지가 계속 나타난다면 오류 보고를 전송하세요:\n%1$s</string>
+    <string name="deck_repair_error">컬렉션을 복구할 수 없습니다</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ko/10-preferences.xml b/AnkiDroid/src/main/res/values-ko/10-preferences.xml
index b7407111fb9f..63f5cc01eb1e 100644
--- a/AnkiDroid/src/main/res/values-ko/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ko/10-preferences.xml
@@ -92,11 +92,11 @@
         <item>하단</item>
         <item>없음</item>
     </string-array>
-    <string name="gestures" maxLength="41">제스처 사용</string>
+    <string name="gestures" maxLength="41">제스처 사용하기</string>
     <string name="gestures_summ">응답 및 카드 편집 등의 작업에 제스쳐 할당</string>
     <string name="gestures_corner_touch" maxLength="41">9점 터치</string>
     <string name="gestures_corner_touch_summary">화면 모서리의 터치 제스쳐 허용</string>
-    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">키보드 단축키 보기</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">전체화면 탐색 서랍</string>
     <string name="gestures_fullscreen_nav_drawer_summary">화면 어디에서나 오른쪽으로 스와이프하여 탐색 서랍 열기</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">없음</string>
@@ -152,7 +152,7 @@
     <string name="notification_minimum_cards_due_blink" maxLength="41">LED 깜빡이기</string>
     <string name="select_locale_title">언어 선택</string>
     <string name="software_render" maxLength="41">카드 하드웨어 랜더링 비활성화</string>
-    <string name="software_render_summ">하드웨어 렌더링은 더 빠르지만 특히 Android 8/8.1에서 문제가 있을 수 있습니다.  카드 리뷰시 사용자 인터페이스의 일부가 표시되지 않으면 이 설정을 시도해 보십시오.</string>
+    <string name="software_render_summ">하드웨어 렌더링은 더 빠르지만 특히 Android 8/8.1에서 문제가 있을 수 있습니다.  카드 복습 사용자 인터페이스의 일부가 표시되지 않으면 이 설정을 시도해 보십시오.</string>
     <string name="safe_display" maxLength="41">안전한 디스플레이 모드</string>
     <string name="safe_display_summ">모든 애니메이션을 비활성화하고 더 안전한 그리기 방법을 사용합니다. 전자 잉크 기기에는 이 기능이 필요할 수 있습니다.</string>
     <string name="disable_extended_text_ui" maxLength="41">단일 필드 편집 모드 비활성화</string>
@@ -182,17 +182,17 @@
         <item quantity="other">자정 %d시간 이후</item>
     </plurals>
     <string name="pref_keep_screen_on" maxLength="41">화면을 켜진 상태로 유지</string>
-    <string name="pref_keep_screen_on_summ">화면 꺼짐 시간 비활성화</string>
-    <string name="enable_api_title" maxLength="41">AnkiDroid API를 사용하도록 설정</string>
-    <string name="enable_api_summary">사용자의 개입 없이 다른 앱이 AnkiDroid에 연결하고 데이터를 읽고 쓸 수 있도록 허용</string>
+    <string name="pref_keep_screen_on_summ">화면 꺼짐 비활성화하기</string>
+    <string name="enable_api_title" maxLength="41">AnkiDroid API 활성화하기</string>
+    <string name="enable_api_summary">사용자의 개입 없이 다른 앱이 AnkiDroid에 연결해 데이터를 읽고 쓸 수 있도록 허용하기</string>
     <string name="custom_buttons" maxLength="41">앱 바 버튼</string>
-    <string name="custom_buttons_summary">앱 바에 어떠한 동작이 표시될 것인지 지정</string>
-    <string name="custom_buttons_setting_always_show">항상 표시</string>
-    <string name="custom_buttons_setting_if_room">공간이 있는 경우 표시</string>
-    <string name="custom_buttons_setting_menu_only">메뉴만</string>
-    <string name="reset_custom_buttons" maxLength="41">기본값으로 초기화</string>
-    <string name="reset_settings_to_default">기본값으로 초기화</string>
-    <string name="reset">초기화</string>
+    <string name="custom_buttons_summary">앱 바에 표시될 동작 지정하기</string>
+    <string name="custom_buttons_setting_always_show">항상 표시하기</string>
+    <string name="custom_buttons_setting_if_room">공간이 있는 경우 표시하기</string>
+    <string name="custom_buttons_setting_menu_only">메뉴만 표시하기</string>
+    <string name="reset_custom_buttons" maxLength="41">기본값으로 초기화하기</string>
+    <string name="reset_settings_to_default">기본값으로 초기화하기</string>
+    <string name="reset">초기화하기</string>
     <string name="thirdparty_apps_title" maxLength="41">타사 API 앱</string>
     <string name="thirdparty_apps_summary">Ankidroid API를 사용하는 어플 목록 보기 (사전, 편집기 등)</string>
     <!-- Appearance settings -->
@@ -205,13 +205,13 @@
     <string name="exit_via_double_tap_back" maxLength="41">뒤로가기 버튼 두번 눌러 돌아가기/나가기</string>
     <string name="exit_via_double_tap_back_summ">실수로 인한 학습 종료와 앱 종료 방지</string>
     <!-- Allow all files in media imports -->
-    <string name="media_import_allow_all_files" maxLength="41">미디어 파일 허용</string>
+    <string name="media_import_allow_all_files" maxLength="41">미디어 파일 허용하기</string>
     <string name="media_import_allow_all_files_summ">만약 안드로이드가 미디어파일을 인식하지 못한다면</string>
     <!-- Custom sync server settings -->
     <string name="custom_sync_server_title" maxLength="41">자체 동기화 서버</string>
     <string name="custom_sync_server_summary_none_of_the_two_servers_used" comment="This summary is shown when neither of the two custom sync servers are used,         which is the default.">사용되지 않음</string>
     <string name="custom_sync_server_help2"><![CDATA[AnkiWeb와 동기화하는 대신에
-자신의 서버와 동기화 할 수 있습니다.
+사용자의 서버와 동기화 할 수 있습니다.
 설정하지 않으면 기본 AnkiWeb 서버가 사용됩니다.
 <a href="%s">더 알아보기</a>]]></string>
     <string name="custom_sync_server_base_url_title" maxLength="41">동기화 URL</string>
@@ -224,32 +224,32 @@
     <string name="note" maxLength="41">노트</string>
     <string name="navigation" maxLength="41">탐색</string>
     <string name="media" maxLength="41">미디어</string>
-    <string name="misc" maxLength="41">Misc</string>
+    <string name="misc" maxLength="41">기타</string>
     <!-- studyoptions -->
-    <string name="studyoptions_limit_select_tags">태그 선택</string>
+    <string name="studyoptions_limit_select_tags">태그 선택하기</string>
     <!-- Deck configurations -->
     <string name="deck_conf_general" maxLength="41" comment="Label of the submenu for the general options of new deck">일반</string>
     <string name="deck_conf_reminders" maxLength="41">알림</string>
     <string name="deck_conf_cram_filter" maxLength="41">필터</string>
     <string name="deck_conf_cram_search" maxLength="41" comment="Label of a text field that contains a search query.">검색</string>
     <string name="deck_conf_cram_limit" maxLength="41">한도</string>
-    <string name="deck_conf_cram_order" maxLength="41">Cards selected by</string>
-    <string name="deck_conf_cram_reschedule" maxLength="41" comment="Title of the box labelled by deck_conf_cram_reschedule_summ">일정변경</string>
-    <string name="deck_conf_cram_reschedule_summ">이 카드묶음에서 내 대답에 근거에 따라 재일정된 카드들</string>
-    <string name="deck_conf_cram_filter_2_check">2번째 필터 적용</string>
-    <string name="deck_conf_cram_steps_summ" maxLength="41">사용자 정의 단계 정의</string>
+    <string name="deck_conf_cram_order" maxLength="41">선택된 카드</string>
+    <string name="deck_conf_cram_reschedule" maxLength="41" comment="Title of the box labelled by deck_conf_cram_reschedule_summ">기한 변경하기</string>
+    <string name="deck_conf_cram_reschedule_summ">이 덱에서 내 대답에 따라 기한이 변경된 카드</string>
+    <string name="deck_conf_cram_filter_2_check">2번째 필터 적용하기</string>
+    <string name="deck_conf_cram_steps_summ" maxLength="41">맞춤 단계 설정하기</string>
     <string name="deck_conf_cram_preview_delays" maxLength="41">미리보기 딜레이</string>
-    <string name="deck_conf_cram_preview_delays_summ">Delays are in seconds. 0 returns card to original deck.</string>
+    <string name="deck_conf_cram_preview_delays_summ">지연 시간은 초 단위입니다. 0을 입력하면 카드를 원래 덱으로 되돌립니다.</string>
     <!-- analytics options -->
     <string name="analytics_dialog_title">AnkiDroid를 개선하는데 도움을 주세요!</string>
     <string name="analytics_title" maxLength="41">기능 사용 공유하기</string>
     <string name="analytics_summ">개발팀이 사람들이 어떤 기능을 사용하는지 볼 수 있도록 도와주어 AnkiDroid에 기여할 수 있습니다.</string>
-    <string name="note_editor_replace_newlines" maxLength="41">HTML로 신규 라인 교체</string>
+    <string name="note_editor_replace_newlines" maxLength="41">HTML로 신규 라인 교체하기</string>
     <string name="note_editor_replace_newlines_summ">In the Note Editor, convert any instances of &lt;br&gt; to newlines when editing a card.</string>
     <string name="type_in_answer_focus" maxLength="41">Focus ‘type in answer’</string>
     <string name="type_in_answer_focus_summ">Automatically focus the ‘type in answer’ field in the reviewer</string>
     <!-- About -->
-    <string name="open_changelog">Open Changelog</string>
+    <string name="open_changelog">업데이트 기록 열기</string>
     <string name="pref_cat_about_title" maxLength="41">About</string>
     <string name="contributors_title">기여자들</string>
     <string name="about_contributors_description"><![CDATA[These are our awesome <a href=\"%1$s\">contributors</a>. You can help AnkiDroid too by programming, translating, donating and <a href=\"%2$s\">more</a>!]]></string>
@@ -257,28 +257,28 @@
     <string name="license_description"><![CDATA[AnkiDroid is released under the <a href=\"%1$s\">GPL-3.0</a> and <a href=\"%2$s\">AGPL-3.0</a> licenses, with the source code available <a href=\"%3$s\">on GitHub</a>]]></string>
     <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
     <!-- Controls -->
-    <string name="binding_add_gesture">제스쳐 추가</string>
-    <string name="binding_add_key">키 추가</string>
+    <string name="binding_add_gesture">제스쳐 추가하기</string>
+    <string name="binding_add_key">키 추가하기</string>
     <string name="key_picker_default_press_key">키 누르기</string>
-    <string name="binding_add_axis">조이스틱/모션 컨트롤러 추가</string>
+    <string name="binding_add_axis">조이스틱/모션 컨트롤러 추가하기</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
     <string name="user_actions" maxLength="41">사용자 행동</string>
     <string name="user_actions_summary" maxLength="41">Trigger JavaScript from the review screen</string>
     <string name="user_action_1" maxLength="28">사용자 행동 1</string>
     <string name="user_action_2" maxLength="28">사용자 행동 2</string>
     <string name="user_action_3" maxLength="28">사용자 행동 3</string>
-    <string name="user_action_4" maxLength="28">사용자 액션 4</string>
-    <string name="user_action_5" maxLength="28">사용자 액션 5</string>
-    <string name="user_action_6" maxLength="28">사용자 액션 6</string>
-    <string name="user_action_7" maxLength="28">사용자 액션 7</string>
-    <string name="user_action_8" maxLength="28">사용자 액션 8</string>
-    <string name="user_action_9" maxLength="28">사용자 액션 9</string>
+    <string name="user_action_4" maxLength="28">사용자 행동 4</string>
+    <string name="user_action_5" maxLength="28">사용자 행동 5</string>
+    <string name="user_action_6" maxLength="28">사용자 행동 6</string>
+    <string name="user_action_7" maxLength="28">사용자 행동 7</string>
+    <string name="user_action_8" maxLength="28">사용자 행동 8</string>
+    <string name="user_action_9" maxLength="28">사용자 행동 9</string>
     <string name="toggle_auto_advance" maxLength="41">자동 넘기기 켜기/끄기</string>
     <!-- Select card side -->
     <string name="card_side_selection_title">카드 면 선택</string>
-    <string name="card_side_question">질문</string>
+    <string name="card_side_question">문제</string>
     <string name="card_side_answer">정답</string>
-    <string name="card_side_both" maxLength="28">질문 &amp; 정답</string>
+    <string name="card_side_both" maxLength="28">문제 &amp; 정답</string>
     <string name="display_binding_card_side_question" comment="When displaying a key bind on a preference this formatter is used if the bind only applies to the question">Q: %s</string>
     <string name="display_binding_card_side_answer" comment="When displaying a key bind on a preference this formatter is used if the bind only applies to the answer">A: %s</string>
     <string name="display_binding_card_side_both" comment="When displaying a key bind on a preference this formatter is used if the bind only applies to both the question and the answer">%s</string>
@@ -291,10 +291,9 @@
     <string name="readtext_reviewer_warn" tools:ignore="UnusedResources">새로운 TTS 포맷을 위해 업데이트 해주세요.</string>
     <!-- Developer options -->
     <string name="pref_cat_dev_options" maxLength="41">개발자 옵션</string>
-    <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
-    <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_enabled_pref" maxLength="41">개발자 옵션 활성화하기</string>
+    <string name="disable_dev_options">개발자 옵션 비활성화하기</string>
+    <string name="dev_options_warning">개발자 옵션을 켜기 전에 유의할 점이 있습니다. 이 옵션들은 앱을 고장내거나 카드 모음을 이상하게 만들 위험성이 있습니다. 이 옵션들은 대부분의 유저에게는 사용할 필요가 없기 때문에 영어인 채로 번역되지 않았습니다.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
@@ -307,7 +306,7 @@
         <br><br>
         You can restore from a backup and export your collection in the deck list menu.
     ]]></string>
-    <string name="pref__minutes_between_automatic_backups__title" maxLength="41">Minutes between automatic backups</string>
+    <string name="pref__minutes_between_automatic_backups__title" maxLength="41">자동 백업 간격(분)</string>
     <string name="pref__daily_backups_to_keep__title" maxLength="41">Daily backups to keep</string>
     <string name="pref__weekly_backups_to_keep__title" maxLength="41">Weekly backups to keep</string>
     <string name="pref__monthly_backups_to_keep__title" maxLength="41">Monthly backups to keep</string>
@@ -317,54 +316,54 @@
     <string name="pref__manage_space__screen_title">Manage space</string>
     <!-- TextWidgetPreference widget text -->
     <string name="pref__widget_text__error" comment="Text in a small box on the end of a preference, indicating a generic error.         Must be VERY short. Can be one or two lines.">에러</string>
-    <string name="pref__widget_text__calculating" comment="Text in a small box on the end of a preference,         indicating that the value, such as folder size on disk, is being calculated.         Must be VERY short. Can be one or two lines.">Calcu-\nlating&#8230;</string>
+    <string name="pref__widget_text__calculating" comment="Text in a small box on the end of a preference,         indicating that the value, such as folder size on disk, is being calculated.         Must be VERY short. Can be one or two lines.">계산\n중&#8230;</string>
     <plurals name="pref__widget_text__n_files_n_bytes" comment="Text in a small box on the end of a preference,         showing some statistics about a folder on disk if a form of “12 files\n26 MB”.         Must be VERY short. Can be one or two lines.">
         <item quantity="other">%1$d files\n%2$s</item>
     </plurals>
     <!-- Delete unused media -->
-    <string name="pref__delete_unused_media_files__title" maxLength="41" comment="Preference title">Delete unused media files</string>
+    <string name="pref__delete_unused_media_files__title" maxLength="41" comment="Preference title">사용되지 않는 미디어 파일 삭제하기</string>
     <string name="pref__delete_unused_media_files__summary">Delete images and other media that are not prefixed with _ and are not referenced by any notes</string>
-    <string name="dialog__delete_unused_media_files__title" comment="Title for a dialog where you can select unused media files to delete">Delete unused media files</string>
+    <string name="dialog__delete_unused_media_files__title" comment="Title for a dialog where you can select unused media files to delete">사용되지 않는 미디어 파일 삭제하기</string>
     <!-- Delete backups -->
-    <string name="pref__delete_backups__title" maxLength="41" comment="Preference title">Delete backups</string>
-    <string name="dialog__delete_backups__title" comment="Title for a dialog where you can choose backups to delete">Delete backups</string>
-    <string name="progress__deleting_backups">Deleting backups&#8230;</string>
+    <string name="pref__delete_backups__title" maxLength="41" comment="Preference title">백업 삭제하기</string>
+    <string name="dialog__delete_backups__title" comment="Title for a dialog where you can choose backups to delete">백업 삭제하기</string>
+    <string name="progress__deleting_backups">백업 삭제 중&#8230;</string>
     <!-- Delete collection -->
-    <string name="pref__delete_collection__title" maxLength="41" comment="Preference title">Delete collection</string>
-    <string name="pref__delete_collection__summary">Delete collection, media, and backups. App settings are not deleted</string>
-    <string name="dialog__delete_collection__title" comment="Confirmation dialog title">Delete collection</string>
-    <string name="dialog__delete_collection__message" comment="“Close the window” here refers to the activity that the user is currently seeing.        When the collection is deleted, we exit the process, which closes the activity without animation.         On some devices the entire settings app may be closed.         User might not realize that this activity comes directly from AnkiDroid,         so it might be wise to avoid words such as “AnkiDroid or “app”.">Are you sure you want to delete your collection, media, and backups?\n\nNote: this action will close the window.</string>
-    <string name="progress__deleting_collection">Deleting collection&#8230;</string>
+    <string name="pref__delete_collection__title" maxLength="41" comment="Preference title">컬렉션 삭제하기</string>
+    <string name="pref__delete_collection__summary">컬렉션, 미디어, 백업 삭제하기. 앱 설정은 삭제되지 않습니다</string>
+    <string name="dialog__delete_collection__title" comment="Confirmation dialog title">컬렉션 삭제하기</string>
+    <string name="dialog__delete_collection__message" comment="“Close the window” here refers to the activity that the user is currently seeing.        When the collection is deleted, we exit the process, which closes the activity without animation.         On some devices the entire settings app may be closed.         User might not realize that this activity comes directly from AnkiDroid,         so it might be wise to avoid words such as “AnkiDroid or “app”.">정말로 컬렉션, 미디어, 백업을 삭제하시겠습니까?\n\n참고: 이 작업을 수행하면 창이 닫힙니다</string>
+    <string name="progress__deleting_collection">컬렉션 삭제 중&#8230;</string>
     <!-- Delete everything -->
-    <string name="pref__delete_everything__title" maxLength="41" comment="Preference title">Delete everything</string>
-    <string name="pref__delete_everything__summary">Delete collection, media, backups, and settings</string>
-    <string name="dialog__delete_everything__title" comment="Confirmation dialog title">Delete everything</string>
+    <string name="pref__delete_everything__title" maxLength="41" comment="Preference title">모두 지우기</string>
+    <string name="pref__delete_everything__summary">컬렉션, 미디어, 백업, 설정 삭제하기</string>
+    <string name="dialog__delete_everything__title" comment="Confirmation dialog title">모두 지우기</string>
     <string name="dialog__delete_everything__message" comment="“Close the window” here refers to the activity that the user is currently seeing.         Deleting app data forcibly closes AnkiDroid, which closes the activity without animation.         On some devices the entire settings app may be closed.         User might not realize that this activity comes directly from AnkiDroid,         so it might be wise to avoid words such as “AnkiDroid or “app”.">정말 모든 데이터를 삭제하시겠습니까? 여기에는 컬렉션, 미디어, 백업 및 환경 설정이 포함됩니다.\n\n참고: 이 작업을 수행하면 창이 닫힙니다.</string>
     <!-- Delete app data -->
-    <string name="pref__delete_app_data__title" maxLength="41" comment="Preference title">앱 데이터 삭제</string>
-    <string name="pref__delete_app_data__summary">설정 및 기타 앱 데이터 삭제</string>
-    <string name="dialog__delete_app_data__title" comment="Confirmation dialog title">앱 데이터 삭제</string>
-    <string name="dialog__delete_app_data__message" comment="“Close the window” here refers to the activity that the user is currently seeing.         Deleting app data forcibly closes AnkiDroid, which closes the activity without animation.         On some devices the entire settings app may be closed.         User might not realize that this activity comes directly from AnkiDroid,         so it might be wise to avoid words such as “AnkiDroid or “app”.">정말 모든 데이터를 삭제하시겠습니까? 여기에는 환경 설정과 기타 앱 데이터가 포함됩니다.\n\n참고: 이 작업을 수행하면 창이 닫힙니다.</string>
+    <string name="pref__delete_app_data__title" maxLength="41" comment="Preference title">앱 데이터 삭제하기</string>
+    <string name="pref__delete_app_data__summary">설정 및 기타 앱 데이터 삭제하기</string>
+    <string name="dialog__delete_app_data__title" comment="Confirmation dialog title">앱 데이터 삭제하기</string>
+    <string name="dialog__delete_app_data__message" comment="“Close the window” here refers to the activity that the user is currently seeing.         Deleting app data forcibly closes AnkiDroid, which closes the activity without animation.         On some devices the entire settings app may be closed.         User might not realize that this activity comes directly from AnkiDroid,         so it might be wise to avoid words such as “AnkiDroid or “app”.">정말 모든 데이터를 삭제하시겠습니까? 여기에는 설정과 기타 앱 데이터가 포함됩니다.\n\n참고: 이 작업을 수행하면 창이 닫힙니다.</string>
     <!-- #######################################################################################
          ##### Generic preference summaries & snackbars that are shown on preference click #####
          ####################################################################################### -->
     <string name="pref__etc__summary__fetching" comment="Generic preference summary to be shown when the value is being fetched">&#8230;</string>
-    <string name="pref__etc__summary__no_collection" comment="Generic preference summary to be shown when a preference is not usable         because the collection does not exist">No collection</string>
-    <string name="pref__etc__summary__error" comment="Generic preference summary to be shown when there was an error fetching the value.         For example, this is shown when the permission to access collection is lacking">Error</string>
+    <string name="pref__etc__summary__no_collection" comment="Generic preference summary to be shown when a preference is not usable         because the collection does not exist">컬렉션 없음</string>
+    <string name="pref__etc__summary__error" comment="Generic preference summary to be shown when there was an error fetching the value.         For example, this is shown when the permission to access collection is lacking">오류</string>
     <string name="pref__etc__snackbar__fetching" comment="Generic snackbar message to be shown when user taps on a preference,         the value of which is being fetched">Fetching&#8230;</string>
-    <string name="pref__etc__snackbar__calculating" comment="Generic snackbar message to be shown when user taps on a preference,         the value of which, such as folder size on disk, is being calculated">Calculating&#8230;</string>
-    <string name="pref__etc__snackbar__no_collection" comment="Generic snackbar message to be shown when user taps on a preference         that is not usable because the collection does not exist">Collection does not exist</string>
-    <string name="hide_system_bars" maxLength="41" comment="Title of a setting that allows to hide the system bars">Hide system bars</string>
-    <string name="hide_system_bars_none" comment="Setting option to not hide any of the system bars">None</string>
-    <string name="hide_system_bars_status_bar" comment="Setting option to hide the system status bar (the top one with clock, battery status, etc)">Status bar</string>
-    <string name="hide_system_bars_navigation_bar" comment="Setting option to hide the system navigation bar (the bottom one that can go back, to home, etc)">Navigation bar</string>
-    <string name="hide_system_bars_all_bars" comment="Setting option to hide all the system bars">All</string>
+    <string name="pref__etc__snackbar__calculating" comment="Generic snackbar message to be shown when user taps on a preference,         the value of which, such as folder size on disk, is being calculated">계산 중&#8230;</string>
+    <string name="pref__etc__snackbar__no_collection" comment="Generic snackbar message to be shown when user taps on a preference         that is not usable because the collection does not exist">컬렉션이 없습니다</string>
+    <string name="hide_system_bars" maxLength="41" comment="Title of a setting that allows to hide the system bars">시스템 바 숨기기</string>
+    <string name="hide_system_bars_none" comment="Setting option to not hide any of the system bars">없음</string>
+    <string name="hide_system_bars_status_bar" comment="Setting option to hide the system status bar (the top one with clock, battery status, etc)">상태 바</string>
+    <string name="hide_system_bars_navigation_bar" comment="Setting option to hide the system navigation bar (the bottom one that can go back, to home, etc)">내비게이션 바</string>
+    <string name="hide_system_bars_all_bars" comment="Setting option to hide all the system bars">전부</string>
     <string name="ignore_display_cutout" maxLength="41">Ignore display cutout</string>
-    <string name="hide_answer_buttons" maxLength="41">Hide answer buttons</string>
-    <string name="hide_hard_and_easy" maxLength="41">Hide ‘Hard’ and ‘Easy’ buttons</string>
-    <string name="reviewer_frame_style" maxLength="41">Frame style</string>
-    <string name="reviewer_frame_style_card" maxLength="41" comment="Style name of the \'Card\' card frame of the Reviewer">Card</string>
-    <string name="reviewer_frame_style_box" maxLength="41" comment="Style name of the \'Box\' card frame of the Reviewer">Box</string>
+    <string name="hide_answer_buttons" maxLength="41">정답 버튼 숨기기</string>
+    <string name="hide_hard_and_easy" maxLength="41">\'어려움\', \'쉬움\' 버튼 숨기기</string>
+    <string name="reviewer_frame_style" maxLength="41">프레임 스타일</string>
+    <string name="reviewer_frame_style_card" maxLength="41" comment="Style name of the \'Card\' card frame of the Reviewer">카드</string>
+    <string name="reviewer_frame_style_box" maxLength="41" comment="Style name of the \'Box\' card frame of the Reviewer">상자</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="open_settings" comment="Description of the shortcut that opens the app settings">Open settings</string>
+    <string name="open_settings" comment="Description of the shortcut that opens the app settings">설정 열기</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ko/11-arrays.xml b/AnkiDroid/src/main/res/values-ko/11-arrays.xml
index b69fe5d82cd1..7e4ad4a899c5 100644
--- a/AnkiDroid/src/main/res/values-ko/11-arrays.xml
+++ b/AnkiDroid/src/main/res/values-ko/11-arrays.xml
@@ -45,22 +45,22 @@
     <!-- error_reporting_choice_labels -->
     <string name="error_reporting_choice_always_report">항상 보고하기</string>
     <string name="error_reporting_choice_never_report">보고하지 않기</string>
-    <string name="error_reporting_choice_ask_user">오류 보고전 묻기</string>
+    <string name="error_reporting_choice_ask_user">오류 보고 전 묻기</string>
     <!-- leech_action_labels -->
     <!-- 01-core:menu_suspend_card -->
     <!-- new_order_labels -->
     <!-- cram_deck_conf_order_labels -->
-    <string name="cram_deck_conf_order_oldest_seen_first">오래된 카드 먼저</string>
+    <string name="cram_deck_conf_order_oldest_seen_first">오래된 순서</string>
     <string name="cram_deck_conf_order_random">무작위</string>
-    <string name="cram_deck_conf_order_increasing_intervals">학습 간격 늘이기</string>
+    <string name="cram_deck_conf_order_increasing_intervals">학습 간격 늘리기</string>
     <string name="cram_deck_conf_order_decreasing_intervals">학습 간격 줄이기</string>
-    <string name="cram_deck_conf_order_most_lapsed">오답 빈도가 가장 높은</string>
-    <string name="cram_deck_conf_order_order_added">추가된 순서대로</string>
-    <string name="cram_deck_conf_order_order_due">기간 순서대로</string>
-    <string name="cram_deck_conf_order_latest_added_first">최근 추가된 것이 처음으로</string>
-    <string name="cram_deck_conf_order_relative_overdueness">상대적 기간초과</string>
+    <string name="cram_deck_conf_order_most_lapsed">오답 빈도가 높은 순서</string>
+    <string name="cram_deck_conf_order_order_added">추가된 순서</string>
+    <string name="cram_deck_conf_order_order_due">기한 순서</string>
+    <string name="cram_deck_conf_order_latest_added_first">최근 추가된 순서</string>
+    <string name="cram_deck_conf_order_relative_overdueness">상대적 지연</string>
     <!-- add_to_cur_labels -->
-    <string name="add_to_deck_use_current_deck">현재 카드 묶음을 사용</string>
+    <string name="add_to_deck_use_current_deck">현재 덱 사용하기</string>
     <string name="add_to_deck_decide_by_note_type">노트 형식에 따라 결정</string>
     <!-- theme labels -->
     <string name="theme_follow_system">시스템 설정</string>
@@ -71,35 +71,35 @@
     <string name="night_theme_black">블랙</string>
     <string name="night_theme_dark">어두움</string>
     <!-- html_size_code_labels -->
-    <string name="html_size_code_xx_small">엄청나게 작음</string>
-    <string name="html_size_code_x_small">매우 작음</string>
-    <string name="html_size_code_small">작음</string>
+    <string name="html_size_code_xx_small">엄청나게 작게</string>
+    <string name="html_size_code_x_small">매우 작게</string>
+    <string name="html_size_code_small">작게</string>
     <string name="html_size_code_medium">보통</string>
     <string name="html_size_code_large">크게</string>
     <string name="html_size_code_x_large">매우 크게</string>
     <string name="html_size_code_xx_large">엄청나게 크게</string>
     <!-- gestures_labels -->
-    <string name="answer_again" maxLength="41">다시</string>
-    <string name="answer_hard" maxLength="41">어려움</string>
-    <string name="answer_good" maxLength="41">괜찮음</string>
-    <string name="answer_easy" maxLength="41">쉬움</string>
-    <string name="gesture_play" maxLength="41">미디어 재생</string>
-    <string name="gesture_abort_learning" maxLength="41">리뷰어 닫기</string>
-    <string name="gesture_flag_red" maxLength="41">빨간색 플래그 넣기 / 빼기</string>
-    <string name="gesture_flag_orange" maxLength="41">주황색 플래그 넣기 / 빼기</string>
-    <string name="gesture_flag_green" maxLength="41">초록색 플래그 넣기 / 빼기</string>
-    <string name="gesture_flag_blue" maxLength="41">파란색 플래그 넣기 / 빼기</string>
-    <string name="gesture_flag_pink" maxLength="41">핑크색 플래그 넣기 / 빼기</string>
-    <string name="gesture_flag_turquoise" maxLength="41">청록색 플래그 넣기 / 빼기</string>
-    <string name="gesture_flag_purple" maxLength="41">보라색 플래그 넣기 / 빼기</string>
-    <string name="gesture_flag_remove" maxLength="41">플래그 빼기</string>
+    <string name="answer_again" maxLength="41">다시하기</string>
+    <string name="answer_hard" maxLength="41">난이도: 어려움</string>
+    <string name="answer_good" maxLength="41">난이도: 괜찮음</string>
+    <string name="answer_easy" maxLength="41">난이도: 쉬움</string>
+    <string name="gesture_play" maxLength="41">미디어 재생하기</string>
+    <string name="gesture_abort_learning" maxLength="41">복습 창 닫기</string>
+    <string name="gesture_flag_red" maxLength="41">빨간색 플래그 달기 / 없애기</string>
+    <string name="gesture_flag_orange" maxLength="41">주황색 플래그 달기 / 없애기</string>
+    <string name="gesture_flag_green" maxLength="41">초록색 플래그 달기 / 없애기</string>
+    <string name="gesture_flag_blue" maxLength="41">파란색 플래그 달기 / 없애기</string>
+    <string name="gesture_flag_pink" maxLength="41">분홍색 플래그 달기 / 없애기</string>
+    <string name="gesture_flag_turquoise" maxLength="41">청록색 플래그 달기 / 없애기</string>
+    <string name="gesture_flag_purple" maxLength="41">보라색 플래그 달기 / 없애기</string>
+    <string name="gesture_flag_remove" maxLength="41">플래그 제거하기</string>
     <string name="gesture_page_up" maxLength="41">페이지 위로</string>
     <string name="gesture_page_down" maxLength="41">페이지 아래로</string>
-    <string name="gesture_abort_sync" maxLength="41">리뷰어 닫고 동기화</string>
+    <string name="gesture_abort_sync" maxLength="41">복습 창 닫고 동기화하기</string>
     <string name="gesture_toggle_whiteboard" maxLength="41">화이트보드 켜기 / 끄기</string>
     <string name="gesture_show_hint" maxLength="41">힌트 보기</string>
     <string name="gesture_show_all_hints" maxLength="41">모든 힌트 보기</string>
-    <string name="record_voice" maxLength="41">목소리 녹음</string>
-    <string name="replay_voice" maxLength="41">목소리 녹음 재생</string>
-    <string name="save_voice" maxLength="41">녹음 저장</string>
+    <string name="record_voice" maxLength="41">녹음하기</string>
+    <string name="replay_voice" maxLength="41">녹음 다시 듣기</string>
+    <string name="save_voice" maxLength="41">녹음 저장하기</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ko/16-multimedia-editor.xml b/AnkiDroid/src/main/res/values-ko/16-multimedia-editor.xml
index 25361c523793..1249b0b95dd0 100644
--- a/AnkiDroid/src/main/res/values-ko/16-multimedia-editor.xml
+++ b/AnkiDroid/src/main/res/values-ko/16-multimedia-editor.xml
@@ -42,7 +42,7 @@
     <!-- Main editor popup menu items -->
     <string name="multimedia_editor_popup_image">이미지 추가</string>
     <string name="multimedia_editor_popup_audio_clip">오디오 클립 추가</string>
-    <string name="multimedia_editor_popup_video_clip">비디오 클립 추가</string>
+    <string name="multimedia_editor_popup_video_clip">비디오 클립 추가하기</string>
     <string name="multimedia_editor_popup_audio">오디오 녹음</string>
     <string name="multimedia_editor_popup_cloze">빈칸 만들기</string>
     <!-- Field editing general -->
@@ -65,12 +65,12 @@
     <!-- Message when recording fails -->
     <string name="multimedia_editor_audio_view_recording_failed">녹음 실패</string>
     <string name="multimedia_editor_audio_view_playing_failed">재생 실패</string>
-    <string name="multimedia_editor_audio_view_create_failed">레코더 툴바를 생성할 수 없습니다</string>
+    <string name="multimedia_editor_audio_view_create_failed">레코더 툴바를 생성 불가능</string>
     <!-- Crop function-->
     <string name="crop_image">이 이미지를 자르시겠습니까?</string>
     <string name="crop_button" maxLength="28">이미지 자르기</string>
     <string name="save_dialog_content">현재의 이미지의 크기는 %sMB 입니다. 기본 이미지 크기의 한도는 1MB입니다. 이미지를 압축하시겠습니까?</string>
     <string name="select_image_failed">"이미지 선택 실패, 재시도하세요"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">필드 내용</string>
-    <string name="reselect" maxLength="28">재선택</string>
+    <string name="reselect" maxLength="28">재선택하기</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ko/17-model-manager.xml b/AnkiDroid/src/main/res/values-ko/17-model-manager.xml
index 7782d82cb735..835e4c217edb 100644
--- a/AnkiDroid/src/main/res/values-ko/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ko/17-model-manager.xml
@@ -26,11 +26,11 @@
  
 <resources>
     <!--Menu Labels-->
-    <string name="model_browser_label" comment="Label of the browser of note types. The text can\'t be found in AnkiDroid directly." maxLength="28">노트 유형 관리</string>
-    <string name="model_editor_label" comment="Label of the window to edit the fields of a note type. This text can\'t be found in Ankidroid directly">필드 관리</string>
+    <string name="model_browser_label" comment="Label of the browser of note types. The text can\'t be found in AnkiDroid directly." maxLength="28">노트 유형 관리하기</string>
+    <string name="model_editor_label" comment="Label of the window to edit the fields of a note type. This text can\'t be found in Ankidroid directly">필드 관리하기</string>
     <!--Toasts-->
     <string name="toast_last_model">마지막 노트 유형은 삭제 할 수 없습니다.</string>
-    <string name="toast_last_field">노트 유형은 최소한 하나의 필드가 필요합니다.</string>
+    <string name="toast_last_field">노트 유형에는 최소한 하나의 필드가 필요합니다.</string>
     <string name="toast_empty_name">이름을 입력하셔야 합니다.</string>
     <string name="toast_duplicate_field">필드 이름이 이미 사용 중 입니다.</string>
     <!--Plurals-->
@@ -41,23 +41,23 @@
         <item quantity="other">%d 노트</item>
     </plurals>
     <!--Browser-->
-    <string name="model_browser_delete">노트 유형 삭제</string>
-    <string name="model_browser_rename" comment="Rename a note type">이름 변경</string>
-    <string name="model_browser_template">카드 편집</string>
+    <string name="model_browser_delete">노트 유형 삭제하기</string>
+    <string name="model_browser_rename" comment="Rename a note type">이름 변경하기</string>
+    <string name="model_browser_template">카드 편집하기</string>
     <!--Rename-->
     <string name="rename_model">노트 유형 이름 바꾸기 </string>
     <!--Language Hint-->
     <string name="model_field_editor_language_hint_dialog_success_result">키보드 언어 힌트를 %s로 설정하기</string>
     <!--Field Editing-->
-    <string name="model_field_editor_title">필드 편집</string>
-    <string name="model_field_editor_add" maxLength="28">필드 추가</string>
-    <string name="model_field_editor_delete">필드 삭제</string>
-    <string name="model_field_editor_rename">필드 이름 변경</string>
-    <string name="model_field_editor_language_hint">키보드 언어 힌트 설정</string>
-    <string name="model_field_editor_reposition_menu">필드 재배치</string>
-    <string name="model_field_editor_toggle_sticky">추가할 때 마지막 입력을 기억하기</string>
+    <string name="model_field_editor_title">필드 편집하기</string>
+    <string name="model_field_editor_add" maxLength="28">필드 추가하기</string>
+    <string name="model_field_editor_delete">필드 삭제하기</string>
+    <string name="model_field_editor_rename">필드 이름 변경하기</string>
+    <string name="model_field_editor_language_hint">키보드 언어 힌트 설정하기</string>
+    <string name="model_field_editor_reposition_menu">필드 재배치하기</string>
+    <string name="model_field_editor_toggle_sticky">추가 시 마지막 입력값 기억하기</string>
     <string name="model_field_editor_changing">필드 업데이트 중</string>
-    <string name="model_field_editor_sort_field">이 필드로 정렬</string>
+    <string name="model_field_editor_sort_field">이 필드로 정렬하기</string>
     <!--Warnings-->
     <string name="model_delete_warning">이 노트 유형을 삭제하시겠습니까?</string>
     <string name="field_delete_warning">이 필드를 삭제하시겠습니까?</string>
@@ -67,15 +67,15 @@
     <string name="model_browser_add_clone">클론: %1$s </string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
-    <string name="card_template_browser_appearance_question_format">질문 형식</string>
-    <string name="card_template_browser_appearance_answer_format">답안 형식</string>
+    <string name="card_template_browser_appearance_question_format">문제 형식</string>
+    <string name="card_template_browser_appearance_answer_format">답 형식</string>
     <string name="card_template_browser_appearance_restore_default_dialog">기본값을 복원하시겠습니까?</string>
-    <string name="card_template_browser_appearance_saving_note">These changes are applied when the card template is saved</string>
+    <string name="card_template_browser_appearance_saving_note">이 변경사항은 카드 템플릿이 저장될 때 적용됩니다</string>
     <!-- Deck Override -->
-    <string name="card_template_editor_deck_override_on">Deck override (on)</string>
-    <string name="card_template_editor_deck_override_off">Deck override (off)</string>
+    <string name="card_template_editor_deck_override_on">덱 덮어쓰기 on</string>
+    <string name="card_template_editor_deck_override_off">덱 덮어쓰기 off</string>
     <string name="model_manager_deck_override_added_message">Set ‘%1$s’ default deck to ‘%2$s’</string>
     <string name="model_manager_deck_override_removed_message">Removed default deck for ‘%s’</string>
-    <string name="deck_override_explanation">새 \'%s\' 카드를 가입할 덱 선택</string>
+    <string name="deck_override_explanation">새 \'%s\' 카드가 들어갈 덱 선택하기</string>
     <string name="deck_picker_dialog_filter_decks" maxLength="28">Filter decks</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ko/18-standard-models.xml b/AnkiDroid/src/main/res/values-ko/18-standard-models.xml
index 38a443376639..0c6793c79452 100644
--- a/AnkiDroid/src/main/res/values-ko/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-ko/18-standard-models.xml
@@ -26,6 +26,6 @@
  
 <resources>
     <!--Fields-->
-    <string name="front_field_name" maxLength="28">앞면</string>
-    <string name="back_field_name" maxLength="28">뒷면</string>
+    <string name="front_field_name" maxLength="28">앞장</string>
+    <string name="back_field_name" maxLength="28">뒷장</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ko/20-search-preference.xml b/AnkiDroid/src/main/res/values-ko/20-search-preference.xml
index 846c38380b03..cd2ea09b581d 100644
--- a/AnkiDroid/src/main/res/values-ko/20-search-preference.xml
+++ b/AnkiDroid/src/main/res/values-ko/20-search-preference.xml
@@ -61,5 +61,5 @@
 -->
 <resources xmlns:tools="http://schemas.android.com/tools">
     <string tools:ignore="UnusedResources" name="searchpreference_search" comment="By submitting this string, you license it under the MIT License">검색</string>
-    <string tools:ignore="UnusedResources" name="searchpreference_clear_history" comment="By submitting this string, you license it under the MIT License">기록 초기화</string>
+    <string tools:ignore="UnusedResources" name="searchpreference_clear_history" comment="By submitting this string, you license it under the MIT License">기록 삭제하기</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-uk/10-preferences.xml b/AnkiDroid/src/main/res/values-uk/10-preferences.xml
index 277957de65c7..72f536fdbbec 100644
--- a/AnkiDroid/src/main/res/values-uk/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-uk/10-preferences.xml
@@ -99,7 +99,7 @@
     <string name="gestures_summ">Використовувати жести для таких дій, як відповідь і редагування карток.</string>
     <string name="gestures_corner_touch" maxLength="41">9-точковий дотик</string>
     <string name="gestures_corner_touch_summary">Дозволити сенсорні жести в кутах екрану</string>
-    <string name="show_keyboard_shortcuts" maxLength="41">Показати клавіатурні комбінації клавіш</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Показати комбінації клавіш клавіатури</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Повноекранна панель навігації</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Відкривати панель навігації при проведенні вправо з будь-якого місця на екрані</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Немає</string>

From 64dca09111e51c291aae2eb62ef5227136ad9ebc Mon Sep 17 00:00:00 2001
From: Kaustubh <ksd.tcet@gmail.com>
Date: Mon, 3 Mar 2025 17:44:04 +0530
Subject: [PATCH 089/200] var was never reassigned so changed it to val

---
 AnkiDroid/src/main/java/com/ichi2/utils/VersionUtils.kt | 2 +-
 AnkiDroid/src/test/java/com/ichi2/libanki/FieldTest.kt  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/utils/VersionUtils.kt b/AnkiDroid/src/main/java/com/ichi2/utils/VersionUtils.kt
index 99a606440b05..6c8765617200 100644
--- a/AnkiDroid/src/main/java/com/ichi2/utils/VersionUtils.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/utils/VersionUtils.kt
@@ -57,7 +57,7 @@ object VersionUtils {
      */
     val pkgVersionName: String
         get() {
-            var pkgVersion = "?"
+            val pkgVersion = "?"
             val context: Context = applicationInstance ?: return pkgVersion
             try {
                 val pInfo = context.getPackageInfoCompat(context.packageName, PackageInfoFlagsCompat.EMPTY) ?: return pkgVersion
diff --git a/AnkiDroid/src/test/java/com/ichi2/libanki/FieldTest.kt b/AnkiDroid/src/test/java/com/ichi2/libanki/FieldTest.kt
index a35756a1e3c2..867267d244ae 100644
--- a/AnkiDroid/src/test/java/com/ichi2/libanki/FieldTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/libanki/FieldTest.kt
@@ -33,7 +33,7 @@ class FieldTest : AndroidTest {
     @Test
     fun `'tag' - null handling`() {
         val jsonObject = JSONObject()
-        var field = Field(jsonObject)
+        val field = Field(jsonObject)
 
         assertNull(field.imageOcclusionTag, message = "{ }")
 

From d6ae45eed75b8e43f83c171ca239ed369df45da3 Mon Sep 17 00:00:00 2001
From: ProtonStar12 <priyankabamaniya310@gamil.com>
Date: Mon, 3 Mar 2025 05:17:01 +0530
Subject: [PATCH 090/200] [Cleanup]: Remove Android Studio Warning

---
 AnkiDroid/src/test/java/com/ichi2/utils/UniqueArrayListTest.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AnkiDroid/src/test/java/com/ichi2/utils/UniqueArrayListTest.kt b/AnkiDroid/src/test/java/com/ichi2/utils/UniqueArrayListTest.kt
index 462b93dc94db..c06025b5153c 100644
--- a/AnkiDroid/src/test/java/com/ichi2/utils/UniqueArrayListTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/utils/UniqueArrayListTest.kt
@@ -558,7 +558,7 @@ class UniqueArrayListTest {
 
         assertFalse(uniqueList.isEmpty())
         uniqueList.removeAll(
-            listOf(
+            setOf(
                 1L,
                 2L,
                 3L,

From 19df388a4c3c9fae08b795f38dd2a1f42fabaa4f Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Sun, 2 Mar 2025 20:24:56 -0300
Subject: [PATCH 091/200] fix(new reviewer): snackbar position if answer
 buttons are hidden

---
 .../ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt    | 8 +-------
 AnkiDroid/src/main/res/layout-sw600dp/reviewer2.xml       | 7 +++++++
 AnkiDroid/src/main/res/layout/reviewer2.xml               | 8 ++++++++
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt
index a8feeef1db31..7cbebf419a6f 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt
@@ -120,13 +120,7 @@ class ReviewerFragment :
         get() = requireView().findViewById(R.id.webview)
 
     override val baseSnackbarBuilder: SnackbarBuilder = {
-        val typeAnswerContainer = this@ReviewerFragment.view?.findViewById<View>(R.id.type_answer_container)
-        anchorView =
-            if (typeAnswerContainer?.isVisible == true) {
-                typeAnswerContainer
-            } else {
-                this@ReviewerFragment.view?.findViewById(R.id.answer_buttons)
-            }
+        anchorView = this@ReviewerFragment.view?.findViewById(R.id.snackbar_anchor)
     }
 
     override fun onStop() {
diff --git a/AnkiDroid/src/main/res/layout-sw600dp/reviewer2.xml b/AnkiDroid/src/main/res/layout-sw600dp/reviewer2.xml
index 2950f1e0cbb1..741a82e763f2 100644
--- a/AnkiDroid/src/main/res/layout-sw600dp/reviewer2.xml
+++ b/AnkiDroid/src/main/res/layout-sw600dp/reviewer2.xml
@@ -226,5 +226,12 @@
             android:layout_marginEnd="@dimen/reviewer_side_margin"
             />
 
+        <androidx.constraintlayout.widget.Barrier
+            android:id="@+id/snackbar_anchor"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:barrierDirection="top"
+            app:constraint_referenced_ids="type_answer_container, answer_buttons, show_answer"/>
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/AnkiDroid/src/main/res/layout/reviewer2.xml b/AnkiDroid/src/main/res/layout/reviewer2.xml
index 4da490a77f7c..ada84462b226 100644
--- a/AnkiDroid/src/main/res/layout/reviewer2.xml
+++ b/AnkiDroid/src/main/res/layout/reviewer2.xml
@@ -206,5 +206,13 @@
             android:layout_marginStart="12dp"
             />
 
+        <androidx.constraintlayout.widget.Barrier
+            android:id="@+id/snackbar_anchor"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:barrierDirection="top"
+            app:barrierAllowsGoneWidgets="false"
+            app:constraint_referenced_ids="type_answer_container, answer_buttons, show_answer"/>
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file

From ef2fe82ebaa6fa49f23e4b12be3b5db0d16aca43 Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Mon, 24 Feb 2025 13:16:44 -0300
Subject: [PATCH 092/200] refactor: move reviewer menu logic to a repository

Having the business logic in `MenuDisplayType` made the class harder to deal with, IMO

getConfiguredActions, getAllNotConfiguredActions and getMenuItems are being joined to improve the algorithm performance (there were a lot of nested loops before)
---
 .../preferences/reviewer/MenuDisplayType.kt   | 56 -----------
 .../reviewer/ReviewerMenuRepository.kt        | 77 +++++++++++++++
 .../reviewer/ReviewerMenuSettingsFragment.kt  | 23 +++--
 .../preferences/reviewer/ReviewerMenuView.kt  |  3 +-
 .../reviewer/MenuDisplayTypeTest.kt           | 96 -------------------
 .../reviewer/ReviewerMenuRepositoryTest.kt    | 89 +++++++++++++++++
 6 files changed, 181 insertions(+), 163 deletions(-)
 create mode 100644 AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ReviewerMenuRepository.kt
 delete mode 100644 AnkiDroid/src/test/java/com/ichi2/anki/preferences/reviewer/MenuDisplayTypeTest.kt
 create mode 100644 AnkiDroid/src/test/java/com/ichi2/anki/preferences/reviewer/ReviewerMenuRepositoryTest.kt

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/MenuDisplayType.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/MenuDisplayType.kt
index 04c7eb551945..a18fafaa7fbb 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/MenuDisplayType.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/MenuDisplayType.kt
@@ -15,11 +15,9 @@
  */
 package com.ichi2.anki.preferences.reviewer
 
-import android.content.SharedPreferences
 import android.view.MenuItem
 import androidx.annotation.StringRes
 import androidx.annotation.VisibleForTesting
-import androidx.core.content.edit
 import com.ichi2.anki.R
 
 enum class MenuDisplayType(
@@ -37,58 +35,4 @@ enum class MenuDisplayType(
 
     @VisibleForTesting
     val preferenceKey get() = "ReviewerMenuDisplayType_$name"
-
-    /**
-     * @return the configured actions for this menu display type.
-     */
-    @VisibleForTesting
-    fun getConfiguredActions(preferences: SharedPreferences): List<ViewerAction> {
-        val prefValue =
-            preferences.getString(preferenceKey, null)
-                ?: return emptyList()
-
-        val actionsNames = prefValue.split(SEPARATOR)
-        return actionsNames.mapNotNull { name ->
-            ViewerAction.entries.firstOrNull { it.name == name }
-        }
-    }
-
-    fun setPreferenceValue(
-        preferences: SharedPreferences,
-        actions: List<ViewerAction>,
-    ) {
-        val prefValue = actions.joinToString(SEPARATOR) { it.name }
-        preferences.edit { putString(preferenceKey, prefValue) }
-    }
-
-    companion object {
-        private const val SEPARATOR = ","
-
-        /**
-         * @return A list of all actions that aren't configured.
-         * Not configured items that don't have a default display type aren't included.
-         *
-         * May happen if the user hasn't configured any of the menu actions,
-         * or if a new action was implemented but not configured yet.
-         */
-        @VisibleForTesting
-        fun getAllNotConfiguredActions(prefs: SharedPreferences): List<ViewerAction> {
-            val mappedActions = MenuDisplayType.entries.flatMap { it.getConfiguredActions(prefs) }
-            return ViewerAction.entries.filter {
-                it.defaultDisplayType != null && it !in mappedActions
-            }
-        }
-
-        fun getMenuItems(
-            prefs: SharedPreferences,
-            vararg selected: MenuDisplayType = MenuDisplayType.entries.toTypedArray(),
-        ): Map<MenuDisplayType, List<ViewerAction>> {
-            val notConfiguredActions = getAllNotConfiguredActions(prefs)
-
-            return selected.toSet().associateWith { type ->
-                type.getConfiguredActions(prefs) +
-                    notConfiguredActions.filter { it.defaultDisplayType == type }
-            }
-        }
-    }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ReviewerMenuRepository.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ReviewerMenuRepository.kt
new file mode 100644
index 000000000000..ed78899f9636
--- /dev/null
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ReviewerMenuRepository.kt
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2025 Brayan Oliveira <brayandso.dev@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.ichi2.anki.preferences.reviewer
+
+import android.content.SharedPreferences
+import androidx.core.content.edit
+
+class ReviewerMenuRepository(
+    private val preferences: SharedPreferences,
+) {
+    /**
+     * @return a map of the [selected] display types and its actions.
+     */
+    fun getActionsByMenuDisplayTypes(
+        vararg selected: MenuDisplayType = MenuDisplayType.entries.toTypedArray(),
+    ): Map<MenuDisplayType, List<ViewerAction>> {
+        val menuActions = ViewerAction.entries.filter { it.defaultDisplayType != null }
+        val actionsNameMap = menuActions.associateBy { it.name }
+
+        val allConfiguredActions = mutableSetOf<ViewerAction>()
+        val actionsMap = LinkedHashMap<MenuDisplayType, MutableList<ViewerAction>>(selected.size)
+        for (displayType in MenuDisplayType.entries) {
+            val prefValue = preferences.getString(displayType.preferenceKey, null)
+            val configuredActions =
+                if (prefValue.isNullOrEmpty()) {
+                    mutableListOf()
+                } else {
+                    val actionNames = prefValue.split(SEPARATOR)
+                    actionNames.mapNotNullTo(mutableListOf()) { name ->
+                        actionsNameMap[name]
+                    }
+                }
+            if (displayType in selected) {
+                actionsMap[displayType] = configuredActions
+            }
+            allConfiguredActions.addAll(configuredActions)
+        }
+
+        // Add any menu action that hasn't been configured to its default display type
+        for (action in menuActions) {
+            if (action !in allConfiguredActions && action.defaultDisplayType in actionsMap) {
+                actionsMap[action.defaultDisplayType]?.add(action)
+            }
+        }
+        return actionsMap
+    }
+
+    fun setDisplayTypeActions(
+        alwaysShowActions: Iterable<ViewerAction>,
+        menuOnlyActions: Iterable<ViewerAction>,
+        disabledActions: Iterable<ViewerAction>,
+    ) {
+        fun Iterable<ViewerAction>.toPreferenceString() = this.joinToString(SEPARATOR) { it.name }
+        preferences.edit {
+            putString(MenuDisplayType.ALWAYS.preferenceKey, alwaysShowActions.toPreferenceString())
+            putString(MenuDisplayType.MENU_ONLY.preferenceKey, menuOnlyActions.toPreferenceString())
+            putString(MenuDisplayType.DISABLED.preferenceKey, disabledActions.toPreferenceString())
+        }
+    }
+
+    companion object {
+        private const val SEPARATOR = ","
+    }
+}
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ReviewerMenuSettingsFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ReviewerMenuSettingsFragment.kt
index d4257588d0d3..009d6fc78aeb 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ReviewerMenuSettingsFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ReviewerMenuSettingsFragment.kt
@@ -35,12 +35,14 @@ class ReviewerMenuSettingsFragment :
     Fragment(R.layout.preferences_reviewer_menu),
     OnClearViewListener<ReviewerMenuSettingsRecyclerItem>,
     ActionMenuView.OnMenuItemClickListener {
+    private lateinit var repository: ReviewerMenuRepository
+
     override fun onViewCreated(
         view: View,
         savedInstanceState: Bundle?,
     ) {
         super.onViewCreated(view, savedInstanceState)
-
+        repository = ReviewerMenuRepository(sharedPrefs())
         setupRecyclerView(view)
 
         view.findViewById<MaterialToolbar>(R.id.toolbar).setNavigationOnClickListener {
@@ -52,7 +54,7 @@ class ReviewerMenuSettingsFragment :
     }
 
     private fun setupRecyclerView(view: View) {
-        val menuItems = MenuDisplayType.getMenuItems(sharedPrefs())
+        val menuItems = repository.getActionsByMenuDisplayTypes()
 
         fun section(displayType: MenuDisplayType): List<ReviewerMenuSettingsRecyclerItem> =
             listOf(ReviewerMenuSettingsRecyclerItem.DisplayType(displayType)) +
@@ -95,19 +97,20 @@ class ReviewerMenuSettingsFragment :
         val menuOnlyItemsIndex = getIndex(MenuDisplayType.MENU_ONLY)
         val disabledItemsIndex = getIndex(MenuDisplayType.DISABLED)
 
-        val alwaysShowItems = getSubList(1, menuOnlyItemsIndex)
-        val menuOnlyItems = getSubList(menuOnlyItemsIndex, disabledItemsIndex)
-        val disabledItems = getSubList(disabledItemsIndex, items.lastIndex)
+        val alwaysShowActions = getSubList(1, menuOnlyItemsIndex)
+        val menuOnlyActions = getSubList(menuOnlyItemsIndex, disabledItemsIndex)
+        val disabledActions = getSubList(disabledItemsIndex, items.lastIndex)
 
-        val preferences = sharedPrefs()
-        MenuDisplayType.ALWAYS.setPreferenceValue(preferences, alwaysShowItems)
-        MenuDisplayType.MENU_ONLY.setPreferenceValue(preferences, menuOnlyItems)
-        MenuDisplayType.DISABLED.setPreferenceValue(preferences, disabledItems)
+        repository.setDisplayTypeActions(
+            alwaysShowActions = alwaysShowActions,
+            menuOnlyActions = menuOnlyActions,
+            disabledActions = disabledActions,
+        )
 
         lifecycleScope.launch {
             val menu = requireView().findViewById<ReviewerMenuView>(R.id.reviewer_menu_view)
             menu.clear()
-            menu.addActions(alwaysShowItems, menuOnlyItems)
+            menu.addActions(alwaysShowActions, menuOnlyActions)
             menu.setFlagTitles()
         }
     }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ReviewerMenuView.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ReviewerMenuView.kt
index 1012a07817d1..9b5e0cc66389 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ReviewerMenuView.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ReviewerMenuView.kt
@@ -52,6 +52,7 @@ class ReviewerMenuView
         attrs: AttributeSet? = null,
         defStyleAttr: Int = 0,
     ) : LinearLayout(context, attrs, defStyleAttr) {
+        private val repository = ReviewerMenuRepository(context.sharedPrefs())
         private val frontMenu: Menu
         private val overflowMenu: Menu
 
@@ -125,7 +126,7 @@ class ReviewerMenuView
         }
 
         private fun setupMenus() {
-            val menuItems = MenuDisplayType.getMenuItems(context.sharedPrefs(), MenuDisplayType.ALWAYS, MenuDisplayType.MENU_ONLY)
+            val menuItems = repository.getActionsByMenuDisplayTypes(MenuDisplayType.ALWAYS, MenuDisplayType.MENU_ONLY)
             addActions(menuItems.getValue(MenuDisplayType.ALWAYS), menuItems.getValue(MenuDisplayType.MENU_ONLY))
             // wait until attached to a fragment or activity to launch the coroutine to setup flags
             viewTreeObserver.addOnGlobalLayoutListener(
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/preferences/reviewer/MenuDisplayTypeTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/preferences/reviewer/MenuDisplayTypeTest.kt
deleted file mode 100644
index 7a1e510d8d21..000000000000
--- a/AnkiDroid/src/test/java/com/ichi2/anki/preferences/reviewer/MenuDisplayTypeTest.kt
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- *  Copyright (c) 2024 Brayan Oliveira <brayandso.dev@gmail.com>
- *
- *  This program is free software; you can redistribute it and/or modify it under
- *  the terms of the GNU General Public License as published by the Free Software
- *  Foundation; either version 3 of the License, or (at your option) any later
- *  version.
- *
- *  This program is distributed in the hope that it will be useful, but WITHOUT ANY
- *  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- *  PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with
- *  this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.ichi2.anki.preferences.reviewer
-
-import android.content.SharedPreferences
-import androidx.core.content.edit
-import com.github.ivanshafran.sharedpreferencesmock.SPMockBuilder
-import org.hamcrest.MatcherAssert.assertThat
-import org.hamcrest.Matchers.empty
-import org.junit.Assert.assertEquals
-import org.junit.Before
-import org.junit.Test
-import kotlin.test.assertContentEquals
-
-class MenuDisplayTypeTest {
-    private lateinit var prefs: SharedPreferences
-
-    @Before
-    fun setUp() {
-        prefs = SPMockBuilder().createSharedPreferences()
-    }
-
-    // Safeguard against changing the preference keys.
-    // A preference upgrade is necessary if they are changed.
-    @Test
-    fun `preferenceKeys aren't changed`() {
-        assertEquals(MenuDisplayType.ALWAYS.preferenceKey, "ReviewerMenuDisplayType_ALWAYS")
-        assertEquals(MenuDisplayType.MENU_ONLY.preferenceKey, "ReviewerMenuDisplayType_MENU_ONLY")
-        assertEquals(MenuDisplayType.DISABLED.preferenceKey, "ReviewerMenuDisplayType_DISABLED")
-    }
-
-    // commas can't be part of an enum object name, so they are safe as separators.
-    // This test serves as a safeguard against changes in the separator, which would need
-    // a preference upgrade
-    @Test
-    fun `setPreferenceValue stores actions as comma-separated string`() {
-        val actions = listOf(ViewerAction.UNDO, ViewerAction.REDO)
-        MenuDisplayType.ALWAYS.setPreferenceValue(prefs, actions)
-
-        val expectedValue = "UNDO,REDO"
-        assertEquals(expectedValue, prefs.getString(MenuDisplayType.ALWAYS.preferenceKey, null))
-    }
-
-    @Test
-    fun `getConfiguredActions returns correct list of ViewerActions`() {
-        prefs.edit {
-            putString(MenuDisplayType.ALWAYS.preferenceKey, "UNDO,MARK")
-        }
-        val result = MenuDisplayType.ALWAYS.getConfiguredActions(prefs)
-        assertEquals(listOf(ViewerAction.UNDO, ViewerAction.MARK), result)
-    }
-
-    @Test
-    fun `getConfiguredActions returns empty list if preference is not set`() {
-        val result = MenuDisplayType.ALWAYS.getConfiguredActions(prefs)
-        assertEquals(emptyList<ViewerAction>(), result)
-    }
-
-    @Test
-    fun `getAllNotConfiguredActions returns only actions with default display types if preference is not set`() {
-        val result = MenuDisplayType.getAllNotConfiguredActions(prefs)
-        val expected = ViewerAction.entries.filter { it.defaultDisplayType != null }
-        assertEquals(expected, result)
-    }
-
-    @Test
-    fun `getMenuItems returns correctly categorized items`() {
-        // assuming that UNDO is the only action with ALWAYS as default, put it in another list
-        MenuDisplayType.MENU_ONLY.setPreferenceValue(prefs, listOf(ViewerAction.UNDO))
-        val result = MenuDisplayType.getMenuItems(prefs, MenuDisplayType.ALWAYS).getValue(MenuDisplayType.ALWAYS)
-        assertThat(result, empty())
-    }
-
-    @Test
-    fun `getMenuItems returns not configured items that have a default display type`() {
-        // assuming that USER_ACTION_1 and USER_ACTION_2 don't have MENU_ONLY as default
-        val userActions1and2 = listOf(ViewerAction.USER_ACTION_1, ViewerAction.USER_ACTION_2)
-        MenuDisplayType.MENU_ONLY.setPreferenceValue(prefs, userActions1and2)
-        val result = MenuDisplayType.getMenuItems(prefs, MenuDisplayType.MENU_ONLY).getValue(MenuDisplayType.MENU_ONLY)
-        val expected = userActions1and2 + ViewerAction.entries.filter { it.defaultDisplayType == MenuDisplayType.MENU_ONLY }
-        assertContentEquals(expected, result)
-    }
-}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/preferences/reviewer/ReviewerMenuRepositoryTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/preferences/reviewer/ReviewerMenuRepositoryTest.kt
new file mode 100644
index 000000000000..19e928cfb122
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/preferences/reviewer/ReviewerMenuRepositoryTest.kt
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2025 Brayan Oliveira <brayandso.dev@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.ichi2.anki.preferences.reviewer
+
+import android.content.SharedPreferences
+import com.github.ivanshafran.sharedpreferencesmock.SPMockBuilder
+import com.ichi2.testutils.common.assertThrows
+import org.hamcrest.MatcherAssert.assertThat
+import org.hamcrest.Matchers.empty
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import kotlin.test.assertContentEquals
+
+class ReviewerMenuRepositoryTest {
+    private lateinit var prefs: SharedPreferences
+    private lateinit var repository: ReviewerMenuRepository
+
+    @Before
+    fun setUp() {
+        prefs = SPMockBuilder().createSharedPreferences()
+        repository = ReviewerMenuRepository(prefs)
+    }
+
+    // commas can't be part of an enum object name, so they are safe as separators.
+    // This test serves as a safeguard against changes in the separator, which would need
+    // a preference upgrade
+    @Test
+    fun `setPreferenceValue stores actions as comma-separated string`() {
+        val actions = listOf(ViewerAction.UNDO, ViewerAction.REDO)
+        repository.setDisplayTypeActions(alwaysShowActions = actions, emptyList(), emptyList())
+
+        val expectedValue = "UNDO,REDO"
+        assertEquals(expectedValue, prefs.getString(MenuDisplayType.ALWAYS.preferenceKey, null))
+    }
+
+    @Test
+    fun `getActionsByMenuDisplayType returns correctly categorized items`() {
+        // assuming that UNDO is the only action with ALWAYS as default, put it in another list
+        repository.setDisplayTypeActions(
+            alwaysShowActions = emptyList(),
+            menuOnlyActions = listOf(ViewerAction.UNDO),
+            disabledActions = emptyList(),
+        )
+        val result = repository.getActionsByMenuDisplayTypes(MenuDisplayType.ALWAYS).getValue(MenuDisplayType.ALWAYS)
+        assertThat(result, empty())
+    }
+
+    @Test
+    fun `getActionsByMenuDisplayType returns not configured items that have a default display type`() {
+        // assuming that USER_ACTION_1 and USER_ACTION_2 don't have MENU_ONLY as default
+        val userActions1and2 = listOf(ViewerAction.USER_ACTION_1, ViewerAction.USER_ACTION_2)
+        repository.setDisplayTypeActions(alwaysShowActions = emptyList(), menuOnlyActions = userActions1and2, disabledActions = emptyList())
+        val result = repository.getActionsByMenuDisplayTypes(MenuDisplayType.MENU_ONLY).getValue(MenuDisplayType.MENU_ONLY)
+        val expected = userActions1and2 + ViewerAction.entries.filter { it.defaultDisplayType == MenuDisplayType.MENU_ONLY }
+        assertContentEquals(expected, result)
+    }
+
+    @Test
+    fun `getActionsByMenuDisplayType returns only the selected display types`() {
+        val one = repository.getActionsByMenuDisplayTypes(MenuDisplayType.DISABLED, MenuDisplayType.MENU_ONLY)
+        one.getValue(MenuDisplayType.DISABLED)
+        one.getValue(MenuDisplayType.MENU_ONLY)
+        assertThrows<NoSuchElementException> { one.getValue(MenuDisplayType.ALWAYS) }
+
+        val two = repository.getActionsByMenuDisplayTypes(MenuDisplayType.ALWAYS, MenuDisplayType.DISABLED, MenuDisplayType.MENU_ONLY)
+        two.getValue(MenuDisplayType.DISABLED)
+        two.getValue(MenuDisplayType.ALWAYS)
+        two.getValue(MenuDisplayType.MENU_ONLY)
+
+        val three = repository.getActionsByMenuDisplayTypes(MenuDisplayType.ALWAYS)
+        three.getValue(MenuDisplayType.ALWAYS)
+        assertThrows<NoSuchElementException> { three.getValue(MenuDisplayType.DISABLED) }
+        assertThrows<NoSuchElementException> { three.getValue(MenuDisplayType.MENU_ONLY) }
+    }
+}

From ecd2d4984dc4bebdd0df02c21e0d207fda4d4b73 Mon Sep 17 00:00:00 2001
From: AnkiDroid Translations <ankidroid@ankidroid.org>
Date: Fri, 7 Mar 2025 17:47:33 +0000
Subject: [PATCH 093/200] Updated strings from Crowdin

---
 AnkiDroid/src/main/res/values-de/01-core.xml        |  6 +++---
 AnkiDroid/src/main/res/values-de/02-strings.xml     |  2 +-
 AnkiDroid/src/main/res/values-de/07-cardbrowser.xml | 12 ++++++------
 AnkiDroid/src/main/res/values-de/10-preferences.xml |  6 +++---
 AnkiDroid/src/main/res/values-es-rES/01-core.xml    |  2 +-
 AnkiDroid/src/main/res/values-or/07-cardbrowser.xml |  8 ++++----
 AnkiDroid/src/main/res/values-or/08-widget.xml      |  2 +-
 AnkiDroid/src/main/res/values-or/10-preferences.xml |  4 ++--
 8 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/AnkiDroid/src/main/res/values-de/01-core.xml b/AnkiDroid/src/main/res/values-de/01-core.xml
index 34f46a189b6b..230e2cf226bd 100644
--- a/AnkiDroid/src/main/res/values-de/01-core.xml
+++ b/AnkiDroid/src/main/res/values-de/01-core.xml
@@ -61,11 +61,11 @@
         <item quantity="other">Noch ca. %d Minuten</item>
     </plurals>
     <plurals name="reviewer_window_title_hours_new">
-        <item quantity="one">%1$d Stunde %2$d verbleibend</item>
+        <item quantity="one">%1$d Stunde(n) %2$d Minute(n) verbleibend</item>
         <item quantity="other">%1$d Stunden %2$d verbleibend</item>
     </plurals>
     <plurals name="reviewer_window_title_days_new">
-        <item quantity="one">%1$d Tag %2$dStd. übrig</item>
+        <item quantity="one">%1$d Tag %2$d Std. übrig</item>
         <item quantity="other">%1$d Tage %2$dStd. übrig</item>
     </plurals>
     <string name="no_cards_placeholder_title">Sammlung ist leer</string>
@@ -129,7 +129,7 @@
     <string name="empty_deck">Dieser Stapel ist leer</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Stapelsuche</string>
     <string name="invalid_deck_name">Ungültiger Stapelname</string>
-    <string name="studyoptions_congrats_finished">Congratulations! You have finished for today.</string>
+    <string name="studyoptions_congrats_finished">Glückwunsch! Das war alles für heute.</string>
     <string name="studyoptions_congrats_next_due_in" comment="The param will be replaced with \'The next card will be ready in X time\'">Dieser Stapel ist vorerst geschafft! %s</string>
     <string name="studyoptions_no_cards_due">Es sind noch keine Karten fällig</string>
     <string name="sd_card_not_mounted">Gerätespeicher nicht eingebunden</string>
diff --git a/AnkiDroid/src/main/res/values-de/02-strings.xml b/AnkiDroid/src/main/res/values-de/02-strings.xml
index e06bb0b7440b..e1378e11d3c7 100644
--- a/AnkiDroid/src/main/res/values-de/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-de/02-strings.xml
@@ -301,7 +301,7 @@
     <string name="show_notes" comment="Label for toggle notes button in BrowserOptionsDialog">Notizen</string>
     <string name="toggle_cards_notes">Karten/Notizen umschalten</string>
     <string name="truncate_content_help">Die Höhe jeder Zeile der Kartenübersicht anpassen, sodass nur die ersten 3 Zeilen des Inhalts zu sehen sind.</string>
-    <string name="browser_options_dialog_heading">Browser options</string>
+    <string name="browser_options_dialog_heading">Browser Einstellungen</string>
     <string name="audio_saved">Aufnahme gespeichert</string>
     <string name="deleting_selected_notes">Lösche ausgewählte Notizen</string>
     <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Stimme berühren, um sie anzuhören
diff --git a/AnkiDroid/src/main/res/values-de/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-de/07-cardbrowser.xml
index 4da9f967fa91..c46524175867 100644
--- a/AnkiDroid/src/main/res/values-de/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-de/07-cardbrowser.xml
@@ -112,10 +112,10 @@
     <string name="edit_tags_dialog" comment="Description of the shortcut that opens the edit tags dialog">Schlagwörter-dialog bearbeiten</string>
     <string name="show_order_dialog" comment="Description of the shortcut that shows the order dialog">Bestellungsdialog anzeigen</string>
     <!-- Manage columns dialog -->
-    <string name="browse_manage_columns_main_heading">Columns</string>
-    <string name="browse_manage_columns">Manage columns</string>
-    <string name="user_active_columns">Active</string>
-    <string name="user_potential_columns">Available</string>
-    <string name="include_column">Include column</string>
-    <string name="exclude_column">Exclude column</string>
+    <string name="browse_manage_columns_main_heading">Spalten</string>
+    <string name="browse_manage_columns">Spalten verwalten</string>
+    <string name="user_active_columns">Aktiv</string>
+    <string name="user_potential_columns">Verfügbar</string>
+    <string name="include_column">Spalte einbeziehen</string>
+    <string name="exclude_column">Spalte ausschließen</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-de/10-preferences.xml b/AnkiDroid/src/main/res/values-de/10-preferences.xml
index 0b4057aaef95..cab02774a1e1 100644
--- a/AnkiDroid/src/main/res/values-de/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-de/10-preferences.xml
@@ -97,7 +97,7 @@
     <string name="gestures_summ">Weise Aktionen, wie zum Beispiel Beantworten oder Bearbeiten der Karten, Gesten zu.</string>
     <string name="gestures_corner_touch" maxLength="41">9-Punkt-Berührung</string>
     <string name="gestures_corner_touch_summary">Berührungsgesten in Bildschirmecken erlauben</string>
-    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Tastenkürzel anzeigen</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Vollbild-Navigationsleiste</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Navigationsleiste öffnen, wenn rechts von überall auf dem Bildschirm gewischt wird</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Keine</string>
@@ -366,8 +366,8 @@
     <string name="ignore_display_cutout" maxLength="41">Bildschirmausschnitt ignorieren</string>
     <string name="hide_answer_buttons" maxLength="41">Antwortschaltflächen ausblenden</string>
     <string name="hide_hard_and_easy" maxLength="41">‘Schwer’- und ‘Leicht’-Tasten ausblenden</string>
-    <string name="reviewer_frame_style" maxLength="41">Frame style</string>
-    <string name="reviewer_frame_style_card" maxLength="41" comment="Style name of the \'Card\' card frame of the Reviewer">Card</string>
+    <string name="reviewer_frame_style" maxLength="41">Rahmenstil</string>
+    <string name="reviewer_frame_style_card" maxLength="41" comment="Style name of the \'Card\' card frame of the Reviewer">Karte</string>
     <string name="reviewer_frame_style_box" maxLength="41" comment="Style name of the \'Box\' card frame of the Reviewer">Box</string>
     <!--Keyboard shortcuts dialog-->
     <string name="open_settings" comment="Description of the shortcut that opens the app settings">Einstellungen öffnen</string>
diff --git a/AnkiDroid/src/main/res/values-es-rES/01-core.xml b/AnkiDroid/src/main/res/values-es-rES/01-core.xml
index 9b184b6e9d0d..e861c541f71b 100644
--- a/AnkiDroid/src/main/res/values-es-rES/01-core.xml
+++ b/AnkiDroid/src/main/res/values-es-rES/01-core.xml
@@ -69,7 +69,7 @@
         <item quantity="other">%1$d días %2$dh restantes</item>
     </plurals>
     <string name="no_cards_placeholder_title">La colección está vacía</string>
-    <string name="no_cards_placeholder_description">Empieza añadiendo tarjetas usando el ícono +</string>
+    <string name="no_cards_placeholder_description">Empieza a añadir tarjetas\nusando el ícono +</string>
     <!-- The deck picker via AnkiStatsTaskHandler.java -->
     <!-- flashcard_portrait.xml -->
     <string name="type_answer_hint">Escribir respuesta</string>
diff --git a/AnkiDroid/src/main/res/values-or/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-or/07-cardbrowser.xml
index cadf4f8699e4..2776b0e4f55f 100644
--- a/AnkiDroid/src/main/res/values-or/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-or/07-cardbrowser.xml
@@ -70,11 +70,11 @@
     <string name="card_browser_list_my_searches_new_name">ସାମ୍ପ୍ରତିକ ସନ୍ଧାନ ପାଇଁ ନାମ </string>
     <string name="card_browser_list_my_searches_new_search_error_empty_name">ଆପଣ ନାମ ବିନା ସନ୍ଧାନ ସଞ୍ଚୟ କରିପାରିବେ ନାହିଁ</string>
     <string name="card_browser_list_my_searches_new_search_error_dup">ନାଁଟି ଵିଦ୍ୟମାନ ଅଛି</string>
-    <string name="no_note_to_edit">No note to edit</string>
+    <string name="no_note_to_edit">ସମ୍ପାଦନ କରିବାକୁ କୌଣସି ନୋଟ୍ ନାହିଁ</string>
     <string name="card_browser_list_my_searches_remove_content">“%1$s” ଵିଲୋପ କରିବେ ତ?</string>
     <string name="card_browser_change_display_order" maxLength="28">ପ୍ରଦର୍ଶନ କ୍ରମ ପରିବର୍ତ୍ତନ କରନ୍ତୁ</string>
     <string name="card_browser_search_hint" comment="Message displayed in the search text field in the card browser.">ସନ୍ଧାନ</string>
-    <string name="card_browser_cram_search" maxLength="28" comment="Menu entry to start a search.">Search</string>
+    <string name="card_browser_cram_search" maxLength="28" comment="Menu entry to start a search.">ସନ୍ଧାନ</string>
     <string name="card_browser_change_display_order_title">ପ୍ରଦର୍ଶନ କ୍ରମ ପରିବର୍ତ୍ତନ କରନ୍ତୁ</string>
     <string name="card_details_tags">ଟ୍ୟାଗ୍ </string>
     <string-array name="card_browser_order_labels">
@@ -114,8 +114,8 @@
     <!-- Manage columns dialog -->
     <string name="browse_manage_columns_main_heading">Columns</string>
     <string name="browse_manage_columns">Manage columns</string>
-    <string name="user_active_columns">Active</string>
-    <string name="user_potential_columns">Available</string>
+    <string name="user_active_columns">ସକ୍ରିୟ</string>
+    <string name="user_potential_columns">ଉପଲବ୍ଧ</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-or/08-widget.xml b/AnkiDroid/src/main/res/values-or/08-widget.xml
index aafa618fb3d2..339d82ddab41 100644
--- a/AnkiDroid/src/main/res/values-or/08-widget.xml
+++ b/AnkiDroid/src/main/res/values-or/08-widget.xml
@@ -61,7 +61,7 @@
     </plurals>
     <string name="widget_add_note_button">ନୂଆ Ankidroid ନୋଟ୍ ଯୋଡ଼ନ୍ତୁ</string>
     <string name="deck_picker_widget_description" comment="Title of the Deck Picker Widget. Displayed to the user in Android\'s Widget Selection menu">Deck Picker</string>
-    <string name="card_analysis_extra_widget_description">Card Analysis</string>
+    <string name="card_analysis_extra_widget_description">ପତ୍ର ବିଶ୍ଳେଷଣ</string>
     <!-- Strings to explain usage in Deck Picker and Card Analysis Widget Configuration screen -->
     <string name="select_decks_title" comment="Title for Deck Selection Dialog">Select decks</string>
     <string name="select_deck_title" comment="Title for Deck Selection Dialog">Select a deck</string>
diff --git a/AnkiDroid/src/main/res/values-or/10-preferences.xml b/AnkiDroid/src/main/res/values-or/10-preferences.xml
index 70d0f1da84ef..72dead1bf6e2 100644
--- a/AnkiDroid/src/main/res/values-or/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-or/10-preferences.xml
@@ -368,8 +368,8 @@
     <string name="hide_answer_buttons" maxLength="41">ଉତ୍ତର ବଟନ୍ ଲୁଚାଇବା</string>
     <string name="hide_hard_and_easy" maxLength="41">‘କଠିନ’ ଏବଂ ‘ସହଜ’ ଉତ୍ତର ବଟନ୍ ଲୁଚାଇବା</string>
     <string name="reviewer_frame_style" maxLength="41">Frame style</string>
-    <string name="reviewer_frame_style_card" maxLength="41" comment="Style name of the \'Card\' card frame of the Reviewer">Card</string>
-    <string name="reviewer_frame_style_box" maxLength="41" comment="Style name of the \'Box\' card frame of the Reviewer">Box</string>
+    <string name="reviewer_frame_style_card" maxLength="41" comment="Style name of the \'Card\' card frame of the Reviewer">ପତ୍ର</string>
+    <string name="reviewer_frame_style_box" maxLength="41" comment="Style name of the \'Box\' card frame of the Reviewer">ବାକ୍ସ</string>
     <!--Keyboard shortcuts dialog-->
     <string name="open_settings" comment="Description of the shortcut that opens the app settings">Open settings</string>
 </resources>

From 15b5983be99df65267a446c80788778a00223c23 Mon Sep 17 00:00:00 2001
From: lukstbit <52494258+lukstbit@users.noreply.github.com>
Date: Mon, 27 Jan 2025 21:23:42 +0200
Subject: [PATCH 094/200] Fix RustCleanup for Collection.findReplace()

Note: I also changed the parameters names to match upstream as I
think they are more expressive. The matchCase also follows upstream's
default value, I think it's the job of the ui/tests to properly call the method.

See: https://github.com/ankitects/anki/blob/64ca90934bc26ddf7125913abc9dd9de8cb30c2b/pylib/anki/collection.py#L715
---
 .../src/main/java/com/ichi2/libanki/Collection.kt  | 14 ++++++++------
 .../src/test/java/com/ichi2/libanki/FinderTest.kt  | 10 +++++-----
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/Collection.kt b/AnkiDroid/src/main/java/com/ichi2/libanki/Collection.kt
index 3615815e0af9..e1eef0410c4a 100644
--- a/AnkiDroid/src/main/java/com/ichi2/libanki/Collection.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/libanki/Collection.kt
@@ -53,7 +53,6 @@ import com.ichi2.libanki.utils.NotInLibAnki
 import com.ichi2.libanki.utils.TimeManager
 import com.ichi2.utils.KotlinCleanup
 import net.ankiweb.rsdroid.Backend
-import net.ankiweb.rsdroid.RustCleanup
 import net.ankiweb.rsdroid.exceptions.BackendInvalidInputException
 import timber.log.Timber
 import java.io.File
@@ -396,16 +395,19 @@ class Collection(
         return noteIDsList
     }
 
+    /**
+     * @return An [OpChangesWithCount] representing the number of affected notes
+     */
     @LibAnkiAlias("find_and_replace")
-    @RustCleanup("Calling code should handle returned OpChanges")
+    @CheckResult
     fun findReplace(
         nids: List<Long>,
-        src: String,
-        dst: String,
+        search: String,
+        replacement: String,
         regex: Boolean = false,
         field: String? = null,
-        fold: Boolean = true,
-    ): Int = backend.findAndReplace(nids, src, dst, regex, !fold, field ?: "").count
+        matchCase: Boolean = false,
+    ): OpChangesWithCount = backend.findAndReplace(nids, search, replacement, regex, matchCase, field ?: "")
 
     // Browser Table
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/libanki/FinderTest.kt b/AnkiDroid/src/test/java/com/ichi2/libanki/FinderTest.kt
index 2d7d3a56cc00..3e31b7a02706 100644
--- a/AnkiDroid/src/test/java/com/ichi2/libanki/FinderTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/libanki/FinderTest.kt
@@ -420,24 +420,24 @@ class FinderTest : JvmTest() {
         col.addNote(note2)
         val nids = listOf(note.id, note2.id)
         // should do nothing
-        assertEquals(0, col.findReplace(nids, "abc", "123"))
+        assertEquals(0, col.findReplace(nids, "abc", "123").count)
         // global replace
-        assertEquals(2, col.findReplace(nids, "foo", "qux"))
+        assertEquals(2, col.findReplace(nids, "foo", "qux").count)
         note.load()
         assertEquals("qux", note.getItem("Front"))
         note2.load()
         assertEquals("qux", note2.getItem("Back"))
         // single field replace
-        assertEquals(1, col.findReplace(nids, "qux", "foo", field = "Front"))
+        assertEquals(1, col.findReplace(nids, "qux", "foo", field = "Front").count)
         note.load()
         assertEquals("foo", note.getItem("Front"))
         note2.load()
         assertEquals("qux", note2.getItem("Back"))
         // regex replace
-        assertEquals(0, col.findReplace(nids, "B.r", "reg"))
+        assertEquals(0, col.findReplace(nids, "B.r", "reg").count)
         note.load()
         assertNotEquals("reg", note.getItem("Back"))
-        assertEquals(1, col.findReplace(nids, "B.r", "reg", true))
+        assertEquals(1, col.findReplace(nids, "B.r", "reg", true).count)
         note.load()
         assertEquals(note.getItem("Back"), "reg")
     }

From 7af6e6034f96ce95e02cd211d71a1502f3945fc5 Mon Sep 17 00:00:00 2001
From: lukstbit <52494258+lukstbit@users.noreply.github.com>
Date: Mon, 27 Jan 2025 21:47:59 +0200
Subject: [PATCH 095/200] Add Tags.findAndReplace() and
 Collection.fieldNamesForNoteIds() upstream methods

These two methods are used for the find and replace browser functionality.
---
 .../main/java/com/ichi2/libanki/Collection.kt |  3 +++
 .../src/main/java/com/ichi2/libanki/Tags.kt   | 24 +++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/Collection.kt b/AnkiDroid/src/main/java/com/ichi2/libanki/Collection.kt
index e1eef0410c4a..5ec1219e3a36 100644
--- a/AnkiDroid/src/main/java/com/ichi2/libanki/Collection.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/libanki/Collection.kt
@@ -409,6 +409,9 @@ class Collection(
         matchCase: Boolean = false,
     ): OpChangesWithCount = backend.findAndReplace(nids, search, replacement, regex, matchCase, field ?: "")
 
+    @LibAnkiAlias("field_names_for_note_ids")
+    fun fieldNamesForNoteIds(nids: List<Long>): List<String> = backend.fieldNamesForNotes(nids)
+
     // Browser Table
 
     @LibAnkiAlias("all_browser_columns")
diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/Tags.kt b/AnkiDroid/src/main/java/com/ichi2/libanki/Tags.kt
index c5a4383a5049..8374b297cfe6 100644
--- a/AnkiDroid/src/main/java/com/ichi2/libanki/Tags.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/libanki/Tags.kt
@@ -17,8 +17,10 @@
  ****************************************************************************************/
 package com.ichi2.libanki
 
+import androidx.annotation.CheckResult
 import androidx.annotation.WorkerThread
 import anki.collection.OpChangesWithCount
+import com.ichi2.libanki.utils.LibAnkiAlias
 import com.ichi2.libanki.utils.join
 import java.util.AbstractSet
 
@@ -111,6 +113,28 @@ class Tags(
         tag: String,
         tags: Iterable<String>,
     ): Boolean = tags.map { it.lowercase() }.contains(tag.lowercase())
+
+    /**
+     * Replace occurrences of a search with a new value in tags.
+     * [https://github.com/ankitects/anki/blob/main/pylib/anki/tags.py#L73](https://github.com/ankitects/anki/blob/main/pylib/anki/tags.py#L73)
+     *
+     * @return An [OpChangesWithCount] representing the number of affected notes
+     */
+    @LibAnkiAlias("find_and_replace")
+    @CheckResult
+    fun findAndReplace(
+        noteIds: List<Long>,
+        search: String,
+        replacement: String,
+        regex: Boolean,
+        matchCase: Boolean,
+    ) = col.backend.findAndReplaceTag(
+        noteIds = noteIds,
+        search = search,
+        replacement = replacement,
+        regex = regex,
+        matchCase = matchCase,
+    )
 }
 
 fun Collection.completeTagRaw(input: ByteArray): ByteArray = backend.completeTagRaw(input)

From 46c03cf17b0e5d9aa3b194769f2c121f2db3d7b4 Mon Sep 17 00:00:00 2001
From: lukstbit <52494258+lukstbit@users.noreply.github.com>
Date: Wed, 29 Jan 2025 20:26:38 +0200
Subject: [PATCH 096/200] feat: Enable developer option for "Find and replace"
 browser dialog

Added as a developer option for now.

Provides a dialog that follows the desktop ui to allow the user to
bulk change their notes. Ui follows the desktop code:

- offers all options that desktop offers
- shows feedback when done with the count of notes changed
- the operation is undoable(from DeckPicker)

If enabled, this option will always(no selection/multi select mode) be present
in the menu.
---
 .../main/java/com/ichi2/anki/CardBrowser.kt   |  33 ++
 .../anki/browser/CardBrowserViewModel.kt      |  28 ++
 .../browser/FindAndReplaceDialogFragment.kt   | 228 ++++++++++++
 .../main/res/layout/fragment_find_replace.xml | 174 +++++++++
 AnkiDroid/src/main/res/menu/card_browser.xml  |   7 +-
 .../res/menu/card_browser_multiselect.xml     |   7 +-
 .../src/main/res/values/07-cardbrowser.xml    |   2 +
 AnkiDroid/src/main/res/values/constants.xml   |   1 +
 AnkiDroid/src/main/res/values/preferences.xml |   1 +
 .../src/main/res/values/sentence-case.xml     |   3 +
 .../main/res/xml/preferences_dev_options.xml  |   6 +-
 .../java/com/ichi2/anki/CardBrowserTest.kt    | 352 ++++++++++++++++++
 12 files changed, 839 insertions(+), 3 deletions(-)
 create mode 100644 AnkiDroid/src/main/java/com/ichi2/anki/browser/FindAndReplaceDialogFragment.kt
 create mode 100644 AnkiDroid/src/main/res/layout/fragment_find_replace.xml

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt b/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt
index a09b793278d5..ced412deccb5 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt
@@ -67,6 +67,7 @@ import com.ichi2.anki.browser.CardBrowserViewModel.SearchState.Initializing
 import com.ichi2.anki.browser.CardBrowserViewModel.SearchState.Searching
 import com.ichi2.anki.browser.CardOrNoteId
 import com.ichi2.anki.browser.ColumnHeading
+import com.ichi2.anki.browser.FindAndReplaceDialogFragment
 import com.ichi2.anki.browser.PreviewerIdsFile
 import com.ichi2.anki.browser.RepositionCardFragment
 import com.ichi2.anki.browser.RepositionCardFragment.Companion.REQUEST_REPOSITION_NEW_CARDS
@@ -74,6 +75,7 @@ import com.ichi2.anki.browser.RepositionCardsRequest.ContainsNonNewCardsError
 import com.ichi2.anki.browser.RepositionCardsRequest.RepositionData
 import com.ichi2.anki.browser.SaveSearchResult
 import com.ichi2.anki.browser.SharedPreferencesLastDeckIdRepository
+import com.ichi2.anki.browser.registerFindReplaceHandler
 import com.ichi2.anki.browser.toCardBrowserLaunchOptions
 import com.ichi2.anki.dialogs.BrowserOptionsDialog
 import com.ichi2.anki.dialogs.CardBrowserMySearchesDialog
@@ -99,6 +101,7 @@ import com.ichi2.anki.model.CardsOrNotes.CARDS
 import com.ichi2.anki.model.CardsOrNotes.NOTES
 import com.ichi2.anki.model.SortType
 import com.ichi2.anki.noteeditor.NoteEditorLauncher
+import com.ichi2.anki.preferences.sharedPrefs
 import com.ichi2.anki.previewer.PreviewerFragment
 import com.ichi2.anki.scheduling.ForgetCardsDialog
 import com.ichi2.anki.scheduling.SetDueDateDialog
@@ -456,6 +459,18 @@ open class CardBrowser :
                 shift = bundle.getBoolean(RepositionCardFragment.ARG_SHIFT),
             )
         }
+
+        registerFindReplaceHandler { result ->
+            launchCatchingTask {
+                withProgress {
+                    val count =
+                        withProgress {
+                            viewModel.findAndReplace(result)
+                        }.await()
+                    showSnackbar(TR.browsingNotesUpdated(count))
+                }
+            }
+        }
     }
 
     override fun setupBackPressedCallbacks() {
@@ -685,6 +700,11 @@ open class CardBrowser :
                 }
             }
             KeyEvent.KEYCODE_F -> {
+                if (event.isCtrlPressed && event.isAltPressed) {
+                    Timber.i("CTRL+ALT+F - Find and replace")
+                    showFindAndReplaceDialog()
+                    return true
+                }
                 if (event.isCtrlPressed) {
                     Timber.i("Ctrl+F - Find notes")
                     searchItem?.expandActionView()
@@ -967,6 +987,11 @@ open class CardBrowser :
         actionBarMenu?.findItem(R.id.action_reschedule_cards)?.title =
             TR.actionsSetDueDate().toSentenceCase(this, R.string.sentence_set_due_date)
 
+        val isFindReplaceEnabled = sharedPrefs().getBoolean(getString(R.string.pref_browser_find_replace), false)
+        menu.findItem(R.id.action_find_replace)?.apply {
+            isVisible = isFindReplaceEnabled
+            title = TR.browsingFindAndReplace().toSentenceCase(this@CardBrowser, R.string.sentence_find_and_replace)
+        }
         previewItem = menu.findItem(R.id.action_preview)
         onSelectionChanged()
         updatePreviewMenuItem()
@@ -1235,6 +1260,9 @@ open class CardBrowser :
             R.id.action_create_filtered_deck -> {
                 showCreateFilteredDeckDialog()
             }
+            R.id.action_find_replace -> {
+                showFindAndReplaceDialog()
+            }
         }
         return super.onOptionsItemSelected(item)
     }
@@ -1267,6 +1295,11 @@ open class CardBrowser :
         launchCatchingTask { viewModel.searchForMarkedNotes() }
     }
 
+    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    fun showFindAndReplaceDialog() {
+        FindAndReplaceDialogFragment().show(supportFragmentManager, FindAndReplaceDialogFragment.TAG)
+    }
+
     private fun changeDisplayOrder() {
         showDialogFragment(
             // TODO: move this into the ViewModel
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserViewModel.kt b/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserViewModel.kt
index f4a8064d1d41..a37c4bb68221 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserViewModel.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserViewModel.kt
@@ -37,6 +37,8 @@ import com.ichi2.anki.CrashReportService
 import com.ichi2.anki.DeckSpinnerSelection.Companion.ALL_DECKS_ID
 import com.ichi2.anki.Flag
 import com.ichi2.anki.PreviewerDestination
+import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.ALL_FIELDS_AS_FIELD
+import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.TAGS_AS_FIELD
 import com.ichi2.anki.browser.RepositionCardsRequest.RepositionData
 import com.ichi2.anki.export.ExportDialogFragment.ExportType
 import com.ichi2.anki.launchCatchingIO
@@ -1034,6 +1036,32 @@ class CardBrowserViewModel(
         )
     }
 
+    /**
+     * Replaces occurrences of search with the new value.
+     *
+     * @return the number of affected notes
+     * @see com.ichi2.libanki.Collection.findReplace
+     * @see com.ichi2.libanki.Tags.findAndReplace
+     */
+    fun findAndReplace(result: FindReplaceResult) =
+        viewModelScope.async {
+            // TODO pass the selection as the user saw it in the dialog to avoid running "find
+            //  and replace" on a different selection
+            val noteIds = if (result.onlyOnSelectedNotes) queryAllSelectedNoteIds() else emptyList()
+
+            if (result.field == TAGS_AS_FIELD) {
+                undoableOp {
+                    tags.findAndReplace(noteIds, result.search, result.replacement, result.regex, result.matchCase)
+                }.count
+            } else {
+                val field =
+                    if (result.field == ALL_FIELDS_AS_FIELD) null else result.field
+                undoableOp {
+                    findReplace(noteIds, result.search, result.replacement, result.regex, field, result.matchCase)
+                }.count
+            }
+        }
+
     companion object {
         fun factory(
             lastDeckIdRepository: LastDeckIdRepository,
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/browser/FindAndReplaceDialogFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/browser/FindAndReplaceDialogFragment.kt
new file mode 100644
index 000000000000..0c66c92ab586
--- /dev/null
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/browser/FindAndReplaceDialogFragment.kt
@@ -0,0 +1,228 @@
+/****************************************************************************************
+ * Copyright (c) 2025 lukstbit <52494258+lukstbit@users.noreply.github.com>             *
+ *                                                                                      *
+ * This program is free software; you can redistribute it and/or modify it under        *
+ * the terms of the GNU General Public License as published by the Free Software        *
+ * Foundation; either version 3 of the License, or (at your option) any later           *
+ * version.                                                                             *
+ *                                                                                      *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY      *
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A      *
+ * PARTICULAR PURPOSE. See the GNU General Public License for more details.             *
+ *                                                                                      *
+ * You should have received a copy of the GNU General Public License along with         *
+ * this program.  If not, see <http://www.gnu.org/licenses/>.                           *
+ ****************************************************************************************/
+
+package com.ichi2.anki.browser
+
+import android.app.Dialog
+import android.os.Bundle
+import android.view.View
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.CheckBox
+import android.widget.EditText
+import android.widget.Spinner
+import android.widget.TextView
+import androidx.annotation.VisibleForTesting
+import androidx.appcompat.app.AlertDialog
+import androidx.constraintlayout.widget.Group
+import androidx.core.os.bundleOf
+import androidx.core.text.HtmlCompat
+import androidx.core.view.isVisible
+import androidx.fragment.app.activityViewModels
+import androidx.fragment.app.setFragmentResult
+import androidx.lifecycle.lifecycleScope
+import com.ichi2.anki.CardBrowser
+import com.ichi2.anki.CollectionManager.TR
+import com.ichi2.anki.CollectionManager.withCol
+import com.ichi2.anki.R
+import com.ichi2.anki.analytics.AnalyticsDialogFragment
+import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.ARG_FIELD
+import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.ARG_MATCH_CASE
+import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.ARG_ONLY_SELECTED_NOTES
+import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.ARG_REGEX
+import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.ARG_REPLACEMENT
+import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.ARG_SEARCH
+import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.REQUEST_FIND_AND_REPLACE
+import com.ichi2.anki.notetype.ManageNotetypes
+import com.ichi2.anki.ui.internationalization.toSentenceCase
+import com.ichi2.anki.utils.openUrl
+import com.ichi2.utils.customView
+import com.ichi2.utils.negativeButton
+import com.ichi2.utils.neutralButton
+import com.ichi2.utils.positiveButton
+import com.ichi2.utils.show
+import com.ichi2.utils.title
+import kotlinx.coroutines.launch
+import timber.log.Timber
+
+/**
+ * Dialog that shows the options for finding and replacing the text of notes in [CardBrowser].
+ *
+ * Note for completeness:
+ *
+ * Desktop also shows the fields of a note in the browser and the user can right-click on one of
+ * them to start a find and replace only for that field. We display the fields only in
+ * [ManageNotetypes] which doesn't feel like it should have this feature.
+ * (see https://github.com/ankitects/anki/blob/64ca90934bc26ddf7125913abc9dd9de8cb30c2b/qt/aqt/browser/sidebar/tree.py#L1074)
+ */
+// TODO desktop offers history for inputs
+class FindAndReplaceDialogFragment : AnalyticsDialogFragment() {
+    private val browserViewModel by activityViewModels<CardBrowserViewModel>()
+    private val fieldSelector: Spinner?
+        get() = dialog?.findViewById(R.id.fields_selector)
+    private val onlySelectedNotes: CheckBox?
+        get() = dialog?.findViewById(R.id.check_only_selected_notes)
+    private val contentViewsGroup: Group?
+        get() = dialog?.findViewById(R.id.content_views_group)
+    private val loadingViewsGroup: Group?
+        get() = dialog?.findViewById(R.id.loading_views_group)
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val contentView = layoutInflater.inflate(R.layout.fragment_find_replace, null)
+        contentView.setupLabels()
+        val title =
+            TR
+                .browsingFindAndReplace()
+                .toSentenceCase(requireContext(), R.string.sentence_find_and_replace)
+        return AlertDialog
+            .Builder(requireContext())
+            .show {
+                title(text = title)
+                customView(contentView)
+                neutralButton(R.string.help) { openUrl(R.string.link_manual_browser_find_replace) }
+                negativeButton(R.string.dialog_cancel)
+                positiveButton(R.string.dialog_ok) { startFindReplace() }
+            }.also { dialog ->
+                dialog.positiveButton.isEnabled = false
+            }
+    }
+
+    private fun View.setupLabels() {
+        findViewById<TextView>(R.id.label_find).text =
+            HtmlCompat.fromHtml(TR.browsingFind(), HtmlCompat.FROM_HTML_MODE_LEGACY)
+        findViewById<TextView>(R.id.label_replace).text =
+            HtmlCompat.fromHtml(TR.browsingReplaceWith(), HtmlCompat.FROM_HTML_MODE_LEGACY)
+        findViewById<TextView>(R.id.label_in).text =
+            HtmlCompat.fromHtml(TR.browsingIn(), HtmlCompat.FROM_HTML_MODE_LEGACY)
+        findViewById<CheckBox>(R.id.check_only_selected_notes).text = TR.browsingSelectedNotesOnly()
+        findViewById<CheckBox>(R.id.check_ignore_case).text = TR.browsingIgnoreCase()
+        findViewById<CheckBox>(R.id.check_input_as_regex).text =
+            TR.browsingTreatInputAsRegularExpression()
+    }
+
+    override fun onStart() {
+        super.onStart()
+        lifecycleScope.launch {
+            (dialog as? AlertDialog)?.positiveButton?.isEnabled = false
+            contentViewsGroup?.isVisible = false
+            loadingViewsGroup?.isVisible = true
+            val noteIds = browserViewModel.queryAllSelectedNoteIds()
+            onlySelectedNotes?.isChecked = noteIds.isNotEmpty()
+            onlySelectedNotes?.isEnabled = noteIds.isNotEmpty()
+            val fieldsNames =
+                buildList {
+                    add(
+                        TR.browsingAllFields().toSentenceCase(
+                            this@FindAndReplaceDialogFragment,
+                            R.string.sentence_all_fields,
+                        ),
+                    )
+                    add(TR.editingTags())
+                    addAll(withCol { fieldNamesForNoteIds(noteIds) })
+                }
+            fieldSelector?.adapter =
+                ArrayAdapter(
+                    requireActivity(),
+                    android.R.layout.simple_spinner_item,
+                    fieldsNames,
+                ).also { it.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) }
+            loadingViewsGroup?.isVisible = false
+            contentViewsGroup?.isVisible = true
+            (dialog as? AlertDialog)?.positiveButton?.isEnabled = true
+        }
+    }
+
+    // https://github.com/ankitects/anki/blob/64ca90934bc26ddf7125913abc9dd9de8cb30c2b/qt/aqt/browser/find_and_replace.py#L118
+    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    fun startFindReplace() {
+        val search = dialog?.findViewById<EditText>(R.id.input_search)?.text
+        val replacement = dialog?.findViewById<EditText>(R.id.input_replace)?.text
+        if (search.isNullOrEmpty() || replacement == null) return
+        val onlyInSelectedNotes = onlySelectedNotes?.isChecked ?: true
+        val ignoreCase =
+            dialog?.findViewById<CheckBox>(R.id.check_ignore_case)?.isChecked ?: true
+        val inputAsRegex =
+            dialog?.findViewById<CheckBox>(R.id.check_input_as_regex)?.isChecked ?: false
+        val selectedField =
+            when (fieldSelector?.selectedItemPosition ?: AdapterView.INVALID_POSITION) {
+                AdapterView.INVALID_POSITION -> return
+                0 -> ALL_FIELDS_AS_FIELD
+                1 -> TAGS_AS_FIELD
+                else -> fieldSelector?.selectedItem as? String ?: return
+            }
+        Timber.i("Sending request to find and replace...")
+        setFragmentResult(
+            REQUEST_FIND_AND_REPLACE,
+            bundleOf(
+                ARG_SEARCH to search.toString(),
+                ARG_REPLACEMENT to replacement.toString(),
+                ARG_FIELD to selectedField,
+                ARG_ONLY_SELECTED_NOTES to onlyInSelectedNotes,
+                // "Ignore case" checkbox text => when it's checked we pass false to the backend
+                ARG_MATCH_CASE to !ignoreCase,
+                ARG_REGEX to inputAsRegex,
+            ),
+        )
+    }
+
+    companion object {
+        const val TAG = "FindAndReplaceDialogFragment"
+        const val REQUEST_FIND_AND_REPLACE = "request_find_and_replace"
+        const val ARG_SEARCH = "arg_search"
+        const val ARG_REPLACEMENT = "arg_replacement"
+        const val ARG_FIELD = "arg_field"
+        const val ARG_ONLY_SELECTED_NOTES = "arg_only_selected_notes"
+        const val ARG_MATCH_CASE = "arg_match_case"
+        const val ARG_REGEX = "arg_regex"
+
+        /**
+         * Receiving this value in the result [Bundle] for the [ARG_FIELD] entry means that
+         * the user selected "All fields" as the field target for the find and replace action.
+         */
+        const val ALL_FIELDS_AS_FIELD = "find_and_replace_dialog_fragment_all_fields_as_field"
+
+        /**
+         * Receiving this value in the result [Bundle] for the [ARG_FIELD] entry means that
+         * the user selected "Tags" as the field target for the find and replace action.
+         */
+        const val TAGS_AS_FIELD = "find_and_replace_dialog_fragment_tags_as_field"
+    }
+}
+
+fun CardBrowser.registerFindReplaceHandler(action: (FindReplaceResult) -> Unit) {
+    supportFragmentManager.setFragmentResultListener(REQUEST_FIND_AND_REPLACE, this) { _, bundle ->
+        action(
+            FindReplaceResult(
+                search = bundle.getString(ARG_SEARCH) ?: error("Missing required argument: search"),
+                replacement =
+                    bundle.getString(ARG_REPLACEMENT) ?: error("Missing required argument: replacement"),
+                field = bundle.getString(ARG_FIELD) ?: error("Missing required argument: field"),
+                bundle.getBoolean(ARG_ONLY_SELECTED_NOTES, true),
+                bundle.getBoolean(ARG_MATCH_CASE, false),
+                bundle.getBoolean(ARG_REGEX, false),
+            ),
+        )
+    }
+}
+
+data class FindReplaceResult(
+    val search: String,
+    val replacement: String,
+    val field: String,
+    val onlyOnSelectedNotes: Boolean,
+    val matchCase: Boolean,
+    val regex: Boolean,
+)
diff --git a/AnkiDroid/src/main/res/layout/fragment_find_replace.xml b/AnkiDroid/src/main/res/layout/fragment_find_replace.xml
new file mode 100644
index 000000000000..463561fdf26d
--- /dev/null
+++ b/AnkiDroid/src/main/res/layout/fragment_find_replace.xml
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2025 lukstbit <52494258+lukstbit@users.noreply.github.com>
+  ~
+  ~  This program is free software; you can redistribute it and/or modify it under
+  ~  the terms of the GNU General Public License as published by the Free Software
+  ~  Foundation; either version 3 of the License, or (at your option) any later
+  ~  version.
+  ~
+  ~  This program is distributed in the hope that it will be useful, but WITHOUT ANY
+  ~  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+  ~  PARTICULAR PURPOSE. See the GNU General Public License for more details.
+  ~
+  ~  You should have received a copy of the GNU General Public License along with
+  ~  this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="16dp">
+        <TextView
+            android:id="@+id/label_find"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginHorizontal="8dp"
+            tools:text="Find:"/>
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/input_search_layout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:inputType="text"
+            android:layout_marginHorizontal="8dp"
+            app:layout_constraintWidth_max="480dp"
+            app:layout_constraintHeight_min="48dp"
+            app:layout_constraintTop_toBottomOf="@id/label_find"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/input_search"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inputType="text" />
+        </com.google.android.material.textfield.TextInputLayout>
+        <TextView
+            android:id="@+id/label_replace"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginHorizontal="8dp"
+            app:layout_constraintTop_toBottomOf="@id/input_search_layout"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            tools:text="Replace with:"/>
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/input_replace_layout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:inputType="text"
+            android:layout_marginHorizontal="8dp"
+            app:layout_constraintWidth_max="480dp"
+            app:layout_constraintHeight_min="48dp"
+            app:layout_constraintTop_toBottomOf="@id/label_replace"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/input_replace"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inputType="text" />
+        </com.google.android.material.textfield.TextInputLayout>
+        <TextView
+            android:id="@+id/label_in"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginHorizontal="8dp"
+            app:layout_constraintTop_toBottomOf="@id/input_replace_layout"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            tools:text="In:"/>
+        <Spinner
+            android:id="@+id/fields_selector"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:enabled="false"
+            android:layout_marginTop="4dp"
+            android:layout_marginHorizontal="4dp"
+            android:minHeight="48dp"
+            app:layout_constraintTop_toBottomOf="@id/label_in"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+        <CheckBox
+            android:id="@+id/check_only_selected_notes"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginStart="2dp"
+            android:checked="true"
+            app:layout_constraintTop_toBottomOf="@id/fields_selector"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            tools:text="Selected notes only"/>
+        <CheckBox
+            android:id="@+id/check_ignore_case"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checked="true"
+            android:layout_marginStart="2dp"
+            app:layout_constraintTop_toBottomOf="@id/check_only_selected_notes"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            tools:text="Ignore case"/>
+        <CheckBox
+            android:id="@+id/check_input_as_regex"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="2dp"
+            app:layout_constraintTop_toBottomOf="@id/check_ignore_case"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            tools:text="Treat input as regular extension"/>
+
+        <androidx.constraintlayout.widget.Group
+            android:visibility="gone"
+            android:id="@+id/content_views_group"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:constraint_referenced_ids="label_find,input_search,label_replace,input_replace,label_in,fields_selector,check_only_selected_notes,check_ignore_case,check_input_as_regex"
+            tools:visibility="visible"/>
+
+        <com.google.android.material.progressindicator.CircularProgressIndicator
+            android:id="@+id/loading_indicator"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:indeterminate="true"
+            style="@style/Widget.Material3.CircularProgressIndicator"
+            app:layout_constraintTop_toTopOf="@id/loading_label"
+            app:layout_constraintBottom_toBottomOf="@id/loading_label"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/loading_label"
+            app:layout_constraintHorizontal_chainStyle="packed"/>
+
+        <TextView
+            android:id="@+id/loading_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_marginVertical="24dp"
+            android:layout_marginStart="12dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/loading_indicator"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:text="@string/browser_find_replace_loading_fields"/>
+
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/loading_views_group"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:constraint_referenced_ids="loading_indicator,loading_label"
+            />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>
diff --git a/AnkiDroid/src/main/res/menu/card_browser.xml b/AnkiDroid/src/main/res/menu/card_browser.xml
index ecf2bd1e653b..5cdea18010cc 100644
--- a/AnkiDroid/src/main/res/menu/card_browser.xml
+++ b/AnkiDroid/src/main/res/menu/card_browser.xml
@@ -1,6 +1,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:ankidroid="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/action_add_note_from_card_browser"
@@ -69,4 +70,8 @@
         tools:title="Create filtered deck..."
         />
 
+    <item
+        android:id="@+id/action_find_replace"
+        android:visible="false"
+        app:showAsAction="never"/>
 </menu>
\ No newline at end of file
diff --git a/AnkiDroid/src/main/res/menu/card_browser_multiselect.xml b/AnkiDroid/src/main/res/menu/card_browser_multiselect.xml
index 7d7248a6575d..c222d71c2416 100644
--- a/AnkiDroid/src/main/res/menu/card_browser_multiselect.xml
+++ b/AnkiDroid/src/main/res/menu/card_browser_multiselect.xml
@@ -1,6 +1,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:ankidroid="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         ankidroid:showAsAction="never"
@@ -96,4 +97,8 @@
         ankidroid:actionProviderClass="com.ichi2.ui.RtlCompliantActionProvider"
         android:icon="@drawable/ic_undo_white"/>
 
+    <item
+        android:id="@+id/action_find_replace"
+        android:visible="false"
+        app:showAsAction="never"/>
 </menu>
diff --git a/AnkiDroid/src/main/res/values/07-cardbrowser.xml b/AnkiDroid/src/main/res/values/07-cardbrowser.xml
index 92645405e696..ac1b99e6e1d5 100644
--- a/AnkiDroid/src/main/res/values/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values/07-cardbrowser.xml
@@ -97,4 +97,6 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
\ No newline at end of file
diff --git a/AnkiDroid/src/main/res/values/constants.xml b/AnkiDroid/src/main/res/values/constants.xml
index 1f707653228c..7c3d8bc94f29 100644
--- a/AnkiDroid/src/main/res/values/constants.xml
+++ b/AnkiDroid/src/main/res/values/constants.xml
@@ -124,6 +124,7 @@
     <string name="link_help_ar">https://docs.ankidroid.org/help-ar.html</string>
     <string name="link_manual_ar">https://docs.ankidroid.org/manual-ar.html</string>
     <string name="link_manual_note_format_toolbar">https://docs.ankidroid.org/manual.html#noteFormattingToolbar</string>
+    <string name="link_manual_browser_find_replace">https://docs.ankiweb.net/browsing.html#find-and-replace</string>
     <string name="link_user_actions_help">https://docs.ankidroid.org/#userActions</string>
     <string name="link_faq_tts">https://github.com/ankidroid/Anki-Android/wiki/FAQ#tts--text-to-speech-is-not-speaking</string>
     <string name="link_faq_missing_media" tools:ignore="Typos">https://github.com/ankidroid/Anki-Android/wiki/FAQ#why-doesnt-my-sound-or-image-work-on-ankidroid</string>
diff --git a/AnkiDroid/src/main/res/values/preferences.xml b/AnkiDroid/src/main/res/values/preferences.xml
index a818352e19fa..ce5617cc213a 100644
--- a/AnkiDroid/src/main/res/values/preferences.xml
+++ b/AnkiDroid/src/main/res/values/preferences.xml
@@ -182,6 +182,7 @@
     <string name="new_congrats_screen_pref_key">new_congrats_screen</string>
     <string name="new_reviewer_pref_key">newReviewer</string>
     <string name="new_reviewer_options_key">newReviewerOptions</string>
+    <string name="pref_browser_find_replace">browserFindReplace</string>
     <string name="dev_options_enabled_by_user_key">devOptionsEnabledByUser</string>
     <string name="pref_cat_wip_key">workInProgressDevOptions</string>
     <!-- Developer options > Create fake media -->
diff --git a/AnkiDroid/src/main/res/values/sentence-case.xml b/AnkiDroid/src/main/res/values/sentence-case.xml
index e739a67cbff3..8eb2eb3b58e9 100644
--- a/AnkiDroid/src/main/res/values/sentence-case.xml
+++ b/AnkiDroid/src/main/res/values/sentence-case.xml
@@ -44,4 +44,7 @@ undoActionUndone()
     <string name="sentence_empty_cards">Empty cards</string>
     <string name="tag_missing">Tag missing</string>
     <string name="sentence_reposition_new_cards">Reposition new cards</string>
+    <string name="sentence_find_and_replace">Find and replace</string>
+    <string name="sentence_all_fields">All fields</string>
+
 </resources>
\ No newline at end of file
diff --git a/AnkiDroid/src/main/res/xml/preferences_dev_options.xml b/AnkiDroid/src/main/res/xml/preferences_dev_options.xml
index 875d49c1f512..a63f8f35099c 100644
--- a/AnkiDroid/src/main/res/xml/preferences_dev_options.xml
+++ b/AnkiDroid/src/main/res/xml/preferences_dev_options.xml
@@ -89,6 +89,10 @@
             android:key="@string/new_reviewer_options_key"
             android:dependency="@string/new_reviewer_pref_key"
             android:fragment="com.ichi2.anki.preferences.ReviewerOptionsFragment"/>
-
+        <SwitchPreferenceCompat
+            android:title="Find and replace in browser"
+            android:summary="Caution, this can be very destructive for your collection!"
+            android:key="@string/pref_browser_find_replace"
+            android:defaultValue="false"/>
     </com.ichi2.anki.preferences.ExtendedPreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt
index 5bcbcbe4cca0..7a9e2dd65177 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt
@@ -19,15 +19,35 @@ import android.annotation.SuppressLint
 import android.content.Intent
 import android.os.Bundle
 import android.text.TextUtils
+import android.widget.Spinner
+import android.widget.SpinnerAdapter
 import android.widget.TextView
 import androidx.core.app.ActivityCompat
 import androidx.core.content.edit
 import androidx.core.os.bundleOf
 import androidx.core.view.children
+import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
+import androidx.test.espresso.Espresso.onData
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.scrollCompletelyTo
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.RootMatchers.isDialog
+import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.espresso.matcher.ViewMatchers.isChecked
+import androidx.test.espresso.matcher.ViewMatchers.isNotChecked
+import androidx.test.espresso.matcher.ViewMatchers.isNotEnabled
+import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withSpinnerText
+import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import anki.search.BrowserRow
 import anki.search.BrowserRow.Color
+import com.ichi2.anki.CollectionManager.TR
+import com.ichi2.anki.CollectionManager.withCol
 import com.ichi2.anki.IntentHandler.Companion.grantedStoragePermissions
 import com.ichi2.anki.RobolectricTest.Companion.waitForAsyncTasksToComplete
 import com.ichi2.anki.browser.BrowserMultiColumnAdapter
@@ -40,6 +60,16 @@ import com.ichi2.anki.browser.CardBrowserColumn.TAGS
 import com.ichi2.anki.browser.CardBrowserViewModel
 import com.ichi2.anki.browser.CardBrowserViewModelTest
 import com.ichi2.anki.browser.CardOrNoteId
+import com.ichi2.anki.browser.FindAndReplaceDialogFragment
+import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.ALL_FIELDS_AS_FIELD
+import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.ARG_FIELD
+import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.ARG_MATCH_CASE
+import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.ARG_ONLY_SELECTED_NOTES
+import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.ARG_REGEX
+import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.ARG_REPLACEMENT
+import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.ARG_SEARCH
+import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.REQUEST_FIND_AND_REPLACE
+import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.TAGS_AS_FIELD
 import com.ichi2.anki.browser.column1
 import com.ichi2.anki.browser.setColumn
 import com.ichi2.anki.common.utils.isRunningAsUnitTest
@@ -51,6 +81,7 @@ import com.ichi2.anki.scheduling.ForgetCardsDialog
 import com.ichi2.anki.servicelayer.PreferenceUpgradeService
 import com.ichi2.anki.servicelayer.PreferenceUpgradeService.PreferenceUpgrade.UpgradeBrowserColumns.Companion.LEGACY_COLUMN1_KEYS
 import com.ichi2.anki.servicelayer.PreferenceUpgradeService.PreferenceUpgrade.UpgradeBrowserColumns.Companion.LEGACY_COLUMN2_KEYS
+import com.ichi2.anki.ui.internationalization.toSentenceCase
 import com.ichi2.anki.utils.ext.getCurrentDialogFragment
 import com.ichi2.anki.utils.ext.showDialogFragment
 import com.ichi2.libanki.BrowserConfig
@@ -72,6 +103,10 @@ import io.mockk.mockkStatic
 import io.mockk.unmockkObject
 import io.mockk.unmockkStatic
 import kotlinx.coroutines.runBlocking
+import org.hamcrest.CoreMatchers.allOf
+import org.hamcrest.CoreMatchers.containsString
+import org.hamcrest.CoreMatchers.instanceOf
+import org.hamcrest.CoreMatchers.`is`
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
 import org.hamcrest.Matchers.greaterThan
@@ -1234,6 +1269,323 @@ class CardBrowserTest : RobolectricTest() {
         }
     }
 
+    @Test
+    fun `FindReplace - dialog has expected ui at start`() {
+        withBrowser {
+            showFindAndReplaceDialog()
+            // nothing selected so checkbox 'Only selected notes' is not available
+            onView(withId(R.id.check_only_selected_notes)).inRoot(isDialog()).check(matches(isNotEnabled()))
+            onView(withId(R.id.check_only_selected_notes)).inRoot(isDialog()).check(matches(isNotChecked()))
+            val fieldSelectorAdapter = getFindReplaceFieldsAdapter()
+            onView(withId(R.id.check_ignore_case)).inRoot(isDialog()).check(matches(isChecked()))
+            onView(withId(R.id.check_input_as_regex)).inRoot(isDialog()).check(matches(isNotChecked()))
+            // as nothing is selected the fields selector has only the two default options
+            assertNotNull(fieldSelectorAdapter, "Fields adapter was not set")
+            assertEquals(2, fieldSelectorAdapter.count)
+            assertEquals(
+                TR.browsingAllFields().toSentenceCase(targetContext, R.string.sentence_all_fields),
+                fieldSelectorAdapter.getItem(0),
+            )
+            assertEquals(TR.editingTags(), fieldSelectorAdapter.getItem(1))
+        }
+    }
+
+    @Test
+    fun `FindReplace - shows expected fields target based on browser selection`() {
+        fun SpinnerAdapter.getAdapterData(): List<String> =
+            mutableListOf<String>().apply {
+                for (position in 0 until count) {
+                    add(getItem(position) as String)
+                }
+            }
+
+        createFindReplaceTestNote("A", "Car", "Lion")
+        createFindReplaceTestNote("B", "Train", "Chicken")
+        withBrowser {
+            assertEquals(2, viewModel.rowCount)
+            viewModel.selectRowAtPosition(1)
+            openFindAndReplace()
+            var fieldSelectorAdapter = getFindReplaceFieldsAdapter()
+            // 2 default field options + 2 fields from the one note selected
+            assertEquals(4, fieldSelectorAdapter.count)
+            val defaultFields =
+                listOf(
+                    TR.browsingAllFields().toSentenceCase(targetContext, R.string.sentence_all_fields),
+                    TR.editingTags(),
+                )
+            assertEquals(defaultFields + listOf("Bfield0", "Bfield1"), fieldSelectorAdapter.getAdapterData())
+            closeFindAndReplace()
+            viewModel.selectAll() // 2 notes above
+            openFindAndReplace()
+            fieldSelectorAdapter = getFindReplaceFieldsAdapter()
+            // 2 default field options + 4 from the two notes
+            assertEquals(6, fieldSelectorAdapter.count)
+            assertEquals(defaultFields + listOf("Afield0", "Afield1", "Bfield0", "Bfield1"), fieldSelectorAdapter.getAdapterData())
+            closeFindAndReplace()
+            viewModel.selectNone() // 2 notes above
+            openFindAndReplace()
+            fieldSelectorAdapter = getFindReplaceFieldsAdapter()
+            // selection is reset just 2 default field options
+            assertEquals(2, fieldSelectorAdapter.count)
+            assertEquals(defaultFields, fieldSelectorAdapter.getAdapterData())
+            closeFindAndReplace()
+        }
+    }
+
+    @Test
+    fun `FindReplace - dialog handles correctly match case checkbox set to true`() {
+        val note0 = createFindReplaceTestNote("A", "kchicKen", "kilogram")
+        val note1 = createFindReplaceTestNote("A", "keK", "kontra")
+        withBrowser {
+            assertEquals(2, viewModel.rowCount)
+            viewModel.selectRowAtPosition(0)
+            // by default 'match case' is set to false
+            openFindAndReplace()
+            onView(withId(R.id.input_search)).inRoot(isDialog()).perform(ViewActions.typeText("k"))
+            onView(withId(R.id.input_replace)).inRoot(isDialog()).perform(ViewActions.typeText("X"))
+            onView(withId(R.id.check_input_as_regex)).inRoot(isDialog()).perform(scrollCompletelyTo())
+            onData(allOf(`is`(instanceOf(String::class.java)), `is`("Afield0")))
+                .inAdapterView(withId(R.id.fields_selector))
+                .perform(click())
+            onView(withId(R.id.fields_selector)).check(matches(withSpinnerText(containsString("Afield0"))))
+            onView(withId(R.id.check_ignore_case)).inRoot(isDialog()).check(matches(isChecked()))
+            // although the positive button exists, clicking it with Espresso doesn't work
+            //     onView(withId(android.R.id.button1)).inRoot(isDialog()).perform(click())
+            // so simulate clicking the positive button by running the associated method directly
+            (supportFragmentManager.findFragmentByTag(FindAndReplaceDialogFragment.TAG) as FindAndReplaceDialogFragment)
+                .startFindReplace()
+            // clicking the positive button would have also closed the dialog
+            closeFindAndReplace()
+            val colNote0 = withCol { getNote(note0.id) }
+            val colNote1 = withCol { getNote(note1.id) }
+            assertEquals("keK", colNote1.fields[0])
+            assertEquals("kontra", colNote1.fields[1])
+            // didn't modify field 1
+            assertEquals("kilogram", colNote0.fields[1])
+            // replaces both occurrences ignoring case
+            assertEquals("XchicXen", colNote0.fields[0])
+        }
+    }
+
+    @Test
+    fun `FindReplace - dialog handles correctly match case checkbox set to false`() {
+        val note0 = createFindReplaceTestNote("A", "kchicKen", "kilogram")
+        val note1 = createFindReplaceTestNote("A", "keK", "kontra")
+        withBrowser {
+            assertEquals(2, viewModel.rowCount)
+            viewModel.selectRowAtPosition(1)
+            openFindAndReplace()
+            onView(withId(R.id.input_search)).inRoot(isDialog()).perform(ViewActions.typeText("k"))
+            onView(withId(R.id.input_replace)).inRoot(isDialog()).perform(ViewActions.typeText("X"))
+            onView(withId(R.id.check_input_as_regex)).inRoot(isDialog()).perform(scrollCompletelyTo())
+            onData(allOf(`is`(instanceOf(String::class.java)), `is`("Afield0")))
+                .inAdapterView(withId(R.id.fields_selector))
+                .perform(click())
+            onView(withId(R.id.check_ignore_case)).inRoot(isDialog()).perform(scrollCompletelyTo())
+            onView(withId(R.id.check_ignore_case)).inRoot(isDialog()).check(matches(isChecked()))
+            onView(withId(R.id.check_ignore_case)).inRoot(isDialog()).perform(click())
+            onView(withId(R.id.check_ignore_case)).inRoot(isDialog()).check(matches(isNotChecked()))
+            // although the positive button exists, clicking it with Espresso doesn't work
+            //     onView(withId(android.R.id.button1)).inRoot(isDialog()).perform(click())
+            // so simulate clicking the positive button by running the associated method directly
+            (supportFragmentManager.findFragmentByTag(FindAndReplaceDialogFragment.TAG) as FindAndReplaceDialogFragment)
+                .startFindReplace()
+            // clicking the positive button would have also closed the dialog
+            closeFindAndReplace()
+            val colNote0 = withCol { getNote(note0.id) }
+            val colNote1 = withCol { getNote(note1.id) }
+            assertEquals("kchicKen", colNote0.fields[0])
+            assertEquals("kilogram", colNote0.fields[1])
+            // didn't modify field 1
+            assertEquals("kontra", colNote1.fields[1])
+            // replaced only the proper case
+            assertEquals("XeK", colNote1.fields[0])
+        }
+    }
+
+    @Test
+    fun `FindReplace - replaces text only for the field in the selected note`() {
+        val note0 = createFindReplaceTestNote("A", "kart", "kilogram")
+        val note1 = createFindReplaceTestNote("B", "pink", "chicken")
+        withBrowser {
+            viewModel.selectRowAtPosition(1)
+            createFindReplaceRequest("BField1", "k", "X")
+            val colNote0 = withCol { getNote(note0.id) }
+            // didn't modify other unselected notes
+            assertEquals("kart", colNote0.fields[0])
+            assertEquals("kilogram", colNote0.fields[1])
+            val colNote1 = withCol { getNote(note1.id) }
+            // only modified the specified field, not other fields as well
+            assertEquals("pink", colNote1.fields[0])
+            assertEquals("chicXen", colNote1.fields[1])
+            onView(withText(TR.browsingNotesUpdated(1))).check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
+        }
+    }
+
+    @Test
+    fun `FindReplace - replaces text based on regular expression`() {
+        val note0 = createFindReplaceTestNote("A", "kart", "ki1logram")
+        val note1 = createFindReplaceTestNote("B", "pink", "chicken")
+        withBrowser {
+            viewModel.selectRowAtPosition(0)
+            createFindReplaceRequest("AField1", "\\d", "X", regex = true)
+            val colNote0 = withCol { getNote(note0.id) }
+            val colNote1 = withCol { getNote(note1.id) }
+            // didn't modify other unselected notes or unselected fields
+            assertEquals("kart", colNote0.fields[0])
+            assertEquals("pink", colNote1.fields[0])
+            assertEquals("chicken", colNote1.fields[1])
+            // modified the specified field
+            assertEquals("kiXlogram", colNote0.fields[1])
+            onView(withText(TR.browsingNotesUpdated(1))).check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
+        }
+    }
+
+    @Test
+    fun `FindReplace - replaces text in all notes if 'Only in selected notes' is unchecked`() {
+        val note0 = createFindReplaceTestNote("A", "kart", "kilogram")
+        val note1 = createFindReplaceTestNote("B", "pink", "chicken")
+        val note2 = createFindReplaceTestNote("B", "kinetik", "kotlin")
+        val note3 = createFindReplaceTestNote("C", "klean", "kip")
+        withBrowser {
+            viewModel.selectRowAtPosition(1)
+            createFindReplaceRequest("BField1", "k", "X", onlyInSelectedNotes = false)
+            val colNote0 = withCol { getNote(note0.id) }
+            val colNote1 = withCol { getNote(note1.id) }
+            val colNote2 = withCol { getNote(note2.id) }
+            val colNote3 = withCol { getNote(note3.id) }
+            // didn't modify other unselected fields
+            assertEquals("kart", colNote0.fields[0])
+            assertEquals("kilogram", colNote0.fields[1]) // other field name
+            assertEquals("pink", colNote1.fields[0])
+            assertEquals("kinetik", colNote2.fields[0])
+            assertEquals("klean", colNote3.fields[0])
+            // all modified
+            assertEquals("chicXen", colNote1.fields[1])
+            assertEquals("Xotlin", colNote2.fields[1])
+            assertEquals("Xip", colNote3.fields[1])
+            onView(withText(TR.browsingNotesUpdated(3))).check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
+        }
+    }
+
+    @Test
+    fun `FindReplace - replaces text in all fields of selected note if 'All fields' is selected`() {
+        val note0 = createFindReplaceTestNote("A", "kart", "kilogram")
+        val note1 = createFindReplaceTestNote("B", "pink", "chicken")
+        withBrowser {
+            viewModel.selectRowAtPosition(1)
+            createFindReplaceRequest(ALL_FIELDS_AS_FIELD, "k", "X")
+            val colNote0 = withCol { getNote(note0.id) }
+            // didn't modify other unselected notes
+            assertEquals("kart", colNote0.fields[0])
+            assertEquals("kilogram", colNote0.fields[1])
+            val colNote1 = withCol { getNote(note1.id) }
+            // only modified the specified field, not other fields as well
+            assertEquals("pinX", colNote1.fields[0])
+            assertEquals("chicXen", colNote1.fields[1])
+            // two fields modified but one note is actually updated
+            onView(withText(TR.browsingNotesUpdated(1))).check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
+        }
+    }
+
+    @Test
+    fun `FindReplace - replaces text of tags as expected if 'Tags' is selected`() {
+        val note0 = createFindReplaceTestNote("A", "kart", "kilogram")
+        val note1 = createFindReplaceTestNote("A", "pink", "chicken")
+        withBrowser {
+            withCol { tags.bulkAdd(listOf(note0.id, note1.id), "JoJo") }
+            viewModel.selectRowAtPosition(0)
+            createFindReplaceRequest(TAGS_AS_FIELD, "JoJo", "KoKo")
+            val colNote0 = withCol { getNote(note0.id) }
+            val colNote1 = withCol { getNote(note1.id) }
+            // didn't modify other unselected notes
+            assertEquals("JoJo", colNote1.tags[0])
+            // changed tag
+            assertEquals("KoKo", colNote0.tags[0])
+            // doesn't have the previous tags
+            assertEquals(1, colNote0.tags.size)
+            onView(withText(TR.browsingNotesUpdated(1))).check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
+        }
+    }
+
+    @Test
+    fun `FindReplace - replaces text as expected when set to match case`() {
+        val note0 = createFindReplaceTestNote("A", "kart", "kilogram")
+        val note1 = createFindReplaceTestNote("B", "krate", "chicKen")
+        withBrowser {
+            viewModel.selectRowAtPosition(1)
+            createFindReplaceRequest(ALL_FIELDS_AS_FIELD, "k", "X", matchCase = true)
+            val colNote0 = withCol { getNote(note0.id) }
+            val colNote1 = withCol { getNote(note1.id) }
+            // didn't modify other unselected notes
+            assertEquals("kart", colNote0.fields[0])
+            assertEquals("kilogram", colNote0.fields[1])
+            assertEquals("Xrate", colNote1.fields[0]) // matches case
+            assertEquals("chicKen", colNote1.fields[1]) // doesn't match case
+            onView(withText(TR.browsingNotesUpdated(1))).check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
+        }
+    }
+
+    /**
+     * 3 notetypes available(named A, B and C) each with two fields.
+     * Fields names follow the pattern: "${NotetypeName}field${0/1}" (ex: "Afield1").
+     * "C" notetype has the same name for field 1 as notetype B!
+     * second is a [Pair] representing the field data(the note has only two fields)
+     */
+    private fun createFindReplaceTestNote(
+        notetypeName: String,
+        field0: String,
+        field1: String,
+    ): Note {
+        addStandardNoteType("A", arrayOf("Afield0", "Afield1"), "", "")
+        addStandardNoteType("B", arrayOf("Bfield0", "Bfield1"), "", "")
+        addStandardNoteType("C", arrayOf("Cfield0", "Bfield1"), "", "")
+        return addNoteUsingNoteTypeName(notetypeName, field0, field1)
+    }
+
+    /** Simulates the user using the dialog **/
+    private fun CardBrowser.createFindReplaceRequest(
+        field: String,
+        search: String,
+        replacement: String,
+        onlyInSelectedNotes: Boolean = true,
+        matchCase: Boolean = false,
+        regex: Boolean = false,
+    ) {
+        supportFragmentManager.setFragmentResult(
+            REQUEST_FIND_AND_REPLACE,
+            bundleOf(
+                ARG_SEARCH to search,
+                ARG_REPLACEMENT to replacement,
+                ARG_FIELD to field,
+                ARG_ONLY_SELECTED_NOTES to onlyInSelectedNotes,
+                // "Ignore case" checkbox text => when it's checked we pass false to the backend
+                ARG_MATCH_CASE to matchCase,
+                ARG_REGEX to regex,
+            ),
+        )
+    }
+
+    private fun CardBrowser.openFindAndReplace() {
+        showFindAndReplaceDialog()
+        advanceRobolectricUiLooper()
+    }
+
+    private fun CardBrowser.closeFindAndReplace() {
+        val findReplaceDialog = supportFragmentManager.findFragmentByTag(FindAndReplaceDialogFragment.TAG) as? DialogFragment
+        assertNotNull(findReplaceDialog, "Find and replace dialog is not available")
+        findReplaceDialog.dismissNow()
+        advanceRobolectricUiLooper()
+    }
+
+    private fun CardBrowser.getFindReplaceFieldsAdapter(): SpinnerAdapter {
+        val findReplaceDialog = supportFragmentManager.findFragmentByTag(FindAndReplaceDialogFragment.TAG) as? DialogFragment
+        assertNotNull(findReplaceDialog, "Find and replace dialog is not available")
+        val adapter = findReplaceDialog.dialog?.findViewById<Spinner>(R.id.fields_selector)?.adapter
+        assertNotNull(adapter, "Find and replace fields adapter is not available")
+        return adapter
+    }
+
     fun NotetypeJson.addNote(
         field: String,
         vararg fields: String,

From 25d851153e662f4842895bb331bbf1bccc0d79ee Mon Sep 17 00:00:00 2001
From: AnkiDroid Translations <ankidroid@ankidroid.org>
Date: Fri, 7 Mar 2025 18:24:19 +0000
Subject: [PATCH 097/200] Updated strings from Crowdin

---
 AnkiDroid/src/main/res/values-af/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-am/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-ar/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-az/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-be/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-bg/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-bn/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-ca/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-ckb/07-cardbrowser.xml    | 1 +
 AnkiDroid/src/main/res/values-cs/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-da/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-de/01-core.xml            | 4 ++--
 AnkiDroid/src/main/res/values-de/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-el/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-eo/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-es-rAR/07-cardbrowser.xml | 1 +
 AnkiDroid/src/main/res/values-es-rES/07-cardbrowser.xml | 1 +
 AnkiDroid/src/main/res/values-et/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-eu/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-fa/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-fi/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-fil/07-cardbrowser.xml    | 1 +
 AnkiDroid/src/main/res/values-fr/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-fy/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-ga/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-gl/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-got/07-cardbrowser.xml    | 1 +
 AnkiDroid/src/main/res/values-gu/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-heb/07-cardbrowser.xml    | 1 +
 AnkiDroid/src/main/res/values-hi/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-hr/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-hu/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-hy/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-ind/07-cardbrowser.xml    | 1 +
 AnkiDroid/src/main/res/values-is/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-it/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-iw/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-ja/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-jv/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-ka/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-kk/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-km/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-kn/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-ko/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-ku/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-ky/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-lt/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-lv/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-mk/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-ml/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-mn/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-mr/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-ms/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-my/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-nl/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-nn/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-no/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-or/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-pa/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-pl/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-pt-rBR/07-cardbrowser.xml | 1 +
 AnkiDroid/src/main/res/values-pt-rPT/07-cardbrowser.xml | 1 +
 AnkiDroid/src/main/res/values-ro/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-ru/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-sat/07-cardbrowser.xml    | 1 +
 AnkiDroid/src/main/res/values-sc/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-sk/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-sl/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-sq/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-sr/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-ss/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-sv/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-sw/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-ta/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-te/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-tg/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-tgl/07-cardbrowser.xml    | 1 +
 AnkiDroid/src/main/res/values-th/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-ti/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-tn/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-tr/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-ts/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-tt/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-ug/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-uk/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-ur/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-uz/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-ve/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-vi/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-wo/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-xh/07-cardbrowser.xml     | 1 +
 AnkiDroid/src/main/res/values-yue/07-cardbrowser.xml    | 1 +
 AnkiDroid/src/main/res/values-zh-rCN/07-cardbrowser.xml | 1 +
 AnkiDroid/src/main/res/values-zh-rTW/07-cardbrowser.xml | 1 +
 AnkiDroid/src/main/res/values-zu/07-cardbrowser.xml     | 1 +
 95 files changed, 96 insertions(+), 2 deletions(-)

diff --git a/AnkiDroid/src/main/res/values-af/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-af/07-cardbrowser.xml
index 0e1ec52a3596..175aa8fe3af3 100644
--- a/AnkiDroid/src/main/res/values-af/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-af/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-am/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-am/07-cardbrowser.xml
index 4da9bdcd5890..7311eac2c87c 100644
--- a/AnkiDroid/src/main/res/values-am/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-am/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ar/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-ar/07-cardbrowser.xml
index 6b2d7be0ec1e..71275cffe1b0 100644
--- a/AnkiDroid/src/main/res/values-ar/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-ar/07-cardbrowser.xml
@@ -142,4 +142,5 @@
     <string name="user_potential_columns">متوفر </string>
     <string name="include_column">إضافة عمود</string>
     <string name="exclude_column">استخراج عمود</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-az/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-az/07-cardbrowser.xml
index 58d4cba877dc..47a36a42b064 100644
--- a/AnkiDroid/src/main/res/values-az/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-az/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-be/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-be/07-cardbrowser.xml
index b4d3c0d00461..b31cfee48f48 100644
--- a/AnkiDroid/src/main/res/values-be/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-be/07-cardbrowser.xml
@@ -130,4 +130,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-bg/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-bg/07-cardbrowser.xml
index 385effab4631..5fc26972358b 100644
--- a/AnkiDroid/src/main/res/values-bg/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-bg/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-bn/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-bn/07-cardbrowser.xml
index 5570232feae5..be218f8386db 100644
--- a/AnkiDroid/src/main/res/values-bn/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-bn/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ca/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-ca/07-cardbrowser.xml
index 5afc08aa1d27..9f93264eb278 100644
--- a/AnkiDroid/src/main/res/values-ca/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-ca/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ckb/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-ckb/07-cardbrowser.xml
index 7a28d3dd8cf7..6ea8a00c40ce 100644
--- a/AnkiDroid/src/main/res/values-ckb/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-ckb/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-cs/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-cs/07-cardbrowser.xml
index 6d2231ed8b54..869cd289dd17 100644
--- a/AnkiDroid/src/main/res/values-cs/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-cs/07-cardbrowser.xml
@@ -130,4 +130,5 @@
     <string name="user_potential_columns">Dostupné</string>
     <string name="include_column">Přidat sloupec</string>
     <string name="exclude_column">Odebrat sloupec</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-da/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-da/07-cardbrowser.xml
index 0643e7bab403..4f3a8c03352f 100644
--- a/AnkiDroid/src/main/res/values-da/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-da/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-de/01-core.xml b/AnkiDroid/src/main/res/values-de/01-core.xml
index 230e2cf226bd..3977f2a32a60 100644
--- a/AnkiDroid/src/main/res/values-de/01-core.xml
+++ b/AnkiDroid/src/main/res/values-de/01-core.xml
@@ -61,12 +61,12 @@
         <item quantity="other">Noch ca. %d Minuten</item>
     </plurals>
     <plurals name="reviewer_window_title_hours_new">
-        <item quantity="one">%1$d Stunde(n) %2$d Minute(n) verbleibend</item>
+        <item quantity="one">%1$d Stunde %2$d Minute(n) verbleibend</item>
         <item quantity="other">%1$d Stunden %2$d verbleibend</item>
     </plurals>
     <plurals name="reviewer_window_title_days_new">
         <item quantity="one">%1$d Tag %2$d Std. übrig</item>
-        <item quantity="other">%1$d Tage %2$dStd. übrig</item>
+        <item quantity="other">%1$d Tage %2$d Std. übrig</item>
     </plurals>
     <string name="no_cards_placeholder_title">Sammlung ist leer</string>
     <string name="no_cards_placeholder_description">Fügen Sie Karten \nmit dem + -Symbol hinzu.</string>
diff --git a/AnkiDroid/src/main/res/values-de/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-de/07-cardbrowser.xml
index c46524175867..6a19ff082315 100644
--- a/AnkiDroid/src/main/res/values-de/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-de/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Verfügbar</string>
     <string name="include_column">Spalte einbeziehen</string>
     <string name="exclude_column">Spalte ausschließen</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-el/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-el/07-cardbrowser.xml
index cfae71dc5e0b..0a6f5f6ce347 100644
--- a/AnkiDroid/src/main/res/values-el/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-el/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-eo/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-eo/07-cardbrowser.xml
index 980035c6f7a4..8c24be37e45b 100644
--- a/AnkiDroid/src/main/res/values-eo/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-eo/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-es-rAR/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-es-rAR/07-cardbrowser.xml
index f71609d53ac8..67606f36f7cb 100644
--- a/AnkiDroid/src/main/res/values-es-rAR/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-es-rAR/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Disponible</string>
     <string name="include_column">Incluir columna</string>
     <string name="exclude_column">Excluir columna</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-es-rES/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-es-rES/07-cardbrowser.xml
index 031dcbaa45ed..0bf54e366416 100644
--- a/AnkiDroid/src/main/res/values-es-rES/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-es-rES/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Disponibles</string>
     <string name="include_column">Incluir columna</string>
     <string name="exclude_column">Excluir columna</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-et/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-et/07-cardbrowser.xml
index 054cbd64b20f..f696cad3d62a 100644
--- a/AnkiDroid/src/main/res/values-et/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-et/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-eu/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-eu/07-cardbrowser.xml
index 439a5246e610..efb2a066da3b 100644
--- a/AnkiDroid/src/main/res/values-eu/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-eu/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-fa/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-fa/07-cardbrowser.xml
index 32510184cbda..927b37594b2e 100644
--- a/AnkiDroid/src/main/res/values-fa/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-fa/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-fi/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-fi/07-cardbrowser.xml
index 1e8256ebc94f..ca1e5078ec50 100644
--- a/AnkiDroid/src/main/res/values-fi/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-fi/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Saatavilla</string>
     <string name="include_column">Sisällytä sarake</string>
     <string name="exclude_column">Jätä pois sarake</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-fil/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-fil/07-cardbrowser.xml
index f3aeb5e0157b..8f0f9bbae593 100644
--- a/AnkiDroid/src/main/res/values-fil/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-fil/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-fr/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-fr/07-cardbrowser.xml
index 15da0c571576..49f35d81f498 100644
--- a/AnkiDroid/src/main/res/values-fr/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-fr/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Disponible</string>
     <string name="include_column">Inclure la colonne</string>
     <string name="exclude_column">Exclure la colonne</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-fy/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-fy/07-cardbrowser.xml
index 4da9bdcd5890..7311eac2c87c 100644
--- a/AnkiDroid/src/main/res/values-fy/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-fy/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ga/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-ga/07-cardbrowser.xml
index b803f97fa167..755de1da94e7 100644
--- a/AnkiDroid/src/main/res/values-ga/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-ga/07-cardbrowser.xml
@@ -136,4 +136,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-gl/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-gl/07-cardbrowser.xml
index 8fbc8c543354..51fbc9e56231 100644
--- a/AnkiDroid/src/main/res/values-gl/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-gl/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-got/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-got/07-cardbrowser.xml
index 7a467c4da1eb..2c97a6a3e57a 100644
--- a/AnkiDroid/src/main/res/values-got/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-got/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-gu/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-gu/07-cardbrowser.xml
index 8ca07e1b6787..ac8f33734445 100644
--- a/AnkiDroid/src/main/res/values-gu/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-gu/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-heb/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-heb/07-cardbrowser.xml
index 02c01603c318..d927ca2e3ed0 100644
--- a/AnkiDroid/src/main/res/values-heb/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-heb/07-cardbrowser.xml
@@ -130,4 +130,5 @@
     <string name="user_potential_columns">זמין</string>
     <string name="include_column">כלול עמודה</string>
     <string name="exclude_column">אל תכלול עמודה</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-hi/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-hi/07-cardbrowser.xml
index b248c17ab345..bf79f5a96d70 100644
--- a/AnkiDroid/src/main/res/values-hi/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-hi/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-hr/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-hr/07-cardbrowser.xml
index 17aa07939ae0..95ffd1c252eb 100644
--- a/AnkiDroid/src/main/res/values-hr/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-hr/07-cardbrowser.xml
@@ -124,4 +124,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-hu/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-hu/07-cardbrowser.xml
index 8028e1506618..f29e0dd2d69b 100644
--- a/AnkiDroid/src/main/res/values-hu/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-hu/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-hy/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-hy/07-cardbrowser.xml
index 5d09a55aaad8..cea4904136ee 100644
--- a/AnkiDroid/src/main/res/values-hy/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-hy/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ind/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-ind/07-cardbrowser.xml
index a12ea0ab7e33..b5b53e18227a 100644
--- a/AnkiDroid/src/main/res/values-ind/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-ind/07-cardbrowser.xml
@@ -112,4 +112,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-is/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-is/07-cardbrowser.xml
index 4da9bdcd5890..7311eac2c87c 100644
--- a/AnkiDroid/src/main/res/values-is/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-is/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-it/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-it/07-cardbrowser.xml
index 09651f11dcb5..a1c5fe81696e 100644
--- a/AnkiDroid/src/main/res/values-it/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-it/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-iw/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-iw/07-cardbrowser.xml
index 02c01603c318..d927ca2e3ed0 100644
--- a/AnkiDroid/src/main/res/values-iw/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-iw/07-cardbrowser.xml
@@ -130,4 +130,5 @@
     <string name="user_potential_columns">זמין</string>
     <string name="include_column">כלול עמודה</string>
     <string name="exclude_column">אל תכלול עמודה</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ja/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-ja/07-cardbrowser.xml
index 73d42eec1eb2..3656f6d32491 100644
--- a/AnkiDroid/src/main/res/values-ja/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-ja/07-cardbrowser.xml
@@ -112,4 +112,5 @@
     <string name="user_potential_columns">使用可能</string>
     <string name="include_column">この列をブラウザのリストで使用</string>
     <string name="exclude_column">この列をブラウザのリストから除外</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-jv/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-jv/07-cardbrowser.xml
index e0a98d9726dd..feb1a3823fda 100644
--- a/AnkiDroid/src/main/res/values-jv/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-jv/07-cardbrowser.xml
@@ -112,4 +112,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ka/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-ka/07-cardbrowser.xml
index 2a383759aff4..06ad865ce8ef 100644
--- a/AnkiDroid/src/main/res/values-ka/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-ka/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">ხელმისაწვდომი</string>
     <string name="include_column">სვეტის გამოყენება</string>
     <string name="exclude_column">სვეტის არგამოყენება</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-kk/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-kk/07-cardbrowser.xml
index 4da9bdcd5890..7311eac2c87c 100644
--- a/AnkiDroid/src/main/res/values-kk/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-kk/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-km/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-km/07-cardbrowser.xml
index e0f529787d4d..61822fa5a4b1 100644
--- a/AnkiDroid/src/main/res/values-km/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-km/07-cardbrowser.xml
@@ -112,4 +112,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-kn/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-kn/07-cardbrowser.xml
index f3ac428a0631..9491288fe32f 100644
--- a/AnkiDroid/src/main/res/values-kn/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-kn/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ko/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-ko/07-cardbrowser.xml
index e04faa7188e1..fab61acca1b2 100644
--- a/AnkiDroid/src/main/res/values-ko/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-ko/07-cardbrowser.xml
@@ -112,4 +112,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">열 포함하기</string>
     <string name="exclude_column">열 제외하기</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ku/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-ku/07-cardbrowser.xml
index 29e04daa1d3d..5023ec8231a3 100644
--- a/AnkiDroid/src/main/res/values-ku/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-ku/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ky/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-ky/07-cardbrowser.xml
index 4da9bdcd5890..7311eac2c87c 100644
--- a/AnkiDroid/src/main/res/values-ky/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-ky/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-lt/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-lt/07-cardbrowser.xml
index 91074b94eccc..b7b46fd1da8f 100644
--- a/AnkiDroid/src/main/res/values-lt/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-lt/07-cardbrowser.xml
@@ -130,4 +130,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-lv/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-lv/07-cardbrowser.xml
index 036c456ad21f..652a6575e9b1 100644
--- a/AnkiDroid/src/main/res/values-lv/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-lv/07-cardbrowser.xml
@@ -124,4 +124,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-mk/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-mk/07-cardbrowser.xml
index 806a156930a9..92c716aa4eb4 100644
--- a/AnkiDroid/src/main/res/values-mk/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-mk/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ml/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-ml/07-cardbrowser.xml
index d9c0578aad8b..873a222031af 100644
--- a/AnkiDroid/src/main/res/values-ml/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-ml/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-mn/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-mn/07-cardbrowser.xml
index 4da9bdcd5890..7311eac2c87c 100644
--- a/AnkiDroid/src/main/res/values-mn/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-mn/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-mr/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-mr/07-cardbrowser.xml
index 1bb5da1fa763..944ff9d03106 100644
--- a/AnkiDroid/src/main/res/values-mr/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-mr/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ms/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-ms/07-cardbrowser.xml
index c671dfc1f050..91ef6f858f91 100644
--- a/AnkiDroid/src/main/res/values-ms/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-ms/07-cardbrowser.xml
@@ -112,4 +112,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-my/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-my/07-cardbrowser.xml
index e0a98d9726dd..feb1a3823fda 100644
--- a/AnkiDroid/src/main/res/values-my/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-my/07-cardbrowser.xml
@@ -112,4 +112,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-nl/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-nl/07-cardbrowser.xml
index 86fd5ebc9f66..9a774daf0d8d 100644
--- a/AnkiDroid/src/main/res/values-nl/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-nl/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-nn/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-nn/07-cardbrowser.xml
index c9c8ed30e127..1aabc904d4e4 100644
--- a/AnkiDroid/src/main/res/values-nn/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-nn/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-no/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-no/07-cardbrowser.xml
index 259142c3a270..fc0a779ea430 100644
--- a/AnkiDroid/src/main/res/values-no/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-no/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-or/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-or/07-cardbrowser.xml
index 2776b0e4f55f..92d8a72038de 100644
--- a/AnkiDroid/src/main/res/values-or/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-or/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">ଉପଲବ୍ଧ</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-pa/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-pa/07-cardbrowser.xml
index afff78205a34..8cdba0ba75a6 100644
--- a/AnkiDroid/src/main/res/values-pa/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-pa/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-pl/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-pl/07-cardbrowser.xml
index 9214004f7b94..934c1dda5d52 100644
--- a/AnkiDroid/src/main/res/values-pl/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-pl/07-cardbrowser.xml
@@ -130,4 +130,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-pt-rBR/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-pt-rBR/07-cardbrowser.xml
index 50288a2477f1..231558b22a5d 100644
--- a/AnkiDroid/src/main/res/values-pt-rBR/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-pt-rBR/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Disponível</string>
     <string name="include_column">Incluir coluna</string>
     <string name="exclude_column">Excluir coluna</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-pt-rPT/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-pt-rPT/07-cardbrowser.xml
index dd43e4465190..6dc423712a20 100644
--- a/AnkiDroid/src/main/res/values-pt-rPT/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-pt-rPT/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Disponíveis</string>
     <string name="include_column">Incluir coluna</string>
     <string name="exclude_column">Excluir coluna</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ro/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-ro/07-cardbrowser.xml
index 17aa07939ae0..95ffd1c252eb 100644
--- a/AnkiDroid/src/main/res/values-ro/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-ro/07-cardbrowser.xml
@@ -124,4 +124,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ru/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-ru/07-cardbrowser.xml
index 0d7cb7df5d7b..3773be132cf4 100644
--- a/AnkiDroid/src/main/res/values-ru/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-ru/07-cardbrowser.xml
@@ -130,4 +130,5 @@
     <string name="user_potential_columns">Доступные</string>
     <string name="include_column">Включить столбец</string>
     <string name="exclude_column">Исключить столбец</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-sat/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-sat/07-cardbrowser.xml
index 89f639b7f3fc..b910e05795af 100644
--- a/AnkiDroid/src/main/res/values-sat/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-sat/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-sc/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-sc/07-cardbrowser.xml
index 2481e410eca9..fda2744935a5 100644
--- a/AnkiDroid/src/main/res/values-sc/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-sc/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-sk/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-sk/07-cardbrowser.xml
index 2704441cc441..282e8bdf5904 100644
--- a/AnkiDroid/src/main/res/values-sk/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-sk/07-cardbrowser.xml
@@ -130,4 +130,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-sl/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-sl/07-cardbrowser.xml
index a58ca54eb58b..caad069db7ba 100644
--- a/AnkiDroid/src/main/res/values-sl/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-sl/07-cardbrowser.xml
@@ -130,4 +130,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-sq/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-sq/07-cardbrowser.xml
index 4da9bdcd5890..7311eac2c87c 100644
--- a/AnkiDroid/src/main/res/values-sq/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-sq/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-sr/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-sr/07-cardbrowser.xml
index 66a5d945e811..1f4c6969b268 100644
--- a/AnkiDroid/src/main/res/values-sr/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-sr/07-cardbrowser.xml
@@ -124,4 +124,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ss/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-ss/07-cardbrowser.xml
index 4da9bdcd5890..7311eac2c87c 100644
--- a/AnkiDroid/src/main/res/values-ss/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-ss/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-sv/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-sv/07-cardbrowser.xml
index 3f01a40f75a3..b1836f892830 100644
--- a/AnkiDroid/src/main/res/values-sv/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-sv/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-sw/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-sw/07-cardbrowser.xml
index 4da9bdcd5890..7311eac2c87c 100644
--- a/AnkiDroid/src/main/res/values-sw/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-sw/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ta/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-ta/07-cardbrowser.xml
index d092f0c78cc5..6d4244b21831 100644
--- a/AnkiDroid/src/main/res/values-ta/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-ta/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-te/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-te/07-cardbrowser.xml
index 3e75c2d7ffd5..b5c767f952f1 100644
--- a/AnkiDroid/src/main/res/values-te/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-te/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-tg/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-tg/07-cardbrowser.xml
index 4da9bdcd5890..7311eac2c87c 100644
--- a/AnkiDroid/src/main/res/values-tg/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-tg/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-tgl/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-tgl/07-cardbrowser.xml
index a1f2aaed8f8c..e2ccbcc4c516 100644
--- a/AnkiDroid/src/main/res/values-tgl/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-tgl/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-th/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-th/07-cardbrowser.xml
index e0a98d9726dd..feb1a3823fda 100644
--- a/AnkiDroid/src/main/res/values-th/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-th/07-cardbrowser.xml
@@ -112,4 +112,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ti/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-ti/07-cardbrowser.xml
index 4da9bdcd5890..7311eac2c87c 100644
--- a/AnkiDroid/src/main/res/values-ti/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-ti/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-tn/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-tn/07-cardbrowser.xml
index 4da9bdcd5890..7311eac2c87c 100644
--- a/AnkiDroid/src/main/res/values-tn/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-tn/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-tr/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-tr/07-cardbrowser.xml
index 394532761897..01b52d6cbdff 100644
--- a/AnkiDroid/src/main/res/values-tr/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-tr/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Kullanılabilir</string>
     <string name="include_column">Sütunu ekle</string>
     <string name="exclude_column">Sütunu çıkar</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ts/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-ts/07-cardbrowser.xml
index 4da9bdcd5890..7311eac2c87c 100644
--- a/AnkiDroid/src/main/res/values-ts/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-ts/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-tt/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-tt/07-cardbrowser.xml
index 5d15da38c12b..836a53eb7ab1 100644
--- a/AnkiDroid/src/main/res/values-tt/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-tt/07-cardbrowser.xml
@@ -112,4 +112,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ug/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-ug/07-cardbrowser.xml
index 8110813fcfcf..776a550d2471 100644
--- a/AnkiDroid/src/main/res/values-ug/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-ug/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">ئىشلىتىلىشچان</string>
     <string name="include_column">رەت ئىچىدە</string>
     <string name="exclude_column">رەت سىرتىدا</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-uk/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-uk/07-cardbrowser.xml
index 39a129bdfb23..ad94a230f350 100644
--- a/AnkiDroid/src/main/res/values-uk/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-uk/07-cardbrowser.xml
@@ -130,4 +130,5 @@
     <string name="user_potential_columns">Доступні</string>
     <string name="include_column">Включити стовпець</string>
     <string name="exclude_column">Виключити стовпець</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ur/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-ur/07-cardbrowser.xml
index 80978a88c240..4a0d3a210ce3 100644
--- a/AnkiDroid/src/main/res/values-ur/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-ur/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-uz/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-uz/07-cardbrowser.xml
index 4da9bdcd5890..7311eac2c87c 100644
--- a/AnkiDroid/src/main/res/values-uz/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-uz/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ve/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-ve/07-cardbrowser.xml
index 4da9bdcd5890..7311eac2c87c 100644
--- a/AnkiDroid/src/main/res/values-ve/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-ve/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-vi/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-vi/07-cardbrowser.xml
index b0ae9c2bad71..c502940cbd00 100644
--- a/AnkiDroid/src/main/res/values-vi/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-vi/07-cardbrowser.xml
@@ -112,4 +112,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-wo/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-wo/07-cardbrowser.xml
index e0a98d9726dd..feb1a3823fda 100644
--- a/AnkiDroid/src/main/res/values-wo/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-wo/07-cardbrowser.xml
@@ -112,4 +112,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-xh/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-xh/07-cardbrowser.xml
index 4da9bdcd5890..7311eac2c87c 100644
--- a/AnkiDroid/src/main/res/values-xh/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-xh/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-yue/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-yue/07-cardbrowser.xml
index e0a98d9726dd..feb1a3823fda 100644
--- a/AnkiDroid/src/main/res/values-yue/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-yue/07-cardbrowser.xml
@@ -112,4 +112,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-zh-rCN/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-zh-rCN/07-cardbrowser.xml
index 509a3ac49485..7df1b69bf56d 100644
--- a/AnkiDroid/src/main/res/values-zh-rCN/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-zh-rCN/07-cardbrowser.xml
@@ -112,4 +112,5 @@
     <string name="user_potential_columns">可用</string>
     <string name="include_column">包含列</string>
     <string name="exclude_column">排除列</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-zh-rTW/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-zh-rTW/07-cardbrowser.xml
index 188d5800b401..f29d97fd71d4 100644
--- a/AnkiDroid/src/main/res/values-zh-rTW/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-zh-rTW/07-cardbrowser.xml
@@ -112,4 +112,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-zu/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-zu/07-cardbrowser.xml
index 4da9bdcd5890..7311eac2c87c 100644
--- a/AnkiDroid/src/main/res/values-zu/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-zu/07-cardbrowser.xml
@@ -118,4 +118,5 @@
     <string name="user_potential_columns">Available</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
+    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
 </resources>

From 14f9a2de2d3d93fd2ed515643fb834de4d80be88 Mon Sep 17 00:00:00 2001
From: Arthur Milchior <arthur@milchior.fr>
Date: Sat, 8 Mar 2025 22:07:35 +0100
Subject: [PATCH 098/200] NF: set "play" variant as default

This will ensure that new contributors can run androidTest on
emulators without having to change the variant.

Syntax found on
https://stackoverflow.com/posts/60197203/revisions

Tested by using the "Re-import with defaults" button in the variant
setting.
---
 AnkiDroid/build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AnkiDroid/build.gradle b/AnkiDroid/build.gradle
index 058be63698c3..cf1d5a1e2928 100644
--- a/AnkiDroid/build.gradle
+++ b/AnkiDroid/build.gradle
@@ -179,6 +179,7 @@ android {
     flavorDimensions += "appStore"
     productFlavors {
         create('play') {
+            getIsDefault().set(true)
             dimension "appStore"
         }
         create('amazon') {

From 0de2eb08b2ff5acfc597564bde65edc2c7f58864 Mon Sep 17 00:00:00 2001
From: Saptak Manna <saptakmanna100@gmail.com>
Date: Sun, 26 Jan 2025 11:34:13 +0530
Subject: [PATCH 099/200] Update layout constraints for gesture display images

---
 .../src/main/res/layout/gesture_display.xml   | 51 ++++++++++++-------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/AnkiDroid/src/main/res/layout/gesture_display.xml b/AnkiDroid/src/main/res/layout/gesture_display.xml
index 6a30a8c2e719..3c755642175c 100644
--- a/AnkiDroid/src/main/res/layout/gesture_display.xml
+++ b/AnkiDroid/src/main/res/layout/gesture_display.xml
@@ -25,15 +25,18 @@
     <ImageView
         android:id="@+id/top_left"
         style="@style/binding_gesture_tap_button"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
+        app:layout_constraintHorizontal_bias="0.047"
+        app:layout_constraintVertical_bias="0.047"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
         android:id="@+id/top_center"
         style="@style/binding_gesture_tap_button"
-        android:layout_marginTop="16dp"
+        app:layout_constraintVertical_bias="0.047"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -41,17 +44,22 @@
     <ImageView
         android:id="@+id/top_right"
         style="@style/binding_gesture_tap_button"
-        app:layout_constraintEnd_toEndOf="@+id/right"
-        app:layout_constraintTop_toTopOf="@+id/top_center" />
+        app:layout_constraintHorizontal_bias="0.953"
+        app:layout_constraintVertical_bias="0.047"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
 
     <ImageView
         android:id="@+id/left"
         style="@style/binding_gesture_tap_button"
-        android:layout_marginStart="16dp"
-        app:layout_constraintBottom_toTopOf="parent"
+        app:layout_constraintHorizontal_bias="0.047"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="parent" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
         android:id="@+id/center"
@@ -64,33 +72,40 @@
     <ImageView
         android:id="@+id/right"
         style="@style/binding_gesture_tap_button"
-        android:layout_marginEnd="16dp"
-        app:layout_constraintBottom_toTopOf="parent"
+        app:layout_constraintHorizontal_bias="0.953"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
         android:id="@+id/bottom_left"
-        android:layout_marginBottom="16dp"
         style="@style/binding_gesture_tap_button"
+        app:layout_constraintHorizontal_bias="0.047"
+        app:layout_constraintVertical_bias="0.953"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="@+id/left" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
         android:id="@+id/bottom_center"
         style="@style/binding_gesture_tap_button"
-        android:layout_marginBottom="16dp"
+        app:layout_constraintVertical_bias="0.953"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
         android:id="@+id/bottom_right"
         style="@style/binding_gesture_tap_button"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="16dp"
+        app:layout_constraintHorizontal_bias="0.953"
+        app:layout_constraintVertical_bias="0.953"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
         android:id="@+id/swipe_select"

From 04cc6ca1dbcad04af4a1f55bdc21513beff5b097 Mon Sep 17 00:00:00 2001
From: rahul31124 <rdass87871@gmail.com>
Date: Sat, 8 Mar 2025 20:01:57 +0530
Subject: [PATCH 100/200] Added Background Remove Option

Add explicit background removal option for clarity

This commit addresses the issue of not having a clearly visible option
to remove the background. Without this, users may be confused about how
to remove the background image once set.

By explicitly adding a background removal option, the user experience
is improved, making the feature more intuitive and accessible.
---
 .../com/ichi2/anki/analytics/UsageAnalytics.kt    |  1 +
 .../preferences/AppearanceSettingsFragment.kt     | 15 +++++++++++++++
 AnkiDroid/src/main/res/values/02-strings.xml      |  5 +++--
 AnkiDroid/src/main/res/values/preferences.xml     |  1 +
 .../src/main/res/xml/preferences_appearance.xml   |  4 ++++
 5 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/analytics/UsageAnalytics.kt b/AnkiDroid/src/main/java/com/ichi2/anki/analytics/UsageAnalytics.kt
index 8f9908a9e9d1..f5631a88379a 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/analytics/UsageAnalytics.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/analytics/UsageAnalytics.kt
@@ -502,6 +502,7 @@ object UsageAnalytics {
             R.string.day_theme_key, // Day theme
             R.string.night_theme_key, // Night theme
             R.string.pref_deck_picker_background_key, // Background image
+            R.string.pref_remove_wallpaper_key, // Remove wallpaper
             R.string.fullscreen_mode_preference, // Fullscreen mode
             R.string.center_vertically_preference, // Center align
             R.string.show_estimates_preference, // Show button time
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/AppearanceSettingsFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/AppearanceSettingsFragment.kt
index 2c6e505f54f9..0bcc005a9279 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/AppearanceSettingsFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/AppearanceSettingsFragment.kt
@@ -45,6 +45,7 @@ import timber.log.Timber
 
 class AppearanceSettingsFragment : SettingsFragment() {
     private var backgroundImage: Preference? = null
+    private var removeBackgroundPref: Preference? = null
     override val preferenceResource: Int
         get() = R.xml.preferences_appearance
     override val analyticsScreenNameConstant: String
@@ -53,6 +54,7 @@ class AppearanceSettingsFragment : SettingsFragment() {
     override fun initSubscreen() {
         // Configure background
         backgroundImage = requirePreference<Preference>("deckPickerBackground")
+        removeBackgroundPref = requirePreference<Preference>("removeWallPaper")
         backgroundImage!!.onPreferenceClickListener =
             Preference.OnPreferenceClickListener {
                 try {
@@ -63,6 +65,13 @@ class AppearanceSettingsFragment : SettingsFragment() {
                 }
                 true
             }
+        removeBackgroundPref?.setOnPreferenceClickListener {
+            showRemoveBackgroundImageDialog()
+            true
+        }
+
+        // Initially update visibility based on whether a background exists
+        updateRemoveBackgroundVisibility()
 
         val appThemePref = requirePreference<ListPreference>(R.string.app_theme_key)
         val dayThemePref = requirePreference<ListPreference>(R.string.day_theme_key)
@@ -150,12 +159,17 @@ class AppearanceSettingsFragment : SettingsFragment() {
         }
     }
 
+    private fun updateRemoveBackgroundVisibility() {
+        removeBackgroundPref?.isVisible = BackgroundImage.shouldBeShown(requireContext())
+    }
+
     private fun showRemoveBackgroundImageDialog() {
         AlertDialog.Builder(requireContext()).show {
             title(R.string.remove_background_image)
             positiveButton(R.string.dialog_remove) {
                 if (BackgroundImage.remove(requireContext())) {
                     showSnackbar(R.string.background_image_removed)
+                    updateRemoveBackgroundVisibility()
                 } else {
                     showSnackbar(R.string.error_deleting_image)
                 }
@@ -189,6 +203,7 @@ class AppearanceSettingsFragment : SettingsFragment() {
                     }
                     is FileSizeResult.OK -> {
                         BackgroundImage.import(this, selectedImage)
+                        updateRemoveBackgroundVisibility()
                     }
                 }
             } catch (e: OutOfMemoryError) {
diff --git a/AnkiDroid/src/main/res/values/02-strings.xml b/AnkiDroid/src/main/res/values/02-strings.xml
index be0b47418a9e..569449625678 100644
--- a/AnkiDroid/src/main/res/values/02-strings.xml
+++ b/AnkiDroid/src/main/res/values/02-strings.xml
@@ -176,6 +176,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -259,7 +260,6 @@
 
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
-    
     <string name="download_deck">Download deck</string>
     <string name="try_again">Try Again</string>
     <string name="cancel_download">Cancel download</string>
@@ -274,7 +274,7 @@
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
 
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
@@ -416,3 +416,4 @@ opening the system text to speech settings fails">
 
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
+
diff --git a/AnkiDroid/src/main/res/values/preferences.xml b/AnkiDroid/src/main/res/values/preferences.xml
index ce5617cc213a..b1a14583377b 100644
--- a/AnkiDroid/src/main/res/values/preferences.xml
+++ b/AnkiDroid/src/main/res/values/preferences.xml
@@ -34,6 +34,7 @@
     <string name="day_theme_key">dayTheme</string>
     <string name="night_theme_key">nightTheme</string>
     <string name="pref_deck_picker_background_key">deckPickerBackground</string>
+    <string name="pref_remove_wallpaper_key">removeWallPaper</string>
     <string name="custom_buttons_link_preference">custom_buttons_link</string>
     <string name="fullscreen_mode_preference">fullscreenMode</string>
     <string name="center_vertically_preference">centerVertically</string>
diff --git a/AnkiDroid/src/main/res/xml/preferences_appearance.xml b/AnkiDroid/src/main/res/xml/preferences_appearance.xml
index 43dd47b02f7f..164a58f630a0 100644
--- a/AnkiDroid/src/main/res/xml/preferences_appearance.xml
+++ b/AnkiDroid/src/main/res/xml/preferences_appearance.xml
@@ -64,6 +64,10 @@
             android:shouldDisableView="true"
             android:icon="@drawable/wallpaper_icon"
             android:title="@string/choose_an_image" />
+        <Preference
+            android:key="@string/pref_remove_wallpaper_key"
+            android:icon="@drawable/ic_delete_white"
+            android:title="@string/remove_wallpaper_image"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/pref_cat_reviewer" >
         <Preference

From 9cb11f8a92e80df33e25b06644ee814a7da679ce Mon Sep 17 00:00:00 2001
From: AnkiDroid Translations <ankidroid@ankidroid.org>
Date: Mon, 10 Mar 2025 05:56:57 +0000
Subject: [PATCH 101/200] Updated strings from Crowdin

---
 AnkiDroid/src/main/res/values-af/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-am/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-ar/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-az/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-be/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-bg/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-bn/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-ca/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-ckb/02-strings.xml        | 3 ++-
 AnkiDroid/src/main/res/values-cs/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-da/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-de/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-el/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-eo/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-es-rAR/02-strings.xml     | 3 ++-
 AnkiDroid/src/main/res/values-es-rES/02-strings.xml     | 3 ++-
 AnkiDroid/src/main/res/values-et/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-eu/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-fa/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-fi/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-fil/02-strings.xml        | 3 ++-
 AnkiDroid/src/main/res/values-fr/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-fy/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-ga/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-gl/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-got/02-strings.xml        | 3 ++-
 AnkiDroid/src/main/res/values-gu/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-heb/02-strings.xml        | 3 ++-
 AnkiDroid/src/main/res/values-hi/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-hr/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-hu/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-hy/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-ind/02-strings.xml        | 3 ++-
 AnkiDroid/src/main/res/values-is/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-it/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-iw/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-ja/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-jv/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-ka/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-kk/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-km/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-kn/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-ko/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-ku/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-ky/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-lt/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-lv/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-mk/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-ml/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-mn/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-mr/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-ms/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-my/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-nl/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-nn/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-no/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-or/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-pa/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-pl/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml     | 3 ++-
 AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml     | 3 ++-
 AnkiDroid/src/main/res/values-ro/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-ru/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-sat/02-strings.xml        | 3 ++-
 AnkiDroid/src/main/res/values-sc/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-sk/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-sl/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-sq/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-sr/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-ss/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-sv/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-sw/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-ta/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-te/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-tg/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-tgl/02-strings.xml        | 3 ++-
 AnkiDroid/src/main/res/values-th/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-ti/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-tn/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-tr/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-ts/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-tt/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-ug/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-uk/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-ur/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-uz/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-ve/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-vi/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-wo/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-xh/02-strings.xml         | 3 ++-
 AnkiDroid/src/main/res/values-yue/02-strings.xml        | 3 ++-
 AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml     | 3 ++-
 AnkiDroid/src/main/res/values-zh-rCN/07-cardbrowser.xml | 2 +-
 AnkiDroid/src/main/res/values-zh-rTW/02-strings.xml     | 3 ++-
 AnkiDroid/src/main/res/values-zu/02-strings.xml         | 3 ++-
 95 files changed, 189 insertions(+), 95 deletions(-)

diff --git a/AnkiDroid/src/main/res/values-af/02-strings.xml b/AnkiDroid/src/main/res/values-af/02-strings.xml
index 00b1ee0167b9..c0256726a687 100644
--- a/AnkiDroid/src/main/res/values-af/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-af/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Agtergrond</string>
     <string name="choose_an_image" maxLength="41">Kies beeld</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Verwyder agtergrond?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Herstel Standaard</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Soek met paknaam</string>
     <string name="external_storage_unavailable">Aflaai gestaak, die eksterne berging is nie beskikbaar nie</string>
     <string name="home" maxLength="28">Tuis</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Kaart begrawe.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-am/02-strings.xml b/AnkiDroid/src/main/res/values-am/02-strings.xml
index a86dedce299e..02fc4162fc27 100644
--- a/AnkiDroid/src/main/res/values-am/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-am/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Search using deck name</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-ar/02-strings.xml b/AnkiDroid/src/main/res/values-ar/02-strings.xml
index 9afef1f578c5..739249209c82 100644
--- a/AnkiDroid/src/main/res/values-ar/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ar/02-strings.xml
@@ -203,6 +203,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">خلفية</string>
     <string name="choose_an_image" maxLength="41">اختيار صورة</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">هل تريد إزالة الخلفية؟</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">استعادة الافتراضي</string>
@@ -276,7 +277,7 @@
     <string name="search_using_deck_name">ابحث باستخدام اسم الرزمة</string>
     <string name="external_storage_unavailable">تم إلغاء التنزيل لأن التخزين الخارجي غير متوفر</string>
     <string name="home" maxLength="28">الصفحة الرئيسية</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">تم دفن البطاقة</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-az/02-strings.xml b/AnkiDroid/src/main/res/values-az/02-strings.xml
index 8e2ca32d2de3..1ca5328f2113 100644
--- a/AnkiDroid/src/main/res/values-az/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-az/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Search using deck name</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-be/02-strings.xml b/AnkiDroid/src/main/res/values-be/02-strings.xml
index 8a8441957501..2b9011475cee 100644
--- a/AnkiDroid/src/main/res/values-be/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-be/02-strings.xml
@@ -195,6 +195,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Фон</string>
     <string name="choose_an_image" maxLength="41">Выберыце відарыс</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Выдаліць фон?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Вярнуцца да прадвызначаных</string>
@@ -268,7 +269,7 @@
     <string name="search_using_deck_name">Пошук па назве калоды</string>
     <string name="external_storage_unavailable">Спампоўванне абарвана, бо знешняе сховішча недаступна.</string>
     <string name="home" maxLength="28">Галоўная</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Адкладзеная картка.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-bg/02-strings.xml b/AnkiDroid/src/main/res/values-bg/02-strings.xml
index c98e752b53f4..4a7869e7e494 100644
--- a/AnkiDroid/src/main/res/values-bg/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-bg/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Фон</string>
     <string name="choose_an_image" maxLength="41">Изберете изображение</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Възстанови по подразбиране</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Търсене посредством име на тесте</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Начало</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-bn/02-strings.xml b/AnkiDroid/src/main/res/values-bn/02-strings.xml
index b5ade427404c..e24dd949e705 100644
--- a/AnkiDroid/src/main/res/values-bn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-bn/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">পটভূমি</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">পটভূমি সরান?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">ডিফল্ট পুনরুদ্ধার করুন</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">ডেকের নাম ব্যবহার করে অনুসন্ধান করুন</string>
     <string name="external_storage_unavailable">ডাউনলোড বাতিল করা হয়েছে, কোনো বাহ্যিক সঞ্চয়স্থান উপলব্ধ নেই</string>
     <string name="home" maxLength="28">বাড়ি</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">কার্ড কবর দেওয়া হয়</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-ca/02-strings.xml b/AnkiDroid/src/main/res/values-ca/02-strings.xml
index 55f3b236ec60..4a9f4b5dec96 100644
--- a/AnkiDroid/src/main/res/values-ca/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ca/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Fons</string>
     <string name="choose_an_image" maxLength="41">Selecciona una imatge</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Elimina el fons</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restaura els valors per defecte</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Cercar usant el nom del paquet</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Inici</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">S\'ha enterrat la targeta.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-ckb/02-strings.xml b/AnkiDroid/src/main/res/values-ckb/02-strings.xml
index bf0167b55ac7..1697472cfbe9 100644
--- a/AnkiDroid/src/main/res/values-ckb/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ckb/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">وێنەیەک هەڵبژێرە</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Search using deck name</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-cs/02-strings.xml b/AnkiDroid/src/main/res/values-cs/02-strings.xml
index 63ce62178b7e..aa188a26dfb7 100644
--- a/AnkiDroid/src/main/res/values-cs/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-cs/02-strings.xml
@@ -195,6 +195,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Pozadí</string>
     <string name="choose_an_image" maxLength="41">Vybrat obrázek</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Odebrat pozadí?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Obnovit výchozí</string>
@@ -268,7 +269,7 @@
     <string name="search_using_deck_name">Hledat pomocí názvu balíčku</string>
     <string name="external_storage_unavailable">Stahování přerušeno, externí úložiště není k dispozici</string>
     <string name="home" maxLength="28">Domů</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Karta přeskočena.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-da/02-strings.xml b/AnkiDroid/src/main/res/values-da/02-strings.xml
index 9098e4dd1f79..c20867ea72db 100644
--- a/AnkiDroid/src/main/res/values-da/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-da/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Baggrund</string>
     <string name="choose_an_image" maxLength="41">Vælg billede</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Fjern baggrund?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Gendan standardindstillinger</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Search using deck name</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-de/02-strings.xml b/AnkiDroid/src/main/res/values-de/02-strings.xml
index e1378e11d3c7..8e1bff6b5687 100644
--- a/AnkiDroid/src/main/res/values-de/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-de/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Hintergrund</string>
     <string name="choose_an_image" maxLength="41">Bild auswählen</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Hintergrund entfernen?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Standard wiederherstellen</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Über Stapelnamen suchen</string>
     <string name="external_storage_unavailable">Download abgebrochen, externer Speicher nicht verfügbar</string>
     <string name="home" maxLength="28">Start</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Karte aufgeschoben.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-el/02-strings.xml b/AnkiDroid/src/main/res/values-el/02-strings.xml
index 8b7ff2dfab9d..9be7ebc38b59 100644
--- a/AnkiDroid/src/main/res/values-el/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-el/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Φόντο</string>
     <string name="choose_an_image" maxLength="41">Επιλέξτε εικόνα</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Αφαίρεση ταπετσαρίας;</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Επαναφορά προεπιλογής</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Αναζήτηση με το όνομα τράπουλας</string>
     <string name="external_storage_unavailable">Η λήψη ματαιώθηκε, ο εξωτερικός χώρος αποθήκευσης δεν είναι διαθέσιμος</string>
     <string name="home" maxLength="28">Αρχική</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Η κάρτα θάφτηκε.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-eo/02-strings.xml b/AnkiDroid/src/main/res/values-eo/02-strings.xml
index 36320a96c307..c557791e45b7 100644
--- a/AnkiDroid/src/main/res/values-eo/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-eo/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Fono</string>
     <string name="choose_an_image" maxLength="41">Elekti bildon</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Ĉu forigi fonon?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restarigi implicitajn</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Serĉi laŭ nomo de kartaro</string>
     <string name="external_storage_unavailable">Elŝutado ĉesigita, la ekstera konservejo estas neailrebla</string>
     <string name="home" maxLength="28">Hejmo</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Karto kaŝita por tago.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-es-rAR/02-strings.xml b/AnkiDroid/src/main/res/values-es-rAR/02-strings.xml
index 13d992bcd7fd..2ddc4c69c500 100644
--- a/AnkiDroid/src/main/res/values-es-rAR/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-es-rAR/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Fondo</string>
     <string name="choose_an_image" maxLength="41">Elige una imagen</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">¿Quitar fondo?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restablecer Predefinidos</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Buscar usando nombre de mazo</string>
     <string name="external_storage_unavailable">Descarga abortada, el almacenamiento externo no está disponible</string>
     <string name="home" maxLength="28">Inicio</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Tarjeta enterrada</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-es-rES/02-strings.xml b/AnkiDroid/src/main/res/values-es-rES/02-strings.xml
index aacde7fae3f3..623f1600e52a 100644
--- a/AnkiDroid/src/main/res/values-es-rES/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-es-rES/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Fondo</string>
     <string name="choose_an_image" maxLength="41">Elige una imagen</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">¿Quitar fondo?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restablecer Predefinidos</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Buscar usando nombre de mazo</string>
     <string name="external_storage_unavailable">Descarga abortada, el almacenamiento externo no está disponible</string>
     <string name="home" maxLength="28">Inicio</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Tarjeta enterrada</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-et/02-strings.xml b/AnkiDroid/src/main/res/values-et/02-strings.xml
index 5015d5ce678d..8f127cb738ee 100644
--- a/AnkiDroid/src/main/res/values-et/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-et/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Search using deck name</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-eu/02-strings.xml b/AnkiDroid/src/main/res/values-eu/02-strings.xml
index 9161b003e195..bf2a910ffb0e 100644
--- a/AnkiDroid/src/main/res/values-eu/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-eu/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Search using deck name</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-fa/02-strings.xml b/AnkiDroid/src/main/res/values-fa/02-strings.xml
index a8a9f367f236..f02271124420 100644
--- a/AnkiDroid/src/main/res/values-fa/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fa/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">پس زمینه</string>
     <string name="choose_an_image" maxLength="41">انتخاب تصویر</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">حذف پس‌زمینه؟</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">بازنشانی پیش‌فرض</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">جست و جو با استفاده از اسم دسته</string>
     <string name="external_storage_unavailable">بارگیری توقف شد، حافظه خارجی در دسترس نیست</string>
     <string name="home" maxLength="28">خانه</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">کارت دفن شد.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-fi/02-strings.xml b/AnkiDroid/src/main/res/values-fi/02-strings.xml
index 5eccc95f5100..8e381bcf9063 100644
--- a/AnkiDroid/src/main/res/values-fi/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fi/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Tausta</string>
     <string name="choose_an_image" maxLength="41">Valitse kuva</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Poistetaanko tausta?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Palauta oletusarvot</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Etsi käyttäen pakan nimeä</string>
     <string name="external_storage_unavailable">Lataus keskeytetty, ulkoinen tallennustila ei ole käytettävissä</string>
     <string name="home" maxLength="28">Koti</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Kortti haudattu.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-fil/02-strings.xml b/AnkiDroid/src/main/res/values-fil/02-strings.xml
index 0055eff188af..7d4df06dbb1a 100644
--- a/AnkiDroid/src/main/res/values-fil/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fil/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Likuran</string>
     <string name="choose_an_image" maxLength="41">Pumili ng Litrato</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Tanggalin ang background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Ibalik sa Default</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Hanapin gamit ang pangalan ng deck</string>
     <string name="external_storage_unavailable">Naudlot ang pag-download, wala nang natirang lugar sa external storage</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Naibaon ang card.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-fr/02-strings.xml b/AnkiDroid/src/main/res/values-fr/02-strings.xml
index cd8099d40e64..230bdfe392e2 100644
--- a/AnkiDroid/src/main/res/values-fr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fr/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Arrière-plan</string>
     <string name="choose_an_image" maxLength="41">Sélectionner une image</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Retirer l\'arrière-plan ?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Rétablir par défaut</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Chercher en utilisant le nom du paquet</string>
     <string name="external_storage_unavailable">Téléchargement interrompu, le stockage externe n\'est pas disponible</string>
     <string name="home" maxLength="28">Accueil</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Carte enterrée.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-fy/02-strings.xml b/AnkiDroid/src/main/res/values-fy/02-strings.xml
index 0312c01494d1..638246ca0974 100644
--- a/AnkiDroid/src/main/res/values-fy/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fy/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Search using deck name</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-ga/02-strings.xml b/AnkiDroid/src/main/res/values-ga/02-strings.xml
index 5865ca902e25..a78b12b43729 100644
--- a/AnkiDroid/src/main/res/values-ga/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ga/02-strings.xml
@@ -199,6 +199,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -272,7 +273,7 @@
     <string name="search_using_deck_name">Search using deck name</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-gl/02-strings.xml b/AnkiDroid/src/main/res/values-gl/02-strings.xml
index 4deb87a46bed..e095edc4d5d3 100644
--- a/AnkiDroid/src/main/res/values-gl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-gl/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Search using deck name</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-got/02-strings.xml b/AnkiDroid/src/main/res/values-got/02-strings.xml
index 57718e603778..223ef97094d7 100644
--- a/AnkiDroid/src/main/res/values-got/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-got/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Search using deck name</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-gu/02-strings.xml b/AnkiDroid/src/main/res/values-gu/02-strings.xml
index f53899ef298e..7502ca9bedd9 100644
--- a/AnkiDroid/src/main/res/values-gu/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-gu/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">પૃષ્ઠભૂમિ</string>
     <string name="choose_an_image" maxLength="41">છબી પસંદ કરો</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">પૃષ્ઠભૂમિ દૂર કરીએ?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">મૂળભૂત પુનઃસ્થાપિત</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">ડેક નામનો ઉપયોગ કરીને શોધો</string>
     <string name="external_storage_unavailable">ડાઉનલોડ રદ કર્યું, બાહ્ય સ્ટોરેજ ઉપલબ્ધ નથી</string>
     <string name="home" maxLength="28">ઘર</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">કાર્ડ દફનાવવામાં આવ્યું હતું.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-heb/02-strings.xml b/AnkiDroid/src/main/res/values-heb/02-strings.xml
index 051ffddf45c0..60402e68a43f 100644
--- a/AnkiDroid/src/main/res/values-heb/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-heb/02-strings.xml
@@ -195,6 +195,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">רקע</string>
     <string name="choose_an_image" maxLength="41">נא לבחור תמונה</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">להסיר רקע?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">שחזור בררת המחדל</string>
@@ -268,7 +269,7 @@
     <string name="search_using_deck_name">חיפוש באמצעות שם החפיסה</string>
     <string name="external_storage_unavailable">ההורדה בוטלה, האחסון החיצוני אינו זמין</string>
     <string name="home" maxLength="28">בית</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">הקלף נקבר</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-hi/02-strings.xml b/AnkiDroid/src/main/res/values-hi/02-strings.xml
index e5d2471cecf6..e602bd4b635d 100644
--- a/AnkiDroid/src/main/res/values-hi/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-hi/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">पृष्ठभूमि</string>
     <string name="choose_an_image" maxLength="41">चित्र चुनें</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">पृष्ठभूमि निकालें?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">पहले जैसा कर देना</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">डेक नाम का उपयोग करके खोजें</string>
     <string name="external_storage_unavailable">डाउनलोड निरस्त हो गया, बाह्य स्टोरेज  उपलब्ध नहीं है</string>
     <string name="home" maxLength="28">गृह</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">कार्ड दफन।</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-hr/02-strings.xml b/AnkiDroid/src/main/res/values-hr/02-strings.xml
index 99db25db2e87..542c46a72304 100644
--- a/AnkiDroid/src/main/res/values-hr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-hr/02-strings.xml
@@ -191,6 +191,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -264,7 +265,7 @@
     <string name="search_using_deck_name">Search using deck name</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-hu/02-strings.xml b/AnkiDroid/src/main/res/values-hu/02-strings.xml
index ac0a9f02cd5b..8aa0ec5b2634 100644
--- a/AnkiDroid/src/main/res/values-hu/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-hu/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Háttér</string>
     <string name="choose_an_image" maxLength="41">Válasszon egy képet</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Alaphelyzetbe állítás</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Keresés a paklik nevében</string>
     <string name="external_storage_unavailable">A letöltés megszakadt, a külső tároló nem elérhető</string>
     <string name="home" maxLength="28">Kezdőlap</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Kártya elhalasztva.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-hy/02-strings.xml b/AnkiDroid/src/main/res/values-hy/02-strings.xml
index 31c3bba3fc37..8291704b6c35 100644
--- a/AnkiDroid/src/main/res/values-hy/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-hy/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Search using deck name</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-ind/02-strings.xml b/AnkiDroid/src/main/res/values-ind/02-strings.xml
index 99ec0d473352..8b8d606f3a48 100644
--- a/AnkiDroid/src/main/res/values-ind/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ind/02-strings.xml
@@ -183,6 +183,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Latar belakang</string>
     <string name="choose_an_image" maxLength="41">Pilih gambar</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Hapus latar belakang?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Kembalikan ke baku</string>
@@ -256,7 +257,7 @@
     <string name="search_using_deck_name">Cari berdasarkan nama dek</string>
     <string name="external_storage_unavailable">Unduhan dibatalkan, penyimpanan eksternal tidak tersedia</string>
     <string name="home" maxLength="28">Beranda</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Kartu disimpan.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-is/02-strings.xml b/AnkiDroid/src/main/res/values-is/02-strings.xml
index a86dedce299e..02fc4162fc27 100644
--- a/AnkiDroid/src/main/res/values-is/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-is/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Search using deck name</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-it/02-strings.xml b/AnkiDroid/src/main/res/values-it/02-strings.xml
index 338b0f2d46e2..845d91db62f4 100644
--- a/AnkiDroid/src/main/res/values-it/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-it/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Sfondo</string>
     <string name="choose_an_image" maxLength="41">Scegli un\'immagine</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Rimuovere lo sfondo?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Ripristina predefiniti</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Cerca usando il nome del mazzo</string>
     <string name="external_storage_unavailable">Download interrotto, l\'archiviazione esterna non è disponibile</string>
     <string name="home" maxLength="28">Pagina principale</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Carta seppellita.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-iw/02-strings.xml b/AnkiDroid/src/main/res/values-iw/02-strings.xml
index 051ffddf45c0..60402e68a43f 100644
--- a/AnkiDroid/src/main/res/values-iw/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-iw/02-strings.xml
@@ -195,6 +195,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">רקע</string>
     <string name="choose_an_image" maxLength="41">נא לבחור תמונה</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">להסיר רקע?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">שחזור בררת המחדל</string>
@@ -268,7 +269,7 @@
     <string name="search_using_deck_name">חיפוש באמצעות שם החפיסה</string>
     <string name="external_storage_unavailable">ההורדה בוטלה, האחסון החיצוני אינו זמין</string>
     <string name="home" maxLength="28">בית</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">הקלף נקבר</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-ja/02-strings.xml b/AnkiDroid/src/main/res/values-ja/02-strings.xml
index 48fbc26cdeb5..d4049f07ac97 100644
--- a/AnkiDroid/src/main/res/values-ja/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ja/02-strings.xml
@@ -183,6 +183,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">デッキリスト画面の背景</string>
     <string name="choose_an_image" maxLength="41">画像を選択</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">背景画像を削除しますか？</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">既定値に戻す</string>
@@ -256,7 +257,7 @@
     <string name="search_using_deck_name">デッキ名で検索</string>
     <string name="external_storage_unavailable">ダウンロードが中止されました。この外部ストレージは利用できません。</string>
     <string name="home" maxLength="28">ホーム</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">カードを今日は非表示にしました。</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-jv/02-strings.xml b/AnkiDroid/src/main/res/values-jv/02-strings.xml
index 9bfa12c2c1b2..7a28cb737f55 100644
--- a/AnkiDroid/src/main/res/values-jv/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-jv/02-strings.xml
@@ -183,6 +183,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -256,7 +257,7 @@
     <string name="search_using_deck_name">Search using deck name</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-ka/02-strings.xml b/AnkiDroid/src/main/res/values-ka/02-strings.xml
index 9cc5faccc996..10a15e215425 100644
--- a/AnkiDroid/src/main/res/values-ka/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ka/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">ფონი</string>
     <string name="choose_an_image" maxLength="41">სურათის არჩევა</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">გსურთ ფონის წაშლა?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">ნაგულისხმევის აღდგენა</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">დასტის სახელით ძებნა</string>
     <string name="external_storage_unavailable">ჩამოტვირთვა გაუქმდა, გარე მეხსიერება ხელმიუწვდომელია</string>
     <string name="home" maxLength="28">მთავარი</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">ბარათი დამალულია.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-kk/02-strings.xml b/AnkiDroid/src/main/res/values-kk/02-strings.xml
index a86dedce299e..02fc4162fc27 100644
--- a/AnkiDroid/src/main/res/values-kk/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-kk/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Search using deck name</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-km/02-strings.xml b/AnkiDroid/src/main/res/values-km/02-strings.xml
index 1738d3a138bf..3f5fb696fcd7 100644
--- a/AnkiDroid/src/main/res/values-km/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-km/02-strings.xml
@@ -183,6 +183,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">ផ្ទៃខាងក្រោយ</string>
     <string name="choose_an_image" maxLength="41">ជ្រើសរើសរូបភាព</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">ដកផ្ទៃខាងក្រោយចេញ?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">ស្តារលំនាំដើមឡើងវិញ</string>
@@ -256,7 +257,7 @@
     <string name="search_using_deck_name">ស្វែងរកដោយប្រើឈ្មោះជាន់</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">កាតបានកប់។</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-kn/02-strings.xml b/AnkiDroid/src/main/res/values-kn/02-strings.xml
index 6577e2da991b..b3f59d932f12 100644
--- a/AnkiDroid/src/main/res/values-kn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-kn/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">ಹಿನ್ನೆಲೆ</string>
     <string name="choose_an_image" maxLength="41">ಚಿತ್ರವನ್ನು ಆರಿಸಿ</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">ಹಿನ್ನೆಲೆ ತೆಗೆದುಹಾಕುವುದೇ?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">ಡೀಫಾಲ್ಟ್ ಅನ್ನು ಮರುಸ್ಥಾಪಿಸಿ</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">ಡೆಕ್ ಹೆಸರನ್ನು ಬಳಸಿ ಹುಡುಕಿ</string>
     <string name="external_storage_unavailable">ಡೌನ್‌ಲೋಡ್ ನಿಲ್ಲಿಸಲಾಗಿದೆ, ಯಾವುದೇ ಬಾಹ್ಯ ಸಂಗ್ರಹಣೆ ಲಭ್ಯವಿಲ್ಲ</string>
     <string name="home" maxLength="28">ಮನೆ</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">ಕಾರ್ಡ್ ಅನ್ನು ಸಮಾಧಿ ಮಾಡಲಾಗಿದೆ.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-ko/02-strings.xml b/AnkiDroid/src/main/res/values-ko/02-strings.xml
index 016082d9c455..9e0873aaceef 100644
--- a/AnkiDroid/src/main/res/values-ko/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ko/02-strings.xml
@@ -186,6 +186,7 @@ Context | Request Context    [1]</string>
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">배경</string>
     <string name="choose_an_image" maxLength="41">이미지 선택</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">배경을 제거하시겠습니까?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">기본값 복원</string>
@@ -259,7 +260,7 @@ Context | Request Context    [1]</string>
     <string name="search_using_deck_name">사용 중인 카드 덱 이름 찾기</string>
     <string name="external_storage_unavailable">다운로드가 중단되었습니다. 외부 저장 공간을 사용할 수 없습니다.</string>
     <string name="home" maxLength="28">홈</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">카드 숨기기 완료.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-ku/02-strings.xml b/AnkiDroid/src/main/res/values-ku/02-strings.xml
index df4dd3539c6c..ec3e6b2832b2 100644
--- a/AnkiDroid/src/main/res/values-ku/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ku/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Search using deck name</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-ky/02-strings.xml b/AnkiDroid/src/main/res/values-ky/02-strings.xml
index a86dedce299e..02fc4162fc27 100644
--- a/AnkiDroid/src/main/res/values-ky/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ky/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Search using deck name</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-lt/02-strings.xml b/AnkiDroid/src/main/res/values-lt/02-strings.xml
index b241c3c77c1f..709e0dedb02f 100644
--- a/AnkiDroid/src/main/res/values-lt/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-lt/02-strings.xml
@@ -195,6 +195,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Fonas</string>
     <string name="choose_an_image" maxLength="41">Pasirinkite paveikslėlį</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -268,7 +269,7 @@
     <string name="search_using_deck_name">Search using deck name</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-lv/02-strings.xml b/AnkiDroid/src/main/res/values-lv/02-strings.xml
index 29e69df70f23..37a4227a1d73 100644
--- a/AnkiDroid/src/main/res/values-lv/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-lv/02-strings.xml
@@ -191,6 +191,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -264,7 +265,7 @@
     <string name="search_using_deck_name">Search using deck name</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-mk/02-strings.xml b/AnkiDroid/src/main/res/values-mk/02-strings.xml
index 27f7c017b935..f8da9bdc3c65 100644
--- a/AnkiDroid/src/main/res/values-mk/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-mk/02-strings.xml
@@ -188,6 +188,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -261,7 +262,7 @@
     <string name="search_using_deck_name">Search using deck name</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-ml/02-strings.xml b/AnkiDroid/src/main/res/values-ml/02-strings.xml
index e090a556205b..050b87e2aaf4 100644
--- a/AnkiDroid/src/main/res/values-ml/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ml/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">ഒരു ചിത്രം തിരഞ്ഞെടുക്കുക</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">പശ്ചാത്തലം നീക്കം ചെയ്യണോ?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">നേരത്തെയുള്ളത് പുനസ്ഥാപിക്കുക</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">ഡെക്കിൻ്റെ പേര് ഉപയോഗിച്ച് തിരയുക</string>
     <string name="external_storage_unavailable">ഡൗൺലോഡ് നിർത്തലാക്കി, ബാഹ്യ സംഭരണം ലഭ്യമല്ല</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-mn/02-strings.xml b/AnkiDroid/src/main/res/values-mn/02-strings.xml
index 78b869b6d850..414fae1beb6a 100644
--- a/AnkiDroid/src/main/res/values-mn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-mn/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Өгөгдмөл горим руу шилжих</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Search using deck name</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Картыг буллаа</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-mr/02-strings.xml b/AnkiDroid/src/main/res/values-mr/02-strings.xml
index b7d1f4763c80..8ac1d17b537e 100644
--- a/AnkiDroid/src/main/res/values-mr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-mr/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">पार्श्वभूमी</string>
     <string name="choose_an_image" maxLength="41">प्रतिमा निवडा</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">पार्श्वभूमी काढायची?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">डीफॉल्ट पुनर्संचयित करा</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">डेकचे नाव वापरून शोधा</string>
     <string name="external_storage_unavailable">डाउनलोड रद्द केले, बाह्य संचयन उपलब्ध नाही</string>
     <string name="home" maxLength="28">मुख्यपृष्ठ</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">कार्ड पुरले.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-ms/02-strings.xml b/AnkiDroid/src/main/res/values-ms/02-strings.xml
index a358c9b10b92..f2bf28195ca3 100644
--- a/AnkiDroid/src/main/res/values-ms/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ms/02-strings.xml
@@ -183,6 +183,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Latar belakang</string>
     <string name="choose_an_image" maxLength="41">Pilih gambar</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Pulih Lalai</string>
@@ -256,7 +257,7 @@
     <string name="search_using_deck_name">Cari menggunakan nama dek</string>
     <string name="external_storage_unavailable">Muat turun batal, tiada storan luaran tersedia</string>
     <string name="home" maxLength="28">Laman Utama</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Kad disorok.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-my/02-strings.xml b/AnkiDroid/src/main/res/values-my/02-strings.xml
index 373f381178cc..eca3a48f69ed 100644
--- a/AnkiDroid/src/main/res/values-my/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-my/02-strings.xml
@@ -183,6 +183,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -256,7 +257,7 @@
     <string name="search_using_deck_name">Search using deck name</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-nl/02-strings.xml b/AnkiDroid/src/main/res/values-nl/02-strings.xml
index 8dbc0feb4669..977135f1cd9f 100644
--- a/AnkiDroid/src/main/res/values-nl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-nl/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Achtergrond</string>
     <string name="choose_an_image" maxLength="41">Kies een afbeelding</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Achtergrond verwijderen?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Herstel Standaardinstellingen</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Zoek met setnaam</string>
     <string name="external_storage_unavailable">Download afgebroken, externe opslag is niet beschikbaar</string>
     <string name="home" maxLength="28">Startpagina</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Kaart begraven.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-nn/02-strings.xml b/AnkiDroid/src/main/res/values-nn/02-strings.xml
index 6899661661cb..4c072f678209 100644
--- a/AnkiDroid/src/main/res/values-nn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-nn/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Bakgrunn</string>
     <string name="choose_an_image" maxLength="41">Velg bilde</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Søk ved hjelp av kortstokknavn</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Hjem</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Kort skjult.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-no/02-strings.xml b/AnkiDroid/src/main/res/values-no/02-strings.xml
index 87866bad8192..0d34226281e2 100644
--- a/AnkiDroid/src/main/res/values-no/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-no/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Bakgrunn</string>
     <string name="choose_an_image" maxLength="41">Velg bilde</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Søk ved hjelp av kortstokknavn</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Hjem</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Kort skjult.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-or/02-strings.xml b/AnkiDroid/src/main/res/values-or/02-strings.xml
index 0d2efc0123b8..c904ace04630 100644
--- a/AnkiDroid/src/main/res/values-or/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-or/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">ପୃଷ୍ଠପଟ</string>
     <string name="choose_an_image" maxLength="41">ଛବି ବାଛନ୍ତୁ</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">ପୃଷ୍ଠପଟ ଅପସାରଣ କରିବେ ତ?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">ଡିଫଲ୍ଟ ପୁନଃସ୍ଥାପନ କରନ୍ତୁ</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">ତାସଖଣ୍ଡ ନାମ ବ୍ୟବହାର କରି ସନ୍ଧାନ କରନ୍ତୁ</string>
     <string name="external_storage_unavailable">ଡାଉନଲୋଡ୍ ପରିତ୍ୟାଗ ହୋଇଛି, ବହିଃ-ଷ୍ଟୋରେଜ୍ ଉପଲବ୍ଧ ନାହିଁ</string>
     <string name="home" maxLength="28">ଗୃହ</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">ପତ୍ର ସ୍ଥଗିତ କରାଗଲା।</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-pa/02-strings.xml b/AnkiDroid/src/main/res/values-pa/02-strings.xml
index f0cfe3310f51..2e85c9fa5b96 100644
--- a/AnkiDroid/src/main/res/values-pa/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-pa/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">ਪਿਛੋਕੜ</string>
     <string name="choose_an_image" maxLength="41">ਚਿੱਤਰ ਨੂੰ ਚੁਣੋ</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">ਕੀ ਪਿਛੋਕੜ ਨੂੰ ਹਟਾਉਣਾ ਹੈ?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">ਡਿਫੌਲਟ ਰੀਸਟੋਰ ਕਰੋ</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">ਡੇਕ ਨਾਮ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਖੋਜ ਕਰੋ</string>
     <string name="external_storage_unavailable">ਡਾਊਨਲੋਡ ਅਧੂਰਾ ਛੱਡਿਆ ਗਿਆ, ਕੋਈ ਬਾਹਰੀ ਸਟੋਰੇਜ ਉਪਲਬਧ ਨਹੀਂ ਹੈ</string>
     <string name="home" maxLength="28">ਘਰ</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">ਕਾਰਡ ਦੱਬਿਆ ਗਿਆ।</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-pl/02-strings.xml b/AnkiDroid/src/main/res/values-pl/02-strings.xml
index e8710c414d0b..69c9d4ee1137 100644
--- a/AnkiDroid/src/main/res/values-pl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-pl/02-strings.xml
@@ -195,6 +195,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Tło</string>
     <string name="choose_an_image" maxLength="41">Wybierz obraz</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Usunąć tło?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Przywróć domyślne</string>
@@ -268,7 +269,7 @@
     <string name="search_using_deck_name">Szukaj używając nazwy talii</string>
     <string name="external_storage_unavailable">Pobieranie przerwane, pamięć zewnętrzna nie jest dostępna</string>
     <string name="home" maxLength="28">Strona główna</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Karta zakopana.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml b/AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml
index 2fe903396904..a600bd80d4a3 100644
--- a/AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Plano de fundo</string>
     <string name="choose_an_image" maxLength="41">Escolha uma imagem</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remover fundo?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restaurar Padrões</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Pesquisar usando o nome do baralho</string>
     <string name="external_storage_unavailable">Transferência abortada, o armazenamento externo não está disponível</string>
     <string name="home" maxLength="28">Início</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Cartão enterrado.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml b/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml
index 4e31814bd427..9c5f2117fd48 100644
--- a/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Fundo</string>
     <string name="choose_an_image" maxLength="41">Selecionar imagem</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remover imagem de fundo?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restaurar predefinições</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Pesquisar utilizando o nome do baralho</string>
     <string name="external_storage_unavailable">Transferência cancelada, o armazenamento externo não está disponível.</string>
     <string name="home" maxLength="28">Página Inicial</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Ficha adiada</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-ro/02-strings.xml b/AnkiDroid/src/main/res/values-ro/02-strings.xml
index 0f13b0dcafc3..d70c5d36084b 100644
--- a/AnkiDroid/src/main/res/values-ro/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ro/02-strings.xml
@@ -191,6 +191,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -264,7 +265,7 @@
     <string name="search_using_deck_name">Search using deck name</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-ru/02-strings.xml b/AnkiDroid/src/main/res/values-ru/02-strings.xml
index 35716683ead8..3a9eed698415 100644
--- a/AnkiDroid/src/main/res/values-ru/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ru/02-strings.xml
@@ -195,6 +195,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Фон</string>
     <string name="choose_an_image" maxLength="41">Выбрать изображение</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Удалить фон?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Сбросить настройки</string>
@@ -268,7 +269,7 @@
     <string name="search_using_deck_name">Искать по названию колоды</string>
     <string name="external_storage_unavailable">Загрузка прервана, внешняя память недоступна</string>
     <string name="home" maxLength="28">Главная</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Карточка отложена.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-sat/02-strings.xml b/AnkiDroid/src/main/res/values-sat/02-strings.xml
index 17d3af8b0a64..692c223ad885 100644
--- a/AnkiDroid/src/main/res/values-sat/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sat/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">ᱵᱮᱠᱜᱟᱨᱩᱸᱰ</string>
     <string name="choose_an_image" maxLength="41">ᱪᱤᱛᱟᱨ ᱵᱟᱪᱷᱟᱣ ᱢᱮ</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">ᱚᱛ ᱦᱟᱥᱟ ᱪᱟᱵᱟ ᱢᱮ?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">ᱢᱩᱞ ᱯᱷᱮᱰᱟᱛ ᱨᱮ ᱫᱚᱦᱰᱟ ᱡᱚᱜᱟᱣ</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">ᱰᱮᱠ ᱧᱩᱛᱩᱢ ᱵᱮᱵᱷᱟᱨ ᱠᱟᱛᱮ ᱥᱮᱸᱫᱽᱨᱟᱭ ᱢᱮ</string>
     <string name="external_storage_unavailable">ᱰᱟᱩᱱᱞᱚᱰ ᱵᱚᱫᱚᱞ ᱟᱠᱟᱱᱟ, ᱵᱟᱦᱨᱮ ᱥᱴᱳᱨᱮᱡᱽ ᱵᱟᱭ ᱦᱟᱹᱴᱤᱧ ᱟᱠᱟᱱᱟ</string>
     <string name="home" maxLength="28">ᱚᱲᱟᱜ</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">ᱠᱟᱨᱰ ᱫᱚ ᱛᱷᱟᱯᱚᱱ ᱟᱠᱟᱱᱟ᱾</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-sc/02-strings.xml b/AnkiDroid/src/main/res/values-sc/02-strings.xml
index a3a3d953e0ec..a7bb3981d1bd 100644
--- a/AnkiDroid/src/main/res/values-sc/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sc/02-strings.xml
@@ -190,6 +190,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Isfundu</string>
     <string name="choose_an_image" maxLength="41">Issèbera un\'immàgine</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Bogare s\'isfundu?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Torra a sos valores predefinidos</string>
@@ -263,7 +264,7 @@
     <string name="search_using_deck_name">Chirca impreende su nùmene de su matzu</string>
     <string name="external_storage_unavailable">Iscarrigamentu annulladu, sa memòria esterna no est a disponimentu</string>
     <string name="home" maxLength="28">Pàgina printzipale</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Carta interrada.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-sk/02-strings.xml b/AnkiDroid/src/main/res/values-sk/02-strings.xml
index b9c861a93333..1fa26d5fd678 100644
--- a/AnkiDroid/src/main/res/values-sk/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sk/02-strings.xml
@@ -195,6 +195,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Pozadie</string>
     <string name="choose_an_image" maxLength="41">Zvoliť obrázok</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Odstrániť tapetu?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Obnoviť predvolené</string>
@@ -268,7 +269,7 @@
     <string name="search_using_deck_name">Hľadať pomocou názvu balíčka</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Domov</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Karta zahrabaná.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-sl/02-strings.xml b/AnkiDroid/src/main/res/values-sl/02-strings.xml
index 0d4f13ff5758..cbf957d02702 100644
--- a/AnkiDroid/src/main/res/values-sl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sl/02-strings.xml
@@ -195,6 +195,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -268,7 +269,7 @@
     <string name="search_using_deck_name">Search using deck name</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-sq/02-strings.xml b/AnkiDroid/src/main/res/values-sq/02-strings.xml
index 67afb1b07946..e393b7c011cb 100644
--- a/AnkiDroid/src/main/res/values-sq/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sq/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Search using deck name</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-sr/02-strings.xml b/AnkiDroid/src/main/res/values-sr/02-strings.xml
index 17f20f090979..d2e5b6f10e01 100644
--- a/AnkiDroid/src/main/res/values-sr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sr/02-strings.xml
@@ -191,6 +191,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -264,7 +265,7 @@
     <string name="search_using_deck_name">Search using deck name</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-ss/02-strings.xml b/AnkiDroid/src/main/res/values-ss/02-strings.xml
index a86dedce299e..02fc4162fc27 100644
--- a/AnkiDroid/src/main/res/values-ss/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ss/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Search using deck name</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-sv/02-strings.xml b/AnkiDroid/src/main/res/values-sv/02-strings.xml
index 2c90c73f3756..6cf09da50f01 100644
--- a/AnkiDroid/src/main/res/values-sv/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sv/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Bakgrund</string>
     <string name="choose_an_image" maxLength="41">Välj en bild</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Ta bort bakgrund?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Återställ standardvärde</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Sök efter kortlekens namn</string>
     <string name="external_storage_unavailable">Nedladdningen avbruten, det externa lagringsutrymmet är inte tillgängligt</string>
     <string name="home" maxLength="28">Hem</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Kort gömt i högen</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-sw/02-strings.xml b/AnkiDroid/src/main/res/values-sw/02-strings.xml
index a86dedce299e..02fc4162fc27 100644
--- a/AnkiDroid/src/main/res/values-sw/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sw/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Search using deck name</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-ta/02-strings.xml b/AnkiDroid/src/main/res/values-ta/02-strings.xml
index b415489d009c..6e913ee28c90 100644
--- a/AnkiDroid/src/main/res/values-ta/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ta/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">பின்புலங்கள்</string>
     <string name="choose_an_image" maxLength="41">படம் தேர்ந்தெடு</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">பின்னணியை அகற்றவா?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">இயல்புநிலையை மீட்டமை</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">டெக் பெயரைப் பயன்படுத்தி தேடவும்</string>
     <string name="external_storage_unavailable">பதிவிறக்கம் நிறுத்தப்பட்டது, வெளிப்புற சேமிப்பிடம் கிடைக்கவில்லை</string>
     <string name="home" maxLength="28">வீடு</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">அட்டை புதைக்கப்பட்டது.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-te/02-strings.xml b/AnkiDroid/src/main/res/values-te/02-strings.xml
index e5ac886ca171..323c6684909f 100644
--- a/AnkiDroid/src/main/res/values-te/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-te/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">నేపథ్య</string>
     <string name="choose_an_image" maxLength="41">చిత్రాన్ని ఎంచుకోండి</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">నేపథ్యాన్ని తీసివేయాలా?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">డిఫాల్ట్‌ని పునరుద్ధరించండి</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">డెక్ పేరును ఉపయోగించి శోధించండి</string>
     <string name="external_storage_unavailable">డౌన్‌లోడ్ ఆగిపోయింది, బాహ్య నిల్వ అందుబాటులో లేదు</string>
     <string name="home" maxLength="28">హోమ్</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">కార్డు పాతిపెట్టబడింది.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-tg/02-strings.xml b/AnkiDroid/src/main/res/values-tg/02-strings.xml
index a86dedce299e..02fc4162fc27 100644
--- a/AnkiDroid/src/main/res/values-tg/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tg/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Search using deck name</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-tgl/02-strings.xml b/AnkiDroid/src/main/res/values-tgl/02-strings.xml
index 78acb308ab37..f551a6969d13 100644
--- a/AnkiDroid/src/main/res/values-tgl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tgl/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Search using deck name</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-th/02-strings.xml b/AnkiDroid/src/main/res/values-th/02-strings.xml
index c3ba8bd5d01d..92fa6d89068d 100644
--- a/AnkiDroid/src/main/res/values-th/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-th/02-strings.xml
@@ -183,6 +183,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -256,7 +257,7 @@
     <string name="search_using_deck_name">Search using deck name</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-ti/02-strings.xml b/AnkiDroid/src/main/res/values-ti/02-strings.xml
index a86dedce299e..02fc4162fc27 100644
--- a/AnkiDroid/src/main/res/values-ti/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ti/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Search using deck name</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-tn/02-strings.xml b/AnkiDroid/src/main/res/values-tn/02-strings.xml
index a86dedce299e..02fc4162fc27 100644
--- a/AnkiDroid/src/main/res/values-tn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tn/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Search using deck name</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-tr/02-strings.xml b/AnkiDroid/src/main/res/values-tr/02-strings.xml
index 5e92adbf3a35..db27cfab48be 100644
--- a/AnkiDroid/src/main/res/values-tr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tr/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Arkaplan</string>
     <string name="choose_an_image" maxLength="41">Bir resim seç</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Arkaplan kaldırılsın mı?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Varsayılana Dön</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Deste ismini kullanarak ara</string>
     <string name="external_storage_unavailable">İndirme iptal edildi, harici hafıza erişilebilir değil.</string>
     <string name="home" maxLength="28">Ana sayfa</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Kart gizlendi.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-ts/02-strings.xml b/AnkiDroid/src/main/res/values-ts/02-strings.xml
index a86dedce299e..02fc4162fc27 100644
--- a/AnkiDroid/src/main/res/values-ts/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ts/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Search using deck name</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-tt/02-strings.xml b/AnkiDroid/src/main/res/values-tt/02-strings.xml
index 15619d3e12f6..cd204a6d2cef 100644
--- a/AnkiDroid/src/main/res/values-tt/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tt/02-strings.xml
@@ -184,6 +184,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Җирлек</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -257,7 +258,7 @@
     <string name="search_using_deck_name">Search using deck name</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Баш бит</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-ug/02-strings.xml b/AnkiDroid/src/main/res/values-ug/02-strings.xml
index 957d64b793f7..ff6c08620346 100644
--- a/AnkiDroid/src/main/res/values-ug/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ug/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">تەگلىك</string>
     <string name="choose_an_image" maxLength="41">سۈرەت تاللاش</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">تەگلىكنى چىقىرىۋېتەمدۇ؟</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">كۆڭۈلدىكىگە قايتۇر</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">دەستە ئىسمى بويىچە ئىزدەيدۇ</string>
     <string name="external_storage_unavailable">چۈشۈرۈش بىكار قىلىندى، سىرتقا ساقلىغۇچنى ئىشلەتكىلى بولمايدۇ</string>
     <string name="home" maxLength="28">باش بەت</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">كارتا يوشۇرۇلدى.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-uk/02-strings.xml b/AnkiDroid/src/main/res/values-uk/02-strings.xml
index 76a3c9c2cb4c..94c8b453d699 100644
--- a/AnkiDroid/src/main/res/values-uk/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-uk/02-strings.xml
@@ -195,6 +195,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Фон</string>
     <string name="choose_an_image" maxLength="41">Оберіть зображення</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Видалити задній фон?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Відновити «Типове»</string>
@@ -268,7 +269,7 @@
     <string name="search_using_deck_name">Пошук за назвою колоди</string>
     <string name="external_storage_unavailable">Завантаження перервано, зовнішнє сховище недоступне</string>
     <string name="home" maxLength="28">Головна</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Картку відкладено.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-ur/02-strings.xml b/AnkiDroid/src/main/res/values-ur/02-strings.xml
index 956cf91ce34f..d754fd696aa5 100644
--- a/AnkiDroid/src/main/res/values-ur/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ur/02-strings.xml
@@ -188,6 +188,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">پس منظر</string>
     <string name="choose_an_image" maxLength="41">تصویر منتخب کریں۔</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">پس منظر ہٹائیں؟</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">ڈیفالٹ بحال کریں۔</string>
@@ -261,7 +262,7 @@
     <string name="search_using_deck_name">ڈیک کا نام استعمال کرکے تلاش کریں</string>
     <string name="external_storage_unavailable">ڈاؤن لوڈ منسوخ کر دیا گیا، بیرونی اسٹوریج دستیاب نہیں ہے</string>
     <string name="home" maxLength="28">گھر</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">کارڈ دفن کر دیا گیا</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-uz/02-strings.xml b/AnkiDroid/src/main/res/values-uz/02-strings.xml
index 51e2f56007f2..da9e93519163 100644
--- a/AnkiDroid/src/main/res/values-uz/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-uz/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Search using deck name</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-ve/02-strings.xml b/AnkiDroid/src/main/res/values-ve/02-strings.xml
index a86dedce299e..02fc4162fc27 100644
--- a/AnkiDroid/src/main/res/values-ve/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ve/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Search using deck name</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-vi/02-strings.xml b/AnkiDroid/src/main/res/values-vi/02-strings.xml
index 6d2554db629f..3f8695852325 100644
--- a/AnkiDroid/src/main/res/values-vi/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-vi/02-strings.xml
@@ -183,6 +183,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Hình nền</string>
     <string name="choose_an_image" maxLength="41">Chọn một hình ảnh</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Gỡ bỏ nền?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Khôi phục mặc định</string>
@@ -256,7 +257,7 @@
     <string name="search_using_deck_name">Tìm kiếm theo tên bộ thẻ</string>
     <string name="external_storage_unavailable">Tải xuống bị hủy, bộ nhớ ngoài không khả dụng</string>
     <string name="home" maxLength="28">Trang chủ</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Các thẻ bị chôn</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-wo/02-strings.xml b/AnkiDroid/src/main/res/values-wo/02-strings.xml
index 373f381178cc..eca3a48f69ed 100644
--- a/AnkiDroid/src/main/res/values-wo/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-wo/02-strings.xml
@@ -183,6 +183,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -256,7 +257,7 @@
     <string name="search_using_deck_name">Search using deck name</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-xh/02-strings.xml b/AnkiDroid/src/main/res/values-xh/02-strings.xml
index a86dedce299e..02fc4162fc27 100644
--- a/AnkiDroid/src/main/res/values-xh/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-xh/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Search using deck name</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-yue/02-strings.xml b/AnkiDroid/src/main/res/values-yue/02-strings.xml
index a0ead5fa8a1e..f26a704271d3 100644
--- a/AnkiDroid/src/main/res/values-yue/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-yue/02-strings.xml
@@ -183,6 +183,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -256,7 +257,7 @@
     <string name="search_using_deck_name">Search using deck name</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml b/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml
index eae24efd5e4a..5c80660a22c0 100644
--- a/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml
@@ -183,6 +183,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">背景</string>
     <string name="choose_an_image" maxLength="41">选择图片</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">去除背景</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">恢复初始设置</string>
@@ -256,7 +257,7 @@
     <string name="search_using_deck_name">使用牌组名称搜索</string>
     <string name="external_storage_unavailable">下载中止，外部存储不可用</string>
     <string name="home" maxLength="28">主页</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">已搁置卡片</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-zh-rCN/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-zh-rCN/07-cardbrowser.xml
index 7df1b69bf56d..67bf154c2509 100644
--- a/AnkiDroid/src/main/res/values-zh-rCN/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-zh-rCN/07-cardbrowser.xml
@@ -112,5 +112,5 @@
     <string name="user_potential_columns">可用</string>
     <string name="include_column">包含列</string>
     <string name="exclude_column">排除列</string>
-    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
+    <string name="browser_find_replace_loading_fields">正在获取字段名&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-zh-rTW/02-strings.xml b/AnkiDroid/src/main/res/values-zh-rTW/02-strings.xml
index 2abb1392bb3f..8032b35fa83a 100644
--- a/AnkiDroid/src/main/res/values-zh-rTW/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-zh-rTW/02-strings.xml
@@ -183,6 +183,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">背景</string>
     <string name="choose_an_image" maxLength="41">選擇圖像</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">移除背景？</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">恢復預設值</string>
@@ -256,7 +257,7 @@
     <string name="search_using_deck_name">按卡片名字搜索</string>
     <string name="external_storage_unavailable">下載中止，外部儲存空間不可用</string>
     <string name="home" maxLength="28">首頁</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">卡片暫時隱藏。</string>
     <plurals name="note_suspended">
diff --git a/AnkiDroid/src/main/res/values-zu/02-strings.xml b/AnkiDroid/src/main/res/values-zu/02-strings.xml
index a86dedce299e..02fc4162fc27 100644
--- a/AnkiDroid/src/main/res/values-zu/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-zu/02-strings.xml
@@ -187,6 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
@@ -260,7 +261,7 @@
     <string name="search_using_deck_name">Search using deck name</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
     <string name="home" maxLength="28">Home</string>
-    <!-- Reviewer actions 
+    <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
     <plurals name="note_suspended">

From 90e086fb5291e8d8a8c3d6084af963f7b5341c7e Mon Sep 17 00:00:00 2001
From: Arthur Milchior <arthur@milchior.fr>
Date: Mon, 10 Mar 2025 02:56:34 +0100
Subject: [PATCH 102/200] NF: notetype stop having "tags"

So, there are many things going on simultaneously here.
First, we were adding an object of type "Tags" in the JSONObject. When
`toSTring()` is applied to it it leads to
"com.ichi2.libanki.Tags@c6ffb64", which caused this string to be added
to the note type's json.

Which actually was not an issue, because this value is never read
anywhere neither in AnkiDroid nor in anki.

I asked
https://forums.ankiweb.net/t/what-is-the-tags-in-notetype/56967 to
confirm my suspicion that this value used to be used, and is not
anymore.

I first considered editing the value so that the string of tags were
saved. But since nothing use it, it's easier to just delete
it. Anyway, if there was a need to update the notetype, the backend
could do it.
---
 AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt b/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt
index 836a5cf91f2d..c5c1aedde86a 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt
@@ -1193,7 +1193,6 @@ class NoteEditor :
         // adding current note to collection
         requireActivity().withProgress(resources.getString(R.string.saving_facts)) {
             undoableOp {
-                editorNote!!.notetype.put("tags", tags)
                 notetypes.save(editorNote!!.notetype)
                 addNote(editorNote!!, deckId)
             }

From fc0f8b6ad1f04d09947f1596456f5b7a1c13f9ea Mon Sep 17 00:00:00 2001
From: snowtimeglass <snowtimeglass@gmail.com>
Date: Tue, 11 Mar 2025 13:41:18 +0900
Subject: [PATCH 103/200] fix: whiteboard control icon & label do not match

For the "Toggle whiteboard" label in Controls settings page,
replace the current "Show/Hide whiteboard" icon with "Enable whiteboard" icon,
which is consistent with the control's actual action.
---
 AnkiDroid/src/main/res/xml/preferences_controls.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AnkiDroid/src/main/res/xml/preferences_controls.xml b/AnkiDroid/src/main/res/xml/preferences_controls.xml
index f620c1889083..13a20aa91f3e 100644
--- a/AnkiDroid/src/main/res/xml/preferences_controls.xml
+++ b/AnkiDroid/src/main/res/xml/preferences_controls.xml
@@ -233,7 +233,7 @@
         <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/toggle_whiteboard_command_key"
             android:title="@string/gesture_toggle_whiteboard"
-            android:icon="@drawable/ic_gesture_white"
+            android:icon="@drawable/ic_enable_whiteboard"
             />
         <com.ichi2.preferences.ReviewerControlPreference
             android:key="@string/clear_whiteboard_command_key"

From 846015c72c8c269c35bcec35352d0ee5c74f75de Mon Sep 17 00:00:00 2001
From: rahul31124 <rdass87871@gmail.com>
Date: Wed, 12 Mar 2025 21:01:26 +0530
Subject: [PATCH 104/200] Fix TODO mentioned in the deleteCardTemplate and d
 eletionWouldOrphanNote by replacing the usage of getColUnsafe with withCol.
 Migrating to withCol ensures safer access to the Collection

---
 .../java/com/ichi2/anki/CardTemplateEditor.kt | 55 ++++++++++---------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateEditor.kt b/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateEditor.kt
index 0ea93268d586..6aa835bceb84 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateEditor.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateEditor.kt
@@ -49,6 +49,7 @@ import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.FragmentContainerView
 import androidx.fragment.app.commitNow
 import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
 import androidx.viewpager2.adapter.FragmentStateAdapter
 import androidx.viewpager2.widget.ViewPager2
 import anki.notetypes.StockNotetype
@@ -101,6 +102,7 @@ import com.ichi2.utils.KotlinCleanup
 import com.ichi2.utils.copyToClipboard
 import com.ichi2.utils.listItems
 import com.ichi2.utils.show
+import kotlinx.coroutines.launch
 import net.ankiweb.rsdroid.Translations
 import org.json.JSONArray
 import org.json.JSONException
@@ -764,32 +766,32 @@ open class CardTemplateEditor :
             )
         }
 
-        // TODO: Use withCol {} instead
         fun deleteCardTemplate() {
-            val col = templateEditor.getColUnsafe
-            val tempModel = templateEditor.tempModel
-            val ordinal = templateEditor.viewPager.currentItem
-            val template = tempModel!!.getTemplate(ordinal)
-            // Don't do anything if only one template
-            if (tempModel.templateCount < 2) {
-                templateEditor.showSimpleMessageDialog(resources.getString(R.string.card_template_editor_cant_delete))
-                return
-            }
-
-            if (deletionWouldOrphanNote(col, tempModel, ordinal)) {
-                showOrphanNoteDialog()
-                return
-            }
+            templateEditor.lifecycleScope.launch {
+                val tempModel = templateEditor.tempModel
+                val ordinal = templateEditor.viewPager.currentItem
+                val template = tempModel!!.getTemplate(ordinal)
+                // Don't do anything if only one template
+                if (tempModel.templateCount < 2) {
+                    templateEditor.showSimpleMessageDialog(resources.getString(R.string.card_template_editor_cant_delete))
+                    return@launch
+                }
 
-            // Show confirmation dialog
-            val numAffectedCards =
-                if (!CardTemplateNotetype.isOrdinalPendingAdd(tempModel, ordinal)) {
-                    Timber.d("Ordinal is not a pending add, so we'll get the current card count for confirmation")
-                    col.notetypes.tmplUseCount(tempModel.notetype, ordinal)
-                } else {
-                    0
+                if (deletionWouldOrphanNote(tempModel, ordinal)) {
+                    showOrphanNoteDialog()
+                    return@launch
                 }
-            confirmDeleteCards(template, tempModel.notetype, numAffectedCards)
+
+                // Show confirmation dialog
+                val numAffectedCards =
+                    if (!CardTemplateNotetype.isOrdinalPendingAdd(tempModel, ordinal)) {
+                        Timber.d("Ordinal is not a pending add, so we'll get the current card count for confirmation")
+                        withCol { notetypes.tmplUseCount(tempModel.notetype, ordinal) }
+                    } else {
+                        0
+                    }
+                confirmDeleteCards(template, tempModel.notetype, numAffectedCards)
+            }
         }
 
         /* showOrphanNoteDialog shows a AlertDialog if the deletionWouldOrphanNote returns true
@@ -1115,8 +1117,7 @@ open class CardTemplateEditor :
             return requireArguments().getInt(CARD_INDEX)
         }
 
-        private fun deletionWouldOrphanNote(
-            col: Collection,
+        private suspend fun deletionWouldOrphanNote(
             tempModel: CardTemplateNotetype?,
             position: Int,
         ): Boolean {
@@ -1128,8 +1129,8 @@ open class CardTemplateEditor :
             // pending deletes could orphan cards
             if (!CardTemplateNotetype.isOrdinalPendingAdd(tempModel!!, position)) {
                 val currentDeletes = tempModel.getDeleteDbOrds(position)
-                // TODO - this is a SQL query on GUI thread - should see a DeckTask conversion ideally
-                if (col.notetypes.getCardIdsForModel(tempModel.modelId, currentDeletes) == null) {
+                val cardIds = withCol { notetypes.getCardIdsForModel(tempModel.modelId, currentDeletes) }
+                if (cardIds == null) {
                     // It is possible but unlikely that a user has an in-memory template addition that would
                     // generate cards making the deletion safe, but we don't handle that. All users who do
                     // not already have cards generated making it safe will see this error message:

From 5eba6fd0c0218891733dbbe9896909c05d57ac1b Mon Sep 17 00:00:00 2001
From: AnkiDroid Translations <ankidroid@ankidroid.org>
Date: Thu, 13 Mar 2025 12:20:02 +0000
Subject: [PATCH 105/200] Updated strings from Crowdin

---
 AnkiDroid/src/main/res/values-cs/02-strings.xml         | 6 +++---
 AnkiDroid/src/main/res/values-cs/03-dialogs.xml         | 4 ++--
 AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-pt-rPT/07-cardbrowser.xml | 2 +-
 AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml     | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/AnkiDroid/src/main/res/values-cs/02-strings.xml b/AnkiDroid/src/main/res/values-cs/02-strings.xml
index aa188a26dfb7..d6aa50bb75e0 100644
--- a/AnkiDroid/src/main/res/values-cs/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-cs/02-strings.xml
@@ -195,7 +195,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Pozadí</string>
     <string name="choose_an_image" maxLength="41">Vybrat obrázek</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41"> Odebrat pozadí</string>
     <string name="remove_background_image">Odebrat pozadí?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Obnovit výchozí</string>
@@ -351,14 +351,14 @@
     <!--Keyboard shortcuts dialog-->
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Výběr balíčků</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
-    <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
+    <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Editor Paznámek</string>
     <string name="select_deck" comment="Description of the shortcut that opens the deck selection dialog">Select deck</string>
     <string name="select_note_type" comment="Description of the shortcut that shows the note selection spinner">Select note type</string>
     <string name="tag_editor" comment="Description of the shortcut that opens the tags dialog">Tag editor</string>
     <string name="card_template_editor_group" comment="Label for the group of shortcuts related to the card template editor">Card Template Editor</string>
     <string name="edit_front_template" comment="Description of the shortcut that shows the question side of the card template">Edit front template</string>
     <string name="edit_back_template" comment="Description of the shortcut that shows the answer side of the card template">Edit back template</string>
-    <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
+    <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Upravit formátování </string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">Akce uživatele %s není v tomto typu poznámky nastavena. Nakonfigurujte ji prosím</string>
diff --git a/AnkiDroid/src/main/res/values-cs/03-dialogs.xml b/AnkiDroid/src/main/res/values-cs/03-dialogs.xml
index bd452b6e6062..c1a511b8c5a7 100644
--- a/AnkiDroid/src/main/res/values-cs/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-cs/03-dialogs.xml
@@ -253,11 +253,11 @@
     <!-- Instant Note Editor -->
     <string name="cloze_note_required">Cloze Type Note Required</string>
     <string name="cloze_not_found_message">No Cloze type note found, open the Note Editor or try again after adding a Cloze type note.</string>
-    <string name="open">Open</string>
+    <string name="open">Otevřít</string>
     <string name="change_cloze_number">Change cloze number</string>
     <string name="cloze_number">Cloze number:</string>
     <string name="change_editor_mode">Change editor mode</string>
-    <string name="open_note_editor">Open note editor</string>
+    <string name="open_note_editor">Otevřít editor poznámek</string>
     <string name="change_cloze_mode">Change cloze mode</string>
     <!-- Outdated WebView dialog -->
     <string name="webview_update_message">Systémový WebView je zastaralý. Některé funkce nebudou fungovat správně. Aktualizujte jej prosím.\n\nNainstalovaná verze: %1$d\nMinimální požadovaná verze: %2$d</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml b/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml
index 9c5f2117fd48..7a73abb67dbf 100644
--- a/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Fundo</string>
     <string name="choose_an_image" maxLength="41">Selecionar imagem</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remover imagem de fundo</string>
     <string name="remove_background_image">Remover imagem de fundo?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restaurar predefinições</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rPT/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-pt-rPT/07-cardbrowser.xml
index 6dc423712a20..90720ff7d6de 100644
--- a/AnkiDroid/src/main/res/values-pt-rPT/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-pt-rPT/07-cardbrowser.xml
@@ -118,5 +118,5 @@
     <string name="user_potential_columns">Disponíveis</string>
     <string name="include_column">Incluir coluna</string>
     <string name="exclude_column">Excluir coluna</string>
-    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
+    <string name="browser_find_replace_loading_fields">A recuperar os nomes dos campos&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml b/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml
index 5c80660a22c0..30d4895358d8 100644
--- a/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml
@@ -183,7 +183,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">背景</string>
     <string name="choose_an_image" maxLength="41">选择图片</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">删除背景</string>
     <string name="remove_background_image">去除背景</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">恢复初始设置</string>

From 29f6134f7029b3619c13dade9d5f8a6133140ed4 Mon Sep 17 00:00:00 2001
From: snowtimeglass <snowtimeglass@gmail.com>
Date: Thu, 13 Mar 2025 19:31:39 +0900
Subject: [PATCH 106/200] minor fix: remove extra space in a newer string

Remove an extra space in a recently added string for https://github.com/ankidroid/Anki-Android/pull/18071
---
 AnkiDroid/src/main/res/values/02-strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AnkiDroid/src/main/res/values/02-strings.xml b/AnkiDroid/src/main/res/values/02-strings.xml
index 569449625678..697bc4e88099 100644
--- a/AnkiDroid/src/main/res/values/02-strings.xml
+++ b/AnkiDroid/src/main/res/values/02-strings.xml
@@ -176,7 +176,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>

From f0f43af555e817accac742808d342d59f551c701 Mon Sep 17 00:00:00 2001
From: AnkiDroid Translations <ankidroid@ankidroid.org>
Date: Thu, 13 Mar 2025 16:36:28 +0000
Subject: [PATCH 107/200] Updated strings from Crowdin

---
 AnkiDroid/src/main/res/values-af/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-am/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-ar/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-az/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-be/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-bg/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-bn/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-ca/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-ckb/02-strings.xml    | 2 +-
 AnkiDroid/src/main/res/values-cs/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-da/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-de/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-el/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-eo/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-es-rAR/02-strings.xml | 2 +-
 AnkiDroid/src/main/res/values-es-rES/02-strings.xml | 2 +-
 AnkiDroid/src/main/res/values-et/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-eu/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-fa/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-fi/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-fil/02-strings.xml    | 2 +-
 AnkiDroid/src/main/res/values-fr/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-fy/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-ga/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-gl/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-got/02-strings.xml    | 2 +-
 AnkiDroid/src/main/res/values-gu/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-heb/02-strings.xml    | 2 +-
 AnkiDroid/src/main/res/values-hi/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-hr/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-hu/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-hy/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-ind/02-strings.xml    | 2 +-
 AnkiDroid/src/main/res/values-is/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-it/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-iw/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-ja/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-jv/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-ka/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-kk/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-km/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-kn/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-ko/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-ku/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-ky/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-lt/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-lv/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-mk/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-ml/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-mn/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-mr/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-ms/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-my/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-nl/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-nn/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-no/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-or/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-pa/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-pl/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml | 2 +-
 AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml | 2 +-
 AnkiDroid/src/main/res/values-ro/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-ru/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-sat/02-strings.xml    | 2 +-
 AnkiDroid/src/main/res/values-sc/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-sk/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-sl/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-sq/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-sr/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-ss/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-sv/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-sw/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-ta/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-te/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-tg/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-tgl/02-strings.xml    | 2 +-
 AnkiDroid/src/main/res/values-th/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-ti/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-tn/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-tr/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-ts/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-tt/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-ug/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-uk/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-ur/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-uz/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-ve/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-vi/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-wo/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-xh/02-strings.xml     | 2 +-
 AnkiDroid/src/main/res/values-yue/02-strings.xml    | 2 +-
 AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml | 2 +-
 AnkiDroid/src/main/res/values-zh-rTW/02-strings.xml | 2 +-
 AnkiDroid/src/main/res/values-zu/02-strings.xml     | 2 +-
 94 files changed, 94 insertions(+), 94 deletions(-)

diff --git a/AnkiDroid/src/main/res/values-af/02-strings.xml b/AnkiDroid/src/main/res/values-af/02-strings.xml
index c0256726a687..f84627990a97 100644
--- a/AnkiDroid/src/main/res/values-af/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-af/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Agtergrond</string>
     <string name="choose_an_image" maxLength="41">Kies beeld</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Verwyder agtergrond?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Herstel Standaard</string>
diff --git a/AnkiDroid/src/main/res/values-am/02-strings.xml b/AnkiDroid/src/main/res/values-am/02-strings.xml
index 02fc4162fc27..d3c686c3bb2f 100644
--- a/AnkiDroid/src/main/res/values-am/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-am/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
diff --git a/AnkiDroid/src/main/res/values-ar/02-strings.xml b/AnkiDroid/src/main/res/values-ar/02-strings.xml
index 739249209c82..ef742e33d0b5 100644
--- a/AnkiDroid/src/main/res/values-ar/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ar/02-strings.xml
@@ -203,7 +203,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">خلفية</string>
     <string name="choose_an_image" maxLength="41">اختيار صورة</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">هل تريد إزالة الخلفية؟</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">استعادة الافتراضي</string>
diff --git a/AnkiDroid/src/main/res/values-az/02-strings.xml b/AnkiDroid/src/main/res/values-az/02-strings.xml
index 1ca5328f2113..28e0288f1569 100644
--- a/AnkiDroid/src/main/res/values-az/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-az/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
diff --git a/AnkiDroid/src/main/res/values-be/02-strings.xml b/AnkiDroid/src/main/res/values-be/02-strings.xml
index 2b9011475cee..772cf506039a 100644
--- a/AnkiDroid/src/main/res/values-be/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-be/02-strings.xml
@@ -195,7 +195,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Фон</string>
     <string name="choose_an_image" maxLength="41">Выберыце відарыс</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Выдаліць фон?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Вярнуцца да прадвызначаных</string>
diff --git a/AnkiDroid/src/main/res/values-bg/02-strings.xml b/AnkiDroid/src/main/res/values-bg/02-strings.xml
index 4a7869e7e494..5f4fbe86fed0 100644
--- a/AnkiDroid/src/main/res/values-bg/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-bg/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Фон</string>
     <string name="choose_an_image" maxLength="41">Изберете изображение</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Възстанови по подразбиране</string>
diff --git a/AnkiDroid/src/main/res/values-bn/02-strings.xml b/AnkiDroid/src/main/res/values-bn/02-strings.xml
index e24dd949e705..0664676cb3a5 100644
--- a/AnkiDroid/src/main/res/values-bn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-bn/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">পটভূমি</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">পটভূমি সরান?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">ডিফল্ট পুনরুদ্ধার করুন</string>
diff --git a/AnkiDroid/src/main/res/values-ca/02-strings.xml b/AnkiDroid/src/main/res/values-ca/02-strings.xml
index 4a9f4b5dec96..5ba93670e8e1 100644
--- a/AnkiDroid/src/main/res/values-ca/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ca/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Fons</string>
     <string name="choose_an_image" maxLength="41">Selecciona una imatge</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Elimina el fons</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restaura els valors per defecte</string>
diff --git a/AnkiDroid/src/main/res/values-ckb/02-strings.xml b/AnkiDroid/src/main/res/values-ckb/02-strings.xml
index 1697472cfbe9..2b293d912ddc 100644
--- a/AnkiDroid/src/main/res/values-ckb/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ckb/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">وێنەیەک هەڵبژێرە</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
diff --git a/AnkiDroid/src/main/res/values-cs/02-strings.xml b/AnkiDroid/src/main/res/values-cs/02-strings.xml
index d6aa50bb75e0..077c692dab2c 100644
--- a/AnkiDroid/src/main/res/values-cs/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-cs/02-strings.xml
@@ -195,7 +195,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Pozadí</string>
     <string name="choose_an_image" maxLength="41">Vybrat obrázek</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Odebrat pozadí</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Odebrat pozadí?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Obnovit výchozí</string>
diff --git a/AnkiDroid/src/main/res/values-da/02-strings.xml b/AnkiDroid/src/main/res/values-da/02-strings.xml
index c20867ea72db..45fb462a9dca 100644
--- a/AnkiDroid/src/main/res/values-da/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-da/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Baggrund</string>
     <string name="choose_an_image" maxLength="41">Vælg billede</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Fjern baggrund?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Gendan standardindstillinger</string>
diff --git a/AnkiDroid/src/main/res/values-de/02-strings.xml b/AnkiDroid/src/main/res/values-de/02-strings.xml
index 8e1bff6b5687..bb0dd039df32 100644
--- a/AnkiDroid/src/main/res/values-de/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-de/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Hintergrund</string>
     <string name="choose_an_image" maxLength="41">Bild auswählen</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Hintergrund entfernen?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Standard wiederherstellen</string>
diff --git a/AnkiDroid/src/main/res/values-el/02-strings.xml b/AnkiDroid/src/main/res/values-el/02-strings.xml
index 9be7ebc38b59..7e85cb05b044 100644
--- a/AnkiDroid/src/main/res/values-el/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-el/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Φόντο</string>
     <string name="choose_an_image" maxLength="41">Επιλέξτε εικόνα</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Αφαίρεση ταπετσαρίας;</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Επαναφορά προεπιλογής</string>
diff --git a/AnkiDroid/src/main/res/values-eo/02-strings.xml b/AnkiDroid/src/main/res/values-eo/02-strings.xml
index c557791e45b7..aa07e30f0f65 100644
--- a/AnkiDroid/src/main/res/values-eo/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-eo/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Fono</string>
     <string name="choose_an_image" maxLength="41">Elekti bildon</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Ĉu forigi fonon?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restarigi implicitajn</string>
diff --git a/AnkiDroid/src/main/res/values-es-rAR/02-strings.xml b/AnkiDroid/src/main/res/values-es-rAR/02-strings.xml
index 2ddc4c69c500..133d7211ce16 100644
--- a/AnkiDroid/src/main/res/values-es-rAR/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-es-rAR/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Fondo</string>
     <string name="choose_an_image" maxLength="41">Elige una imagen</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">¿Quitar fondo?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restablecer Predefinidos</string>
diff --git a/AnkiDroid/src/main/res/values-es-rES/02-strings.xml b/AnkiDroid/src/main/res/values-es-rES/02-strings.xml
index 623f1600e52a..0e6b60ca08f4 100644
--- a/AnkiDroid/src/main/res/values-es-rES/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-es-rES/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Fondo</string>
     <string name="choose_an_image" maxLength="41">Elige una imagen</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">¿Quitar fondo?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restablecer Predefinidos</string>
diff --git a/AnkiDroid/src/main/res/values-et/02-strings.xml b/AnkiDroid/src/main/res/values-et/02-strings.xml
index 8f127cb738ee..36e5748b0c10 100644
--- a/AnkiDroid/src/main/res/values-et/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-et/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
diff --git a/AnkiDroid/src/main/res/values-eu/02-strings.xml b/AnkiDroid/src/main/res/values-eu/02-strings.xml
index bf2a910ffb0e..91442992839b 100644
--- a/AnkiDroid/src/main/res/values-eu/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-eu/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
diff --git a/AnkiDroid/src/main/res/values-fa/02-strings.xml b/AnkiDroid/src/main/res/values-fa/02-strings.xml
index f02271124420..1ed75b6e6bed 100644
--- a/AnkiDroid/src/main/res/values-fa/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fa/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">پس زمینه</string>
     <string name="choose_an_image" maxLength="41">انتخاب تصویر</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">حذف پس‌زمینه؟</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">بازنشانی پیش‌فرض</string>
diff --git a/AnkiDroid/src/main/res/values-fi/02-strings.xml b/AnkiDroid/src/main/res/values-fi/02-strings.xml
index 8e381bcf9063..743c9354a6d0 100644
--- a/AnkiDroid/src/main/res/values-fi/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fi/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Tausta</string>
     <string name="choose_an_image" maxLength="41">Valitse kuva</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Poistetaanko tausta?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Palauta oletusarvot</string>
diff --git a/AnkiDroid/src/main/res/values-fil/02-strings.xml b/AnkiDroid/src/main/res/values-fil/02-strings.xml
index 7d4df06dbb1a..9f2a6389b970 100644
--- a/AnkiDroid/src/main/res/values-fil/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fil/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Likuran</string>
     <string name="choose_an_image" maxLength="41">Pumili ng Litrato</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Tanggalin ang background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Ibalik sa Default</string>
diff --git a/AnkiDroid/src/main/res/values-fr/02-strings.xml b/AnkiDroid/src/main/res/values-fr/02-strings.xml
index 230bdfe392e2..e3a00af704c7 100644
--- a/AnkiDroid/src/main/res/values-fr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fr/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Arrière-plan</string>
     <string name="choose_an_image" maxLength="41">Sélectionner une image</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Retirer l\'arrière-plan ?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Rétablir par défaut</string>
diff --git a/AnkiDroid/src/main/res/values-fy/02-strings.xml b/AnkiDroid/src/main/res/values-fy/02-strings.xml
index 638246ca0974..d066c3e6e9d0 100644
--- a/AnkiDroid/src/main/res/values-fy/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fy/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
diff --git a/AnkiDroid/src/main/res/values-ga/02-strings.xml b/AnkiDroid/src/main/res/values-ga/02-strings.xml
index a78b12b43729..3773915615c1 100644
--- a/AnkiDroid/src/main/res/values-ga/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ga/02-strings.xml
@@ -199,7 +199,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
diff --git a/AnkiDroid/src/main/res/values-gl/02-strings.xml b/AnkiDroid/src/main/res/values-gl/02-strings.xml
index e095edc4d5d3..fc1a00e8a56e 100644
--- a/AnkiDroid/src/main/res/values-gl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-gl/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
diff --git a/AnkiDroid/src/main/res/values-got/02-strings.xml b/AnkiDroid/src/main/res/values-got/02-strings.xml
index 223ef97094d7..ec86ba08a56e 100644
--- a/AnkiDroid/src/main/res/values-got/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-got/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
diff --git a/AnkiDroid/src/main/res/values-gu/02-strings.xml b/AnkiDroid/src/main/res/values-gu/02-strings.xml
index 7502ca9bedd9..14970fc644f5 100644
--- a/AnkiDroid/src/main/res/values-gu/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-gu/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">પૃષ્ઠભૂમિ</string>
     <string name="choose_an_image" maxLength="41">છબી પસંદ કરો</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">પૃષ્ઠભૂમિ દૂર કરીએ?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">મૂળભૂત પુનઃસ્થાપિત</string>
diff --git a/AnkiDroid/src/main/res/values-heb/02-strings.xml b/AnkiDroid/src/main/res/values-heb/02-strings.xml
index 60402e68a43f..99f62f4597b0 100644
--- a/AnkiDroid/src/main/res/values-heb/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-heb/02-strings.xml
@@ -195,7 +195,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">רקע</string>
     <string name="choose_an_image" maxLength="41">נא לבחור תמונה</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">להסיר רקע?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">שחזור בררת המחדל</string>
diff --git a/AnkiDroid/src/main/res/values-hi/02-strings.xml b/AnkiDroid/src/main/res/values-hi/02-strings.xml
index e602bd4b635d..4ecb5f975383 100644
--- a/AnkiDroid/src/main/res/values-hi/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-hi/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">पृष्ठभूमि</string>
     <string name="choose_an_image" maxLength="41">चित्र चुनें</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">पृष्ठभूमि निकालें?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">पहले जैसा कर देना</string>
diff --git a/AnkiDroid/src/main/res/values-hr/02-strings.xml b/AnkiDroid/src/main/res/values-hr/02-strings.xml
index 542c46a72304..bb07610f22c3 100644
--- a/AnkiDroid/src/main/res/values-hr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-hr/02-strings.xml
@@ -191,7 +191,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
diff --git a/AnkiDroid/src/main/res/values-hu/02-strings.xml b/AnkiDroid/src/main/res/values-hu/02-strings.xml
index 8aa0ec5b2634..2193f5fb70da 100644
--- a/AnkiDroid/src/main/res/values-hu/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-hu/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Háttér</string>
     <string name="choose_an_image" maxLength="41">Válasszon egy képet</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Alaphelyzetbe állítás</string>
diff --git a/AnkiDroid/src/main/res/values-hy/02-strings.xml b/AnkiDroid/src/main/res/values-hy/02-strings.xml
index 8291704b6c35..8c9d505c0f41 100644
--- a/AnkiDroid/src/main/res/values-hy/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-hy/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
diff --git a/AnkiDroid/src/main/res/values-ind/02-strings.xml b/AnkiDroid/src/main/res/values-ind/02-strings.xml
index 8b8d606f3a48..a54bf0ed2a75 100644
--- a/AnkiDroid/src/main/res/values-ind/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ind/02-strings.xml
@@ -183,7 +183,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Latar belakang</string>
     <string name="choose_an_image" maxLength="41">Pilih gambar</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Hapus latar belakang?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Kembalikan ke baku</string>
diff --git a/AnkiDroid/src/main/res/values-is/02-strings.xml b/AnkiDroid/src/main/res/values-is/02-strings.xml
index 02fc4162fc27..d3c686c3bb2f 100644
--- a/AnkiDroid/src/main/res/values-is/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-is/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
diff --git a/AnkiDroid/src/main/res/values-it/02-strings.xml b/AnkiDroid/src/main/res/values-it/02-strings.xml
index 845d91db62f4..133345091a8c 100644
--- a/AnkiDroid/src/main/res/values-it/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-it/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Sfondo</string>
     <string name="choose_an_image" maxLength="41">Scegli un\'immagine</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Rimuovere lo sfondo?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Ripristina predefiniti</string>
diff --git a/AnkiDroid/src/main/res/values-iw/02-strings.xml b/AnkiDroid/src/main/res/values-iw/02-strings.xml
index 60402e68a43f..99f62f4597b0 100644
--- a/AnkiDroid/src/main/res/values-iw/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-iw/02-strings.xml
@@ -195,7 +195,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">רקע</string>
     <string name="choose_an_image" maxLength="41">נא לבחור תמונה</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">להסיר רקע?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">שחזור בררת המחדל</string>
diff --git a/AnkiDroid/src/main/res/values-ja/02-strings.xml b/AnkiDroid/src/main/res/values-ja/02-strings.xml
index d4049f07ac97..b7df2a545ff6 100644
--- a/AnkiDroid/src/main/res/values-ja/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ja/02-strings.xml
@@ -183,7 +183,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">デッキリスト画面の背景</string>
     <string name="choose_an_image" maxLength="41">画像を選択</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">背景画像を削除しますか？</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">既定値に戻す</string>
diff --git a/AnkiDroid/src/main/res/values-jv/02-strings.xml b/AnkiDroid/src/main/res/values-jv/02-strings.xml
index 7a28cb737f55..18b51e859232 100644
--- a/AnkiDroid/src/main/res/values-jv/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-jv/02-strings.xml
@@ -183,7 +183,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
diff --git a/AnkiDroid/src/main/res/values-ka/02-strings.xml b/AnkiDroid/src/main/res/values-ka/02-strings.xml
index 10a15e215425..03d405cd5529 100644
--- a/AnkiDroid/src/main/res/values-ka/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ka/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">ფონი</string>
     <string name="choose_an_image" maxLength="41">სურათის არჩევა</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">გსურთ ფონის წაშლა?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">ნაგულისხმევის აღდგენა</string>
diff --git a/AnkiDroid/src/main/res/values-kk/02-strings.xml b/AnkiDroid/src/main/res/values-kk/02-strings.xml
index 02fc4162fc27..d3c686c3bb2f 100644
--- a/AnkiDroid/src/main/res/values-kk/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-kk/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
diff --git a/AnkiDroid/src/main/res/values-km/02-strings.xml b/AnkiDroid/src/main/res/values-km/02-strings.xml
index 3f5fb696fcd7..20586fe7adbf 100644
--- a/AnkiDroid/src/main/res/values-km/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-km/02-strings.xml
@@ -183,7 +183,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">ផ្ទៃខាងក្រោយ</string>
     <string name="choose_an_image" maxLength="41">ជ្រើសរើសរូបភាព</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">ដកផ្ទៃខាងក្រោយចេញ?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">ស្តារលំនាំដើមឡើងវិញ</string>
diff --git a/AnkiDroid/src/main/res/values-kn/02-strings.xml b/AnkiDroid/src/main/res/values-kn/02-strings.xml
index b3f59d932f12..2ae278f8d1c4 100644
--- a/AnkiDroid/src/main/res/values-kn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-kn/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">ಹಿನ್ನೆಲೆ</string>
     <string name="choose_an_image" maxLength="41">ಚಿತ್ರವನ್ನು ಆರಿಸಿ</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">ಹಿನ್ನೆಲೆ ತೆಗೆದುಹಾಕುವುದೇ?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">ಡೀಫಾಲ್ಟ್ ಅನ್ನು ಮರುಸ್ಥಾಪಿಸಿ</string>
diff --git a/AnkiDroid/src/main/res/values-ko/02-strings.xml b/AnkiDroid/src/main/res/values-ko/02-strings.xml
index 9e0873aaceef..714a277b980a 100644
--- a/AnkiDroid/src/main/res/values-ko/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ko/02-strings.xml
@@ -186,7 +186,7 @@ Context | Request Context    [1]</string>
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">배경</string>
     <string name="choose_an_image" maxLength="41">이미지 선택</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">배경을 제거하시겠습니까?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">기본값 복원</string>
diff --git a/AnkiDroid/src/main/res/values-ku/02-strings.xml b/AnkiDroid/src/main/res/values-ku/02-strings.xml
index ec3e6b2832b2..6914736c4005 100644
--- a/AnkiDroid/src/main/res/values-ku/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ku/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
diff --git a/AnkiDroid/src/main/res/values-ky/02-strings.xml b/AnkiDroid/src/main/res/values-ky/02-strings.xml
index 02fc4162fc27..d3c686c3bb2f 100644
--- a/AnkiDroid/src/main/res/values-ky/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ky/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
diff --git a/AnkiDroid/src/main/res/values-lt/02-strings.xml b/AnkiDroid/src/main/res/values-lt/02-strings.xml
index 709e0dedb02f..6aeac886b899 100644
--- a/AnkiDroid/src/main/res/values-lt/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-lt/02-strings.xml
@@ -195,7 +195,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Fonas</string>
     <string name="choose_an_image" maxLength="41">Pasirinkite paveikslėlį</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
diff --git a/AnkiDroid/src/main/res/values-lv/02-strings.xml b/AnkiDroid/src/main/res/values-lv/02-strings.xml
index 37a4227a1d73..81183e2c2b10 100644
--- a/AnkiDroid/src/main/res/values-lv/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-lv/02-strings.xml
@@ -191,7 +191,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
diff --git a/AnkiDroid/src/main/res/values-mk/02-strings.xml b/AnkiDroid/src/main/res/values-mk/02-strings.xml
index f8da9bdc3c65..f3403fbce26b 100644
--- a/AnkiDroid/src/main/res/values-mk/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-mk/02-strings.xml
@@ -188,7 +188,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
diff --git a/AnkiDroid/src/main/res/values-ml/02-strings.xml b/AnkiDroid/src/main/res/values-ml/02-strings.xml
index 050b87e2aaf4..da98f33c2ed4 100644
--- a/AnkiDroid/src/main/res/values-ml/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ml/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">ഒരു ചിത്രം തിരഞ്ഞെടുക്കുക</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">പശ്ചാത്തലം നീക്കം ചെയ്യണോ?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">നേരത്തെയുള്ളത് പുനസ്ഥാപിക്കുക</string>
diff --git a/AnkiDroid/src/main/res/values-mn/02-strings.xml b/AnkiDroid/src/main/res/values-mn/02-strings.xml
index 414fae1beb6a..7dd499cceb40 100644
--- a/AnkiDroid/src/main/res/values-mn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-mn/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Өгөгдмөл горим руу шилжих</string>
diff --git a/AnkiDroid/src/main/res/values-mr/02-strings.xml b/AnkiDroid/src/main/res/values-mr/02-strings.xml
index 8ac1d17b537e..d167b4c59ed1 100644
--- a/AnkiDroid/src/main/res/values-mr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-mr/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">पार्श्वभूमी</string>
     <string name="choose_an_image" maxLength="41">प्रतिमा निवडा</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">पार्श्वभूमी काढायची?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">डीफॉल्ट पुनर्संचयित करा</string>
diff --git a/AnkiDroid/src/main/res/values-ms/02-strings.xml b/AnkiDroid/src/main/res/values-ms/02-strings.xml
index f2bf28195ca3..7d315fa1fa46 100644
--- a/AnkiDroid/src/main/res/values-ms/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ms/02-strings.xml
@@ -183,7 +183,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Latar belakang</string>
     <string name="choose_an_image" maxLength="41">Pilih gambar</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Pulih Lalai</string>
diff --git a/AnkiDroid/src/main/res/values-my/02-strings.xml b/AnkiDroid/src/main/res/values-my/02-strings.xml
index eca3a48f69ed..2d506f269e4d 100644
--- a/AnkiDroid/src/main/res/values-my/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-my/02-strings.xml
@@ -183,7 +183,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
diff --git a/AnkiDroid/src/main/res/values-nl/02-strings.xml b/AnkiDroid/src/main/res/values-nl/02-strings.xml
index 977135f1cd9f..9adc0b8c975e 100644
--- a/AnkiDroid/src/main/res/values-nl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-nl/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Achtergrond</string>
     <string name="choose_an_image" maxLength="41">Kies een afbeelding</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Achtergrond verwijderen?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Herstel Standaardinstellingen</string>
diff --git a/AnkiDroid/src/main/res/values-nn/02-strings.xml b/AnkiDroid/src/main/res/values-nn/02-strings.xml
index 4c072f678209..931c04a9c904 100644
--- a/AnkiDroid/src/main/res/values-nn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-nn/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Bakgrunn</string>
     <string name="choose_an_image" maxLength="41">Velg bilde</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
diff --git a/AnkiDroid/src/main/res/values-no/02-strings.xml b/AnkiDroid/src/main/res/values-no/02-strings.xml
index 0d34226281e2..ffe2c9e632bc 100644
--- a/AnkiDroid/src/main/res/values-no/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-no/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Bakgrunn</string>
     <string name="choose_an_image" maxLength="41">Velg bilde</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
diff --git a/AnkiDroid/src/main/res/values-or/02-strings.xml b/AnkiDroid/src/main/res/values-or/02-strings.xml
index c904ace04630..b67a7cad4cfc 100644
--- a/AnkiDroid/src/main/res/values-or/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-or/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">ପୃଷ୍ଠପଟ</string>
     <string name="choose_an_image" maxLength="41">ଛବି ବାଛନ୍ତୁ</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">ପୃଷ୍ଠପଟ ଅପସାରଣ କରିବେ ତ?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">ଡିଫଲ୍ଟ ପୁନଃସ୍ଥାପନ କରନ୍ତୁ</string>
diff --git a/AnkiDroid/src/main/res/values-pa/02-strings.xml b/AnkiDroid/src/main/res/values-pa/02-strings.xml
index 2e85c9fa5b96..a62e834dbf7a 100644
--- a/AnkiDroid/src/main/res/values-pa/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-pa/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">ਪਿਛੋਕੜ</string>
     <string name="choose_an_image" maxLength="41">ਚਿੱਤਰ ਨੂੰ ਚੁਣੋ</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">ਕੀ ਪਿਛੋਕੜ ਨੂੰ ਹਟਾਉਣਾ ਹੈ?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">ਡਿਫੌਲਟ ਰੀਸਟੋਰ ਕਰੋ</string>
diff --git a/AnkiDroid/src/main/res/values-pl/02-strings.xml b/AnkiDroid/src/main/res/values-pl/02-strings.xml
index 69c9d4ee1137..9c6e6faa536a 100644
--- a/AnkiDroid/src/main/res/values-pl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-pl/02-strings.xml
@@ -195,7 +195,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Tło</string>
     <string name="choose_an_image" maxLength="41">Wybierz obraz</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Usunąć tło?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Przywróć domyślne</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml b/AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml
index a600bd80d4a3..d057cb94269f 100644
--- a/AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Plano de fundo</string>
     <string name="choose_an_image" maxLength="41">Escolha uma imagem</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remover fundo?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restaurar Padrões</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml b/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml
index 7a73abb67dbf..6201d9b14079 100644
--- a/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Fundo</string>
     <string name="choose_an_image" maxLength="41">Selecionar imagem</string>
-    <string name="remove_wallpaper_image" maxLength="41">Remover imagem de fundo</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remover imagem de fundo?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restaurar predefinições</string>
diff --git a/AnkiDroid/src/main/res/values-ro/02-strings.xml b/AnkiDroid/src/main/res/values-ro/02-strings.xml
index d70c5d36084b..8cf9db49e352 100644
--- a/AnkiDroid/src/main/res/values-ro/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ro/02-strings.xml
@@ -191,7 +191,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
diff --git a/AnkiDroid/src/main/res/values-ru/02-strings.xml b/AnkiDroid/src/main/res/values-ru/02-strings.xml
index 3a9eed698415..5c97e93b4988 100644
--- a/AnkiDroid/src/main/res/values-ru/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ru/02-strings.xml
@@ -195,7 +195,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Фон</string>
     <string name="choose_an_image" maxLength="41">Выбрать изображение</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Удалить фон?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Сбросить настройки</string>
diff --git a/AnkiDroid/src/main/res/values-sat/02-strings.xml b/AnkiDroid/src/main/res/values-sat/02-strings.xml
index 692c223ad885..4c5424779c14 100644
--- a/AnkiDroid/src/main/res/values-sat/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sat/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">ᱵᱮᱠᱜᱟᱨᱩᱸᱰ</string>
     <string name="choose_an_image" maxLength="41">ᱪᱤᱛᱟᱨ ᱵᱟᱪᱷᱟᱣ ᱢᱮ</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">ᱚᱛ ᱦᱟᱥᱟ ᱪᱟᱵᱟ ᱢᱮ?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">ᱢᱩᱞ ᱯᱷᱮᱰᱟᱛ ᱨᱮ ᱫᱚᱦᱰᱟ ᱡᱚᱜᱟᱣ</string>
diff --git a/AnkiDroid/src/main/res/values-sc/02-strings.xml b/AnkiDroid/src/main/res/values-sc/02-strings.xml
index a7bb3981d1bd..fefde0e090a0 100644
--- a/AnkiDroid/src/main/res/values-sc/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sc/02-strings.xml
@@ -190,7 +190,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Isfundu</string>
     <string name="choose_an_image" maxLength="41">Issèbera un\'immàgine</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Bogare s\'isfundu?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Torra a sos valores predefinidos</string>
diff --git a/AnkiDroid/src/main/res/values-sk/02-strings.xml b/AnkiDroid/src/main/res/values-sk/02-strings.xml
index 1fa26d5fd678..1aa078fa384e 100644
--- a/AnkiDroid/src/main/res/values-sk/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sk/02-strings.xml
@@ -195,7 +195,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Pozadie</string>
     <string name="choose_an_image" maxLength="41">Zvoliť obrázok</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Odstrániť tapetu?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Obnoviť predvolené</string>
diff --git a/AnkiDroid/src/main/res/values-sl/02-strings.xml b/AnkiDroid/src/main/res/values-sl/02-strings.xml
index cbf957d02702..091d763aec2a 100644
--- a/AnkiDroid/src/main/res/values-sl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sl/02-strings.xml
@@ -195,7 +195,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
diff --git a/AnkiDroid/src/main/res/values-sq/02-strings.xml b/AnkiDroid/src/main/res/values-sq/02-strings.xml
index e393b7c011cb..dd0094ef6cd6 100644
--- a/AnkiDroid/src/main/res/values-sq/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sq/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
diff --git a/AnkiDroid/src/main/res/values-sr/02-strings.xml b/AnkiDroid/src/main/res/values-sr/02-strings.xml
index d2e5b6f10e01..50f4e52cb8f0 100644
--- a/AnkiDroid/src/main/res/values-sr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sr/02-strings.xml
@@ -191,7 +191,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
diff --git a/AnkiDroid/src/main/res/values-ss/02-strings.xml b/AnkiDroid/src/main/res/values-ss/02-strings.xml
index 02fc4162fc27..d3c686c3bb2f 100644
--- a/AnkiDroid/src/main/res/values-ss/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ss/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
diff --git a/AnkiDroid/src/main/res/values-sv/02-strings.xml b/AnkiDroid/src/main/res/values-sv/02-strings.xml
index 6cf09da50f01..e0aca8becd0b 100644
--- a/AnkiDroid/src/main/res/values-sv/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sv/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Bakgrund</string>
     <string name="choose_an_image" maxLength="41">Välj en bild</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Ta bort bakgrund?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Återställ standardvärde</string>
diff --git a/AnkiDroid/src/main/res/values-sw/02-strings.xml b/AnkiDroid/src/main/res/values-sw/02-strings.xml
index 02fc4162fc27..d3c686c3bb2f 100644
--- a/AnkiDroid/src/main/res/values-sw/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sw/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
diff --git a/AnkiDroid/src/main/res/values-ta/02-strings.xml b/AnkiDroid/src/main/res/values-ta/02-strings.xml
index 6e913ee28c90..4776c8746632 100644
--- a/AnkiDroid/src/main/res/values-ta/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ta/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">பின்புலங்கள்</string>
     <string name="choose_an_image" maxLength="41">படம் தேர்ந்தெடு</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">பின்னணியை அகற்றவா?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">இயல்புநிலையை மீட்டமை</string>
diff --git a/AnkiDroid/src/main/res/values-te/02-strings.xml b/AnkiDroid/src/main/res/values-te/02-strings.xml
index 323c6684909f..088e69201bc8 100644
--- a/AnkiDroid/src/main/res/values-te/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-te/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">నేపథ్య</string>
     <string name="choose_an_image" maxLength="41">చిత్రాన్ని ఎంచుకోండి</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">నేపథ్యాన్ని తీసివేయాలా?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">డిఫాల్ట్‌ని పునరుద్ధరించండి</string>
diff --git a/AnkiDroid/src/main/res/values-tg/02-strings.xml b/AnkiDroid/src/main/res/values-tg/02-strings.xml
index 02fc4162fc27..d3c686c3bb2f 100644
--- a/AnkiDroid/src/main/res/values-tg/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tg/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
diff --git a/AnkiDroid/src/main/res/values-tgl/02-strings.xml b/AnkiDroid/src/main/res/values-tgl/02-strings.xml
index f551a6969d13..a328c607cd83 100644
--- a/AnkiDroid/src/main/res/values-tgl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tgl/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
diff --git a/AnkiDroid/src/main/res/values-th/02-strings.xml b/AnkiDroid/src/main/res/values-th/02-strings.xml
index 92fa6d89068d..40d8debee090 100644
--- a/AnkiDroid/src/main/res/values-th/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-th/02-strings.xml
@@ -183,7 +183,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
diff --git a/AnkiDroid/src/main/res/values-ti/02-strings.xml b/AnkiDroid/src/main/res/values-ti/02-strings.xml
index 02fc4162fc27..d3c686c3bb2f 100644
--- a/AnkiDroid/src/main/res/values-ti/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ti/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
diff --git a/AnkiDroid/src/main/res/values-tn/02-strings.xml b/AnkiDroid/src/main/res/values-tn/02-strings.xml
index 02fc4162fc27..d3c686c3bb2f 100644
--- a/AnkiDroid/src/main/res/values-tn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tn/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
diff --git a/AnkiDroid/src/main/res/values-tr/02-strings.xml b/AnkiDroid/src/main/res/values-tr/02-strings.xml
index db27cfab48be..040d2dacb724 100644
--- a/AnkiDroid/src/main/res/values-tr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tr/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Arkaplan</string>
     <string name="choose_an_image" maxLength="41">Bir resim seç</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Arkaplan kaldırılsın mı?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Varsayılana Dön</string>
diff --git a/AnkiDroid/src/main/res/values-ts/02-strings.xml b/AnkiDroid/src/main/res/values-ts/02-strings.xml
index 02fc4162fc27..d3c686c3bb2f 100644
--- a/AnkiDroid/src/main/res/values-ts/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ts/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
diff --git a/AnkiDroid/src/main/res/values-tt/02-strings.xml b/AnkiDroid/src/main/res/values-tt/02-strings.xml
index cd204a6d2cef..ae2f62332a43 100644
--- a/AnkiDroid/src/main/res/values-tt/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tt/02-strings.xml
@@ -184,7 +184,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Җирлек</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
diff --git a/AnkiDroid/src/main/res/values-ug/02-strings.xml b/AnkiDroid/src/main/res/values-ug/02-strings.xml
index ff6c08620346..3dfe7f2ee7ab 100644
--- a/AnkiDroid/src/main/res/values-ug/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ug/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">تەگلىك</string>
     <string name="choose_an_image" maxLength="41">سۈرەت تاللاش</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">تەگلىكنى چىقىرىۋېتەمدۇ؟</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">كۆڭۈلدىكىگە قايتۇر</string>
diff --git a/AnkiDroid/src/main/res/values-uk/02-strings.xml b/AnkiDroid/src/main/res/values-uk/02-strings.xml
index 94c8b453d699..6752b4c88215 100644
--- a/AnkiDroid/src/main/res/values-uk/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-uk/02-strings.xml
@@ -195,7 +195,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Фон</string>
     <string name="choose_an_image" maxLength="41">Оберіть зображення</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Видалити задній фон?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Відновити «Типове»</string>
diff --git a/AnkiDroid/src/main/res/values-ur/02-strings.xml b/AnkiDroid/src/main/res/values-ur/02-strings.xml
index d754fd696aa5..c1b78ab38d19 100644
--- a/AnkiDroid/src/main/res/values-ur/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ur/02-strings.xml
@@ -188,7 +188,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">پس منظر</string>
     <string name="choose_an_image" maxLength="41">تصویر منتخب کریں۔</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">پس منظر ہٹائیں؟</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">ڈیفالٹ بحال کریں۔</string>
diff --git a/AnkiDroid/src/main/res/values-uz/02-strings.xml b/AnkiDroid/src/main/res/values-uz/02-strings.xml
index da9e93519163..6ea623471c1b 100644
--- a/AnkiDroid/src/main/res/values-uz/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-uz/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
diff --git a/AnkiDroid/src/main/res/values-ve/02-strings.xml b/AnkiDroid/src/main/res/values-ve/02-strings.xml
index 02fc4162fc27..d3c686c3bb2f 100644
--- a/AnkiDroid/src/main/res/values-ve/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ve/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
diff --git a/AnkiDroid/src/main/res/values-vi/02-strings.xml b/AnkiDroid/src/main/res/values-vi/02-strings.xml
index 3f8695852325..1d830b746831 100644
--- a/AnkiDroid/src/main/res/values-vi/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-vi/02-strings.xml
@@ -183,7 +183,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Hình nền</string>
     <string name="choose_an_image" maxLength="41">Chọn một hình ảnh</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Gỡ bỏ nền?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Khôi phục mặc định</string>
diff --git a/AnkiDroid/src/main/res/values-wo/02-strings.xml b/AnkiDroid/src/main/res/values-wo/02-strings.xml
index eca3a48f69ed..2d506f269e4d 100644
--- a/AnkiDroid/src/main/res/values-wo/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-wo/02-strings.xml
@@ -183,7 +183,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
diff --git a/AnkiDroid/src/main/res/values-xh/02-strings.xml b/AnkiDroid/src/main/res/values-xh/02-strings.xml
index 02fc4162fc27..d3c686c3bb2f 100644
--- a/AnkiDroid/src/main/res/values-xh/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-xh/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
diff --git a/AnkiDroid/src/main/res/values-yue/02-strings.xml b/AnkiDroid/src/main/res/values-yue/02-strings.xml
index f26a704271d3..951be4a7045b 100644
--- a/AnkiDroid/src/main/res/values-yue/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-yue/02-strings.xml
@@ -183,7 +183,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
diff --git a/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml b/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml
index 30d4895358d8..868b87ea7cf5 100644
--- a/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml
@@ -183,7 +183,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">背景</string>
     <string name="choose_an_image" maxLength="41">选择图片</string>
-    <string name="remove_wallpaper_image" maxLength="41">删除背景</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">去除背景</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">恢复初始设置</string>
diff --git a/AnkiDroid/src/main/res/values-zh-rTW/02-strings.xml b/AnkiDroid/src/main/res/values-zh-rTW/02-strings.xml
index 8032b35fa83a..bad91e9755fb 100644
--- a/AnkiDroid/src/main/res/values-zh-rTW/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-zh-rTW/02-strings.xml
@@ -183,7 +183,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">背景</string>
     <string name="choose_an_image" maxLength="41">選擇圖像</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">移除背景？</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">恢復預設值</string>
diff --git a/AnkiDroid/src/main/res/values-zu/02-strings.xml b/AnkiDroid/src/main/res/values-zu/02-strings.xml
index 02fc4162fc27..d3c686c3bb2f 100644
--- a/AnkiDroid/src/main/res/values-zu/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-zu/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Background</string>
     <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_wallpaper_image" maxLength="41"> Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
     <string name="remove_background_image">Remove background?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>

From 4c5bf718a7c8f170f741553b5e9d5a8b7ff6d80e Mon Sep 17 00:00:00 2001
From: David Allison <62114487+david-allison@users.noreply.github.com>
Date: Thu, 13 Mar 2025 23:55:30 +0000
Subject: [PATCH 108/200] test: ignore flaky tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

```
    androidx.test.espresso.NoMatchingViewException: No views in hierarchy found matching: an instance of android.widget.TextView and view.getText() with or without transformation to match: is "⁨1⁩ note updated."
    If the target view is not part of the view hierarchy, you may need to use Espresso.onData to load it from one of the following AdapterViews:androidx.appcompat.widget.AppCompatSpinner{3b905b2 VFED..CL. ......ID 56,0-232,64 #7f0a04e2 app:id/toolbar_spinner}
 ```

 etc...
---
 AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt
index 7a9e2dd65177..9b8c4f998ff8 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt
@@ -1404,6 +1404,7 @@ class CardBrowserTest : RobolectricTest() {
     }
 
     @Test
+    @Flaky(OS.ALL)
     fun `FindReplace - replaces text only for the field in the selected note`() {
         val note0 = createFindReplaceTestNote("A", "kart", "kilogram")
         val note1 = createFindReplaceTestNote("B", "pink", "chicken")
@@ -1442,6 +1443,7 @@ class CardBrowserTest : RobolectricTest() {
     }
 
     @Test
+    @Flaky(OS.ALL)
     fun `FindReplace - replaces text in all notes if 'Only in selected notes' is unchecked`() {
         val note0 = createFindReplaceTestNote("A", "kart", "kilogram")
         val note1 = createFindReplaceTestNote("B", "pink", "chicken")
@@ -1469,6 +1471,7 @@ class CardBrowserTest : RobolectricTest() {
     }
 
     @Test
+    @Flaky(OS.ALL)
     fun `FindReplace - replaces text in all fields of selected note if 'All fields' is selected`() {
         val note0 = createFindReplaceTestNote("A", "kart", "kilogram")
         val note1 = createFindReplaceTestNote("B", "pink", "chicken")
@@ -1489,6 +1492,7 @@ class CardBrowserTest : RobolectricTest() {
     }
 
     @Test
+    @Flaky(OS.ALL)
     fun `FindReplace - replaces text of tags as expected if 'Tags' is selected`() {
         val note0 = createFindReplaceTestNote("A", "kart", "kilogram")
         val note1 = createFindReplaceTestNote("A", "pink", "chicken")

From 3ba6f9ecacf7669e7cd7c6ebf5253771be645bc3 Mon Sep 17 00:00:00 2001
From: David Allison <62114487+david-allison@users.noreply.github.com>
Date: Thu, 13 Mar 2025 17:10:59 +0000
Subject: [PATCH 109/200] lint(perf): don't assert on <string-array> or
 <plurals>

The <item> elements are already asserted on
---
 .../ichi2/anki/lint/rules/TranslationTypo.kt  |  4 ++--
 .../anki/lint/rules/TranslationTypoTest.kt    | 22 +++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/lint-rules/src/main/java/com/ichi2/anki/lint/rules/TranslationTypo.kt b/lint-rules/src/main/java/com/ichi2/anki/lint/rules/TranslationTypo.kt
index b233f0b8b0a6..66bb38ab2042 100644
--- a/lint-rules/src/main/java/com/ichi2/anki/lint/rules/TranslationTypo.kt
+++ b/lint-rules/src/main/java/com/ichi2/anki/lint/rules/TranslationTypo.kt
@@ -97,8 +97,8 @@ class TranslationTypo :
             return
         }
 
-        // Only check <string> or <plurals><item>, not the container
-        if ("resources" == element.tagName) {
+        // Ignore container tags: visitElement already handles visiting sub-tags (<item>/<string>)
+        if (element.tagName in listOf("resources", "plurals", "string-array")) {
             return
         }
 
diff --git a/lint-rules/src/test/java/com/ichi2/anki/lint/rules/TranslationTypoTest.kt b/lint-rules/src/test/java/com/ichi2/anki/lint/rules/TranslationTypoTest.kt
index a5122f440c19..86342a9a8cd9 100644
--- a/lint-rules/src/test/java/com/ichi2/anki/lint/rules/TranslationTypoTest.kt
+++ b/lint-rules/src/test/java/com/ichi2/anki/lint/rules/TranslationTypoTest.kt
@@ -51,6 +51,28 @@ class TranslationTypoTest {
         TranslationTypo.ISSUE.assertXmlStringsHasError(invalidLowerCase, "should be 'JavaScript'")
     }
 
+    @Test
+    fun `plurals - javascript fails`() {
+        val invalidLowerCase = """<resources>
+           <plurals name="pl">
+               <item quantity="other">>javascript</item>
+           </plurals>
+        </resources>"""
+
+        TranslationTypo.ISSUE.assertXmlStringsHasError(invalidLowerCase, "should be 'JavaScript'")
+    }
+
+    @Test
+    fun `string array - javascript fails`() {
+        val invalidLowerCase = """<resources>
+           <string-array name="arr">
+               <item>javascript</item>
+           </string-array>
+        </resources>"""
+
+        TranslationTypo.ISSUE.assertXmlStringsHasError(invalidLowerCase, "should be 'JavaScript'")
+    }
+
     @Test
     fun `vandalism fails`() {
         val stringRemoved = """<resources>

From b073f41a0dfc51abfd4fbe1a8a6aa22295dd2dcb Mon Sep 17 00:00:00 2001
From: David Allison <62114487+david-allison@users.noreply.github.com>
Date: Thu, 13 Mar 2025 20:01:01 +0000
Subject: [PATCH 110/200] lint: fix trailing spaces in /values

Part of 14903

Syncing this change reduces the quantity of manual Crowdin fixes required
---
 AnkiDroid/src/main/res/values/02-strings.xml  | 26 ++-----
 AnkiDroid/src/main/res/values/03-dialogs.xml  | 11 +--
 .../src/main/res/values/10-preferences.xml    |  4 +-
 .../src/main/res/values/17-model-manager.xml  |  4 +-
 .../ichi2/anki/lint/rules/TranslationTypo.kt  | 16 +++++
 .../anki/lint/rules/TranslationTypoTest.kt    | 72 +++++++++++++++++++
 .../ichi2/anki/lint/testutils/LintAssert.kt   |  4 ++
 7 files changed, 105 insertions(+), 32 deletions(-)

diff --git a/AnkiDroid/src/main/res/values/02-strings.xml b/AnkiDroid/src/main/res/values/02-strings.xml
index 697bc4e88099..0e5b1f8adf03 100644
--- a/AnkiDroid/src/main/res/values/02-strings.xml
+++ b/AnkiDroid/src/main/res/values/02-strings.xml
@@ -237,8 +237,7 @@
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
     <string name="ankidroid_cannot_open_after_backup_try_again"
         comment="After an Android backup is restored, AnkiDroid opens and shows this message.
-        Opening AnkiDroid again will work correctly">
-        Android backup in progress. Please try again</string>
+        Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
 
 
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
@@ -334,20 +333,15 @@
     <string name="deleting_selected_notes">Deleting selected notes</string>
 
     <string name="tts_voices_default_text" comment="The default text to speak when selecting
-    Text to speech voices"
-        >
-        Tap a voice to listen
-    </string>
+    Text to speech voices">Tap a voice to listen</string>
 
     <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable
 but not installed, we want to inform the user that they should install it for the best experience
-There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
+There will also be an option to use it without downloading">Voice should be installed before use</string>
 
     <string name="tts_voices_use_selected_voice_without_install" comment="A user has been
 informed that a voice should be installed before use. This is text on a snackbar button which
-allows them to use the voice without installing it">Use anyway
-    </string>
+allows them to use the voice without installing it">Use anyway</string>
 
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech
 voice. The parameter is a technical error code such as 'ERROR_NOT_INSTALLED_YET' or 'ERROR_NETWORK_TIMEOUT'"
@@ -357,20 +351,14 @@ voice. The parameter is a technical error code such as 'ERROR_NOT_INSTALLED_YET'
     <string name="tts_voices_chip_filter_to_internet" comment="
     Filters a list of text to speech voices, to enable/disable voices which require the internet to
     function.
-    This is on a chip control, so keep the text short, ideally one word">
-        Internet
-    </string>
+    This is on a chip control, so keep the text short, ideally one word">Internet</string>
 
     <string name="tts_voices_chip_filter_to_installable_audio" comment="
     Displays a list of Text to Speech voices which should be downloaded/installed before use
-    This is on a chip control, so keep the text short, ideally one word">
-        Install
-    </string>
+    This is on a chip control, so keep the text short, ideally one word">Install</string>
 
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if
-opening the system text to speech settings fails">
-        Failed to open text to speech settings
-    </string>
+opening the system text to speech settings fails">Failed to open text to speech settings</string>
 
     <string name="shared_decks_login_required">Please log in to download more decks</string>
 
diff --git a/AnkiDroid/src/main/res/values/03-dialogs.xml b/AnkiDroid/src/main/res/values/03-dialogs.xml
index 25a5547f826b..98acb3f95de1 100644
--- a/AnkiDroid/src/main/res/values/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values/03-dialogs.xml
@@ -40,7 +40,7 @@
     <string name="answering_error_title">Database error</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Report error</string>
-   <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+   <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
@@ -217,13 +217,8 @@
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
 
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">
-        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-
-    <string name="dismiss_backup_warning_upgrade">
-        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
 
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
diff --git a/AnkiDroid/src/main/res/values/10-preferences.xml b/AnkiDroid/src/main/res/values/10-preferences.xml
index 784263046efa..06296acd16ca 100644
--- a/AnkiDroid/src/main/res/values/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values/10-preferences.xml
@@ -294,9 +294,7 @@ this formatter is used if the bind only applies to both the question and the ans
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">
-        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
 
     <!-- #######################################################################################
          #################################### Backup options ###################################
diff --git a/AnkiDroid/src/main/res/values/17-model-manager.xml b/AnkiDroid/src/main/res/values/17-model-manager.xml
index 0b79d46a20f5..1375e3d41e27 100644
--- a/AnkiDroid/src/main/res/values/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values/17-model-manager.xml
@@ -56,8 +56,8 @@
 
 
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s </string> <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string> <!--This prefix is used for standard note types-->
+    <string name="model_browser_add_clone">Clone: %1$s</string>
 
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
diff --git a/lint-rules/src/main/java/com/ichi2/anki/lint/rules/TranslationTypo.kt b/lint-rules/src/main/java/com/ichi2/anki/lint/rules/TranslationTypo.kt
index 66bb38ab2042..124b2542c7d9 100644
--- a/lint-rules/src/main/java/com/ichi2/anki/lint/rules/TranslationTypo.kt
+++ b/lint-rules/src/main/java/com/ichi2/anki/lint/rules/TranslationTypo.kt
@@ -25,10 +25,12 @@ import com.android.tools.lint.detector.api.ResourceXmlDetector
 import com.android.tools.lint.detector.api.Scope
 import com.android.tools.lint.detector.api.XmlContext
 import com.android.tools.lint.detector.api.XmlScanner
+import com.android.utils.forEach
 import com.google.common.annotations.VisibleForTesting
 import com.ichi2.anki.lint.utils.Constants
 import com.ichi2.anki.lint.utils.CrowdinContext.Companion.toCrowdinContext
 import com.ichi2.anki.lint.utils.ext.isRightToLeftLanguage
+import org.w3c.dom.CDATASection
 import org.w3c.dom.Element
 
 /**
@@ -133,5 +135,19 @@ class TranslationTypo :
         if (element.textContent.isEmpty() && element.getAttribute("name") != "empty_string") {
             element.reportIssue("should not be empty")
         }
+
+        // TODO(14903): remove "values" check once lint passes without it
+        if ("values" == context.file.parentFile.name && element.textContent.trim() != element.textContent) {
+            var isValid = true
+            element.childNodes.forEach {
+                if (it is CDATASection) {
+                    isValid = false
+                }
+            }
+
+            if (isValid) {
+                element.reportIssue("should not contain trailing whitespace")
+            }
+        }
     }
 }
diff --git a/lint-rules/src/test/java/com/ichi2/anki/lint/rules/TranslationTypoTest.kt b/lint-rules/src/test/java/com/ichi2/anki/lint/rules/TranslationTypoTest.kt
index 86342a9a8cd9..64d6477b59cd 100644
--- a/lint-rules/src/test/java/com/ichi2/anki/lint/rules/TranslationTypoTest.kt
+++ b/lint-rules/src/test/java/com/ichi2/anki/lint/rules/TranslationTypoTest.kt
@@ -18,6 +18,7 @@ package com.ichi2.anki.lint.rules
 
 import com.ichi2.anki.lint.testutils.assertXmlStringsHasError
 import com.ichi2.anki.lint.testutils.assertXmlStringsNoIssues
+import org.junit.Ignore
 import org.junit.Test
 
 /**
@@ -91,6 +92,77 @@ class TranslationTypoTest {
         TranslationTypo.ISSUE.assertXmlStringsNoIssues(stringRemoved)
     }
 
+    @Test
+    fun `additional spacing before is flagged`() {
+        val stringRemoved = """<resources>
+           <string name="hello"> hello</string>
+        </resources>"""
+
+        TranslationTypo.ISSUE.assertXmlStringsHasError(
+            xmlFile = stringRemoved,
+            expectedError = "should not contain trailing whitespace",
+            ignoreCData = true,
+        )
+    }
+
+    @Test
+    fun `additional spacing after is flagged`() {
+        val stringRemoved = """<resources>
+           <string name="hello">hello </string>
+        </resources>"""
+
+        TranslationTypo.ISSUE.assertXmlStringsHasError(
+            xmlFile = stringRemoved,
+            expectedError = "should not contain trailing whitespace",
+            ignoreCData = true,
+        )
+    }
+
+    @Test
+    fun `cdata with no spaces is not flagged`() {
+        val stringRemoved = """<resources>
+           <string name="export_email_text"><![CDATA[
+                        Hi!
+                        <br/><br/>
+                        This is an Anki flashcards deck sent from AnkiDroid[1].
+                        Try to open it using one of the available Anki distributions[2] and enjoy easy and efficient learning!<br/><br/>
+                        [1] %1${"\$s"}<br/>
+                        [2] %2${"\$s"}
+                ]]></string>
+        </resources>"""
+
+        TranslationTypo.ISSUE.assertXmlStringsNoIssues(stringRemoved)
+    }
+
+    @Test
+    @Ignore("The ellipsis is unescaped")
+    @Suppress("UNUSED_EXPRESSION")
+    fun `ellipsis escaping is unchanged`() {
+        """<resources>
+            <string name="empty_filtered_deck">필터링된 덱을 비우는 중&#8230; </string>
+        </resources>"""
+
+        // TODO
+    }
+
+    @Test
+    fun `cdata with spaces is not flagged`() {
+        val stringRemoved = """<resources>
+           <string name="export_email_text">
+                <![CDATA[
+                        Hi!
+                        <br/><br/>
+                        This is an Anki flashcards deck sent from AnkiDroid[1].
+                        Try to open it using one of the available Anki distributions[2] and enjoy easy and efficient learning!<br/><br/>
+                        [1] %1${"\$s"}<br/>
+                        [2] %2${"\$s"}
+                ]]>
+            </string>
+        </resources>"""
+
+        TranslationTypo.ISSUE.assertXmlStringsNoIssues(stringRemoved)
+    }
+
     /** A link to the string on Crowdin should be provided */
     @Test
     fun crowdinEditLinkIsProvided() {
diff --git a/lint-rules/src/test/java/com/ichi2/anki/lint/testutils/LintAssert.kt b/lint-rules/src/test/java/com/ichi2/anki/lint/testutils/LintAssert.kt
index 7c63c50ef371..f70c475f5a65 100644
--- a/lint-rules/src/test/java/com/ichi2/anki/lint/testutils/LintAssert.kt
+++ b/lint-rules/src/test/java/com/ichi2/anki/lint/testutils/LintAssert.kt
@@ -18,7 +18,9 @@ package com.ichi2.anki.lint.testutils
 
 import com.android.tools.lint.checks.infrastructure.TestFiles
 import com.android.tools.lint.checks.infrastructure.TestLintTask
+import com.android.tools.lint.checks.infrastructure.TestMode
 import com.android.tools.lint.detector.api.Issue
+import com.intellij.util.applyIf
 import org.intellij.lang.annotations.Language
 import org.junit.Assert.assertTrue
 
@@ -60,12 +62,14 @@ fun Issue.assertXmlStringsHasError(
     expectedError: String,
     androidLanguageFolder: String? = null,
     fileName: String? = null,
+    ignoreCData: Boolean = false,
 ) {
     val languageQualifier = if (androidLanguageFolder != null) "-$androidLanguageFolder" else ""
     val resourceFileName = fileName ?: "constants"
     TestLintTask
         .lint()
         .allowMissingSdk()
+        .applyIf(ignoreCData) { skipTestModes(TestMode.CDATA) }
         .allowCompilationErrors()
         .files(TestFiles.xml("res/values$languageQualifier/$resourceFileName.xml", xmlFile))
         .issues(this)

From 7e91aff572d2f66ce4e567015f9d249d1c075cbe Mon Sep 17 00:00:00 2001
From: AnkiDroid Translations <ankidroid@ankidroid.org>
Date: Sat, 15 Mar 2025 09:29:24 +0000
Subject: [PATCH 111/200] Updated strings from Crowdin

---
 .../src/main/res/values-af/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-af/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-af/10-preferences.xml |  3 +--
 .../main/res/values-af/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-am/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-am/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-am/10-preferences.xml |  3 +--
 .../main/res/values-am/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-ar/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-ar/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-ar/10-preferences.xml |  2 +-
 .../main/res/values-ar/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-az/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-az/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-az/10-preferences.xml |  3 +--
 .../main/res/values-az/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-be/02-strings.xml     | 16 ++++++--------
 .../src/main/res/values-be/03-dialogs.xml     | 10 +++------
 .../src/main/res/values-be/10-preferences.xml |  3 +--
 .../main/res/values-be/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-bg/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-bg/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-bg/10-preferences.xml |  3 +--
 .../main/res/values-bg/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-bn/02-strings.xml     | 14 ++++++------
 .../src/main/res/values-bn/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-bn/10-preferences.xml |  3 +--
 .../main/res/values-bn/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-ca/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-ca/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-ca/10-preferences.xml |  3 +--
 .../main/res/values-ca/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-ckb/02-strings.xml    | 20 ++++++-----------
 .../src/main/res/values-ckb/03-dialogs.xml    |  8 +++----
 .../main/res/values-ckb/10-preferences.xml    |  3 +--
 .../main/res/values-ckb/17-model-manager.xml  |  4 ++--
 .../src/main/res/values-cs/02-strings.xml     | 22 +++++++------------
 .../src/main/res/values-cs/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-cs/10-preferences.xml |  3 +--
 .../main/res/values-cs/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-da/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-da/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-da/10-preferences.xml |  3 +--
 .../main/res/values-da/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-de/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-de/03-dialogs.xml     |  6 ++---
 .../src/main/res/values-de/10-preferences.xml |  3 +--
 .../main/res/values-de/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-el/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-el/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-el/10-preferences.xml |  3 +--
 .../main/res/values-el/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-eo/02-strings.xml     | 14 ++++++------
 .../src/main/res/values-eo/03-dialogs.xml     |  6 ++---
 .../src/main/res/values-eo/10-preferences.xml |  2 +-
 .../main/res/values-eo/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-es-rAR/02-strings.xml | 19 ++++++----------
 .../src/main/res/values-es-rAR/03-dialogs.xml |  8 +++----
 .../main/res/values-es-rAR/10-preferences.xml |  3 +--
 .../res/values-es-rAR/17-model-manager.xml    |  4 ++--
 .../src/main/res/values-es-rES/02-strings.xml | 19 ++++++----------
 .../src/main/res/values-es-rES/03-dialogs.xml |  8 +++----
 .../main/res/values-es-rES/10-preferences.xml |  3 +--
 .../res/values-es-rES/17-model-manager.xml    |  4 ++--
 .../src/main/res/values-et/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-et/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-et/10-preferences.xml |  3 +--
 .../main/res/values-et/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-eu/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-eu/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-eu/10-preferences.xml |  3 +--
 .../main/res/values-eu/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-fa/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-fa/03-dialogs.xml     |  6 ++---
 .../src/main/res/values-fa/10-preferences.xml |  3 +--
 .../main/res/values-fa/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-fi/02-strings.xml     | 17 ++++++--------
 .../src/main/res/values-fi/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-fi/10-preferences.xml |  3 +--
 .../main/res/values-fi/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-fil/02-strings.xml    | 19 ++++++----------
 .../src/main/res/values-fil/03-dialogs.xml    |  8 +++----
 .../main/res/values-fil/10-preferences.xml    |  3 +--
 .../main/res/values-fil/17-model-manager.xml  |  4 ++--
 .../src/main/res/values-fr/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-fr/03-dialogs.xml     |  6 ++---
 .../src/main/res/values-fr/10-preferences.xml |  2 +-
 .../main/res/values-fr/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-fy/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-fy/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-fy/10-preferences.xml |  3 +--
 .../main/res/values-fy/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-ga/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-ga/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-ga/10-preferences.xml |  3 +--
 .../main/res/values-ga/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-gl/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-gl/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-gl/10-preferences.xml |  3 +--
 .../main/res/values-gl/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-got/02-strings.xml    | 20 ++++++-----------
 .../src/main/res/values-got/03-dialogs.xml    |  8 +++----
 .../main/res/values-got/10-preferences.xml    |  3 +--
 .../main/res/values-got/17-model-manager.xml  |  4 ++--
 .../src/main/res/values-gu/02-strings.xml     | 19 ++++++----------
 .../src/main/res/values-gu/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-gu/10-preferences.xml |  2 +-
 .../main/res/values-gu/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-heb/02-strings.xml    | 14 ++++++------
 .../src/main/res/values-heb/03-dialogs.xml    |  6 ++---
 .../main/res/values-heb/10-preferences.xml    |  3 +--
 .../main/res/values-heb/17-model-manager.xml  |  4 ++--
 .../src/main/res/values-hi/02-strings.xml     | 17 ++++++--------
 .../src/main/res/values-hi/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-hi/10-preferences.xml |  2 +-
 .../main/res/values-hi/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-hr/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-hr/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-hr/10-preferences.xml |  3 +--
 .../main/res/values-hr/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-hu/02-strings.xml     | 12 +++++-----
 .../src/main/res/values-hu/03-dialogs.xml     |  6 ++---
 .../src/main/res/values-hu/10-preferences.xml |  2 +-
 .../main/res/values-hu/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-hy/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-hy/03-dialogs.xml     |  6 ++---
 .../src/main/res/values-hy/10-preferences.xml |  3 +--
 .../main/res/values-hy/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-ind/02-strings.xml    | 20 ++++++-----------
 .../src/main/res/values-ind/03-dialogs.xml    |  8 +++----
 .../main/res/values-ind/10-preferences.xml    |  3 +--
 .../main/res/values-ind/17-model-manager.xml  |  4 ++--
 .../src/main/res/values-is/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-is/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-is/10-preferences.xml |  3 +--
 .../main/res/values-is/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-it/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-it/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-it/10-preferences.xml |  3 +--
 .../main/res/values-it/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-iw/02-strings.xml     | 14 ++++++------
 .../src/main/res/values-iw/03-dialogs.xml     |  6 ++---
 .../src/main/res/values-iw/10-preferences.xml |  3 +--
 .../main/res/values-iw/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-ja/02-strings.xml     | 22 +++++++------------
 .../src/main/res/values-ja/03-dialogs.xml     |  7 +++---
 .../src/main/res/values-ja/07-cardbrowser.xml |  2 +-
 .../src/main/res/values-ja/10-preferences.xml |  3 +--
 .../main/res/values-ja/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-jv/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-jv/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-jv/10-preferences.xml |  3 +--
 .../main/res/values-jv/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-ka/02-strings.xml     | 19 ++++++----------
 .../src/main/res/values-ka/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-ka/10-preferences.xml |  3 +--
 .../main/res/values-ka/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-kk/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-kk/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-kk/10-preferences.xml |  3 +--
 .../main/res/values-kk/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-km/02-strings.xml     | 16 ++++++--------
 .../src/main/res/values-km/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-km/10-preferences.xml |  3 +--
 .../main/res/values-km/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-kn/02-strings.xml     | 14 ++++++------
 .../src/main/res/values-kn/03-dialogs.xml     |  6 ++---
 .../src/main/res/values-kn/10-preferences.xml |  2 +-
 .../main/res/values-kn/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-ko/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-ko/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-ko/10-preferences.xml |  2 +-
 .../main/res/values-ko/17-model-manager.xml   | 12 +++++-----
 .../src/main/res/values-ku/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-ku/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-ku/10-preferences.xml |  3 +--
 .../main/res/values-ku/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-ky/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-ky/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-ky/10-preferences.xml |  3 +--
 .../main/res/values-ky/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-lt/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-lt/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-lt/10-preferences.xml |  3 +--
 .../main/res/values-lt/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-lv/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-lv/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-lv/10-preferences.xml |  3 +--
 .../main/res/values-lv/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-mk/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-mk/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-mk/10-preferences.xml |  3 +--
 .../main/res/values-mk/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-ml/02-strings.xml     | 14 ++++++------
 .../src/main/res/values-ml/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-ml/10-preferences.xml |  3 +--
 .../main/res/values-ml/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-mn/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-mn/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-mn/10-preferences.xml |  3 +--
 .../main/res/values-mn/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-mr/02-strings.xml     | 14 ++++++------
 .../src/main/res/values-mr/03-dialogs.xml     |  6 ++---
 .../src/main/res/values-mr/10-preferences.xml |  2 +-
 .../main/res/values-mr/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-ms/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-ms/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-ms/10-preferences.xml |  3 +--
 .../main/res/values-ms/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-my/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-my/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-my/10-preferences.xml |  3 +--
 .../main/res/values-my/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-nl/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-nl/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-nl/10-preferences.xml |  3 +--
 .../main/res/values-nl/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-nn/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-nn/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-nn/10-preferences.xml |  3 +--
 .../main/res/values-nn/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-no/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-no/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-no/10-preferences.xml |  3 +--
 .../main/res/values-no/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-or/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-or/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-or/10-preferences.xml |  3 +--
 .../main/res/values-or/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-pa/02-strings.xml     | 14 ++++++------
 .../src/main/res/values-pa/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-pa/10-preferences.xml |  2 +-
 .../main/res/values-pa/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-pl/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-pl/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-pl/10-preferences.xml |  3 +--
 .../main/res/values-pl/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-pt-rBR/02-strings.xml | 20 ++++++-----------
 .../src/main/res/values-pt-rBR/03-dialogs.xml |  8 +++----
 .../main/res/values-pt-rBR/10-preferences.xml |  3 +--
 .../res/values-pt-rBR/17-model-manager.xml    |  4 ++--
 .../src/main/res/values-pt-rPT/02-strings.xml | 22 +++++++------------
 .../src/main/res/values-pt-rPT/03-dialogs.xml |  8 +++----
 .../main/res/values-pt-rPT/10-preferences.xml |  3 +--
 .../res/values-pt-rPT/17-model-manager.xml    |  4 ++--
 .../src/main/res/values-ro/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-ro/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-ro/10-preferences.xml |  3 +--
 .../main/res/values-ro/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-ru/02-strings.xml     | 15 ++++++-------
 .../src/main/res/values-ru/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-ru/10-preferences.xml |  3 +--
 .../main/res/values-ru/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-sat/02-strings.xml    | 20 ++++++-----------
 .../src/main/res/values-sat/03-dialogs.xml    |  8 +++----
 .../main/res/values-sat/10-preferences.xml    |  3 +--
 .../main/res/values-sat/17-model-manager.xml  |  4 ++--
 .../src/main/res/values-sc/02-strings.xml     | 19 ++++++----------
 .../src/main/res/values-sc/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-sc/10-preferences.xml |  3 +--
 .../main/res/values-sc/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-sk/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-sk/03-dialogs.xml     |  6 ++---
 .../src/main/res/values-sk/10-preferences.xml |  3 +--
 .../main/res/values-sk/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-sl/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-sl/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-sl/10-preferences.xml |  3 +--
 .../main/res/values-sl/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-sq/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-sq/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-sq/10-preferences.xml |  3 +--
 .../main/res/values-sq/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-sr/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-sr/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-sr/10-preferences.xml |  3 +--
 .../main/res/values-sr/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-ss/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-ss/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-ss/10-preferences.xml |  3 +--
 .../main/res/values-ss/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-sv/02-strings.xml     | 19 ++++++----------
 .../src/main/res/values-sv/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-sv/10-preferences.xml |  3 +--
 .../main/res/values-sv/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-sw/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-sw/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-sw/10-preferences.xml |  3 +--
 .../main/res/values-sw/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-ta/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-ta/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-ta/10-preferences.xml |  3 +--
 .../main/res/values-ta/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-te/02-strings.xml     | 14 ++++++------
 .../src/main/res/values-te/03-dialogs.xml     |  6 ++---
 .../src/main/res/values-te/10-preferences.xml |  2 +-
 .../main/res/values-te/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-tg/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-tg/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-tg/10-preferences.xml |  3 +--
 .../main/res/values-tg/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-tgl/02-strings.xml    | 20 ++++++-----------
 .../src/main/res/values-tgl/03-dialogs.xml    |  8 +++----
 .../main/res/values-tgl/10-preferences.xml    |  3 +--
 .../main/res/values-tgl/17-model-manager.xml  |  4 ++--
 .../src/main/res/values-th/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-th/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-th/10-preferences.xml |  3 +--
 .../main/res/values-th/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-ti/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-ti/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-ti/10-preferences.xml |  3 +--
 .../main/res/values-ti/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-tn/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-tn/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-tn/10-preferences.xml |  3 +--
 .../main/res/values-tn/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-tr/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-tr/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-tr/10-preferences.xml |  2 +-
 .../main/res/values-tr/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-ts/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-ts/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-ts/10-preferences.xml |  3 +--
 .../main/res/values-ts/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-tt/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-tt/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-tt/10-preferences.xml |  3 +--
 .../main/res/values-tt/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-ug/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-ug/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-ug/10-preferences.xml |  3 +--
 .../main/res/values-ug/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-uk/02-strings.xml     | 19 ++++++----------
 .../src/main/res/values-uk/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-uk/10-preferences.xml |  3 +--
 .../main/res/values-uk/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-ur/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-ur/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-ur/10-preferences.xml |  3 +--
 .../main/res/values-ur/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-uz/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-uz/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-uz/10-preferences.xml |  3 +--
 .../main/res/values-uz/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-ve/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-ve/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-ve/10-preferences.xml |  3 +--
 .../main/res/values-ve/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-vi/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-vi/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-vi/10-preferences.xml |  3 +--
 .../main/res/values-vi/17-model-manager.xml   |  4 ++--
 AnkiDroid/src/main/res/values-wo/01-core.xml  |  4 ++--
 .../src/main/res/values-wo/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-wo/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-wo/10-preferences.xml |  3 +--
 .../main/res/values-wo/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-xh/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-xh/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-xh/10-preferences.xml |  3 +--
 .../main/res/values-xh/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-yue/02-strings.xml    | 20 ++++++-----------
 .../src/main/res/values-yue/03-dialogs.xml    |  8 +++----
 .../main/res/values-yue/10-preferences.xml    |  3 +--
 .../main/res/values-yue/17-model-manager.xml  |  4 ++--
 .../src/main/res/values-zh-rCN/02-strings.xml | 22 +++++++------------
 .../src/main/res/values-zh-rCN/03-dialogs.xml |  8 +++----
 .../main/res/values-zh-rCN/10-preferences.xml |  3 +--
 .../res/values-zh-rCN/17-model-manager.xml    |  4 ++--
 .../src/main/res/values-zh-rTW/02-strings.xml | 19 ++++++----------
 .../src/main/res/values-zh-rTW/03-dialogs.xml |  8 +++----
 .../main/res/values-zh-rTW/10-preferences.xml |  3 +--
 .../res/values-zh-rTW/17-model-manager.xml    |  4 ++--
 .../src/main/res/values-zu/02-strings.xml     | 20 ++++++-----------
 .../src/main/res/values-zu/03-dialogs.xml     |  8 +++----
 .../src/main/res/values-zu/10-preferences.xml |  3 +--
 .../main/res/values-zu/17-model-manager.xml   |  4 ++--
 378 files changed, 1232 insertions(+), 1955 deletions(-)

diff --git a/AnkiDroid/src/main/res/values-af/02-strings.xml b/AnkiDroid/src/main/res/values-af/02-strings.xml
index f84627990a97..b7b4bed39c14 100644
--- a/AnkiDroid/src/main/res/values-af/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-af/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">Die beeld is te groot, voeg asseblief die beeld handmatig in</string>
     <string name="note_editor_video_too_large">Die videolêer is te groot, voeg asseblief die video handmatig in</string>
     <string name="note_editor_audio_too_large">Die klanklêer is te groot, voeg asseblief die klank handmatig in</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android-rugsteun aan die gang. Probeer asseblief weer</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">Jy sal dalk iManager moet gebruik om AnkiDroid toe te laat om kortpaaie by te voeg</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Jou tuisskerm laat nie toe dat AnkiDroid kortpaaie byvoeg nie</string>
     <string name="create_shortcut_error">Fout met byvoeging van kortpad: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Opname gestoor</string>
     <string name="deleting_selected_notes">Besig om geselekteerde notas uit te vee</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tik \'n stem om te luister
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Stem moet geïnstalleer word voor gebruik
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Gebruik tog
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Teks-na-spraak fout (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Installeer
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Kon nie teks-na-spraak-instellings oopmaak nie
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Meld asseblief aan om meer dekke af te laai</string>
     <string name="deck_description_field_hint">Beskrywing</string>
     <string name="failed_to_copy">Kon nie kopieer nie</string>
diff --git a/AnkiDroid/src/main/res/values-af/03-dialogs.xml b/AnkiDroid/src/main/res/values-af/03-dialogs.xml
index 36ade9d632ef..6c107234b6f2 100644
--- a/AnkiDroid/src/main/res/values-af/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-af/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Databasis fout</string>
     <string name="answering_error_message">Skryf na die versameling het misluk. Die databasis kan korrup wees of daar mag nie genoeg leë spasie op die skyf wees nie.\n\nAs dit meer gereeld gebeur, probeer om die databasis na te gaan, die versameling te herstel of dit van \'n rugsteun te herstel. Raak “opsies” aan daarvoor.\n\Of dit kan ook \'n AnkiDroid-fout wees; rapporteer asseblief die fout sodat ons dit kan nagaan.</string>
     <string name="answering_error_report">Rapporteer fout</string>
-    <string name="storage_full_message">Daar is nie genoeg vrye stoorplek om AnkiDroid oop te maak nie. Maak \'n bietjie spasie vry om voort te gaan. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Wil jy regtig probeer om die databasis te herstel?\n\nVoor die poging begin, sal \'n kopie in subgids “%s” geskep word.</string>
     <string name="intent_aedict_empty">Kategorie “verstek” is leeg</string>
     <string name="intent_aedict_category">Om kaarte by AnkiDroid te voeg, verwyder alle Notepad-kategorieë of voeg een by met die naam “verstek”</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Moenie weer wys nie</string>
     <string name="dismiss_backup_warning_title">Waarskuwing vir dataverlies</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Pak bestaan reeds</string>
     <string name="empty_deck_name">Paknaam kan nie leeg wees nie</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-af/10-preferences.xml b/AnkiDroid/src/main/res/values-af/10-preferences.xml
index 248b4b61f340..16ba5432758d 100644
--- a/AnkiDroid/src/main/res/values-af/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-af/10-preferences.xml
@@ -297,8 +297,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-af/17-model-manager.xml b/AnkiDroid/src/main/res/values-af/17-model-manager.xml
index 3e62f4b670d0..10b1f165f443 100644
--- a/AnkiDroid/src/main/res/values-af/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-af/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Are you sure you wish to delete this field?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>
diff --git a/AnkiDroid/src/main/res/values-am/02-strings.xml b/AnkiDroid/src/main/res/values-am/02-strings.xml
index d3c686c3bb2f..c2a6fe35b154 100644
--- a/AnkiDroid/src/main/res/values-am/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-am/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-am/03-dialogs.xml b/AnkiDroid/src/main/res/values-am/03-dialogs.xml
index 10a8ad3103bb..bb74e55c2525 100644
--- a/AnkiDroid/src/main/res/values-am/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-am/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Database error</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Report error</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-am/10-preferences.xml b/AnkiDroid/src/main/res/values-am/10-preferences.xml
index aae58b25247e..419f9b2e9ae4 100644
--- a/AnkiDroid/src/main/res/values-am/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-am/10-preferences.xml
@@ -297,8 +297,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-am/17-model-manager.xml b/AnkiDroid/src/main/res/values-am/17-model-manager.xml
index a2e49df4809c..e19acbb84e03 100644
--- a/AnkiDroid/src/main/res/values-am/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-am/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Are you sure you wish to delete this field?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">ያክሉ: %1$s</string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>
diff --git a/AnkiDroid/src/main/res/values-ar/02-strings.xml b/AnkiDroid/src/main/res/values-ar/02-strings.xml
index ef742e33d0b5..8653036eb563 100644
--- a/AnkiDroid/src/main/res/values-ar/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ar/02-strings.xml
@@ -249,7 +249,7 @@
     <string name="note_editor_image_too_large">الصورة كبيرة جدًا للصق، أضف الصورة يدويًا</string>
     <string name="note_editor_video_too_large">مِلَفّ الفيديو كبير جدًا، يرجى إدخال الفيديو يدويًا</string>
     <string name="note_editor_audio_too_large">الملف الصوتي كبير جداً، يرجى إدخال الصوت يدوياً</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        النسخ الاحتياطي للأندرويد قيد التقدم. الرجاء المحاولة مجددًا</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">قد تحتاج إلى استخدام iManager للسماح لأنكيدرويد بإضافة اختصارات</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">لا تسمح شاشتك الرئيسية لأنكيدرويد بإضافة اختصارات</string>
     <string name="create_shortcut_error">حدث خطأ عند إضافة الاختصار: %s</string>
@@ -325,20 +325,14 @@
     <string name="browser_options_dialog_heading">خيارات المتصفح</string>
     <string name="audio_saved">تم حفظ التسجيل</string>
     <string name="deleting_selected_notes">حذف الملحوظات المحددة</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        انقر على صوت للاستماع
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">يجب تثبيت الصوت قبل استخدامه
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">استخدم على أي حال
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">خطأ في تحويل النص إلى الكلام (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        إنترنت
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        تنصيب
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        فشل فتح إعدادات تحويل النص إلى كلام
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">الرجاء تسجيل الدخول لتنزيل المزيد من المجموعات</string>
     <string name="deck_description_field_hint">الوصف</string>
     <string name="failed_to_copy">فشل النسخ</string>
diff --git a/AnkiDroid/src/main/res/values-ar/03-dialogs.xml b/AnkiDroid/src/main/res/values-ar/03-dialogs.xml
index d968bb324ef7..4ed3faf681b1 100644
--- a/AnkiDroid/src/main/res/values-ar/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ar/03-dialogs.xml
@@ -72,7 +72,7 @@
     <string name="answering_error_title">خطأ في قاعدة البيانات</string>
     <string name="answering_error_message">فشلت الكتابة إلى المجموعة. قد تكون قاعدة البيانات تالفة أو قد لا تكون هناك مساحة كافية على القرص.\n\nإذا كان هذا يحدث غالبًا، جرب فحص قاعدة البيانات، أو إصلاح المجموعة، أو استرجاعها من نسخة احتياطية. انقر «خيارات» لفعل ذلك. \nأو قد يكون هذا عطلًا في أنكي درويد ربما؛ الرجاء الإبلاغ عن هذا لنتحقق منه.</string>
     <string name="answering_error_report">إبلاغ عن الخطأ</string>
-    <string name="storage_full_message">لا توجد مساحة تخزين كافية لفتح AnkiDroid. أفرج عن بعض المساحة للمتابعة. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">هل تريد حقًا إصلاح قاعدة البيانات؟\n\nقبل بدء هذه المحاولة، ستُنشَأ نسخة في المجلد الفرعي “%s”.</string>
     <string name="intent_aedict_empty">تصنيف “default” فارغ</string>
     <string name="intent_aedict_category">لإضافة بطاقات إلى أنكيدرويد، أزل كل تصنيفات المفكرة أو أضف تصنيفًا باسم “default”</string>
@@ -228,10 +228,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">لاحقًا</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">لا تُظهر مجدّدًا</string>
     <string name="dismiss_backup_warning_title">تحذير فقدان البيانات</string>
-    <string name="dismiss_backup_warning_new_user">        بسبب تغييرات خصوصية الأندرويد، سيتم حذف بياناتك والنسخ الاحتياطية الآلية من هاتفك إذا تم إلغاء تثبيت التطبيق
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        بسبب تغييرات خصوصية الأندرويد، سيتم حذف بياناتك والنسخ الاحتياطية الآلية من هاتفك إذا تم إلغاء تثبيت التطبيق
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">هذه الرزمة موجودة بالفعل</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-ar/10-preferences.xml b/AnkiDroid/src/main/res/values-ar/10-preferences.xml
index 73c6197ebe7e..849189dd4130 100644
--- a/AnkiDroid/src/main/res/values-ar/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ar/10-preferences.xml
@@ -304,7 +304,7 @@
     <string name="pref_cat_dev_options" maxLength="41">خيارات المطور</string>
     <string name="dev_options_enabled_pref" maxLength="41">تفعيل خيارات المطور</string>
     <string name="disable_dev_options">إلغاء تفعيل خيارات المطور</string>
-    <string name="dev_options_warning">        يرجى التفكير قبل تفعيل خيارات المطور. هذه الخيارات خطرة وقد تعطل التطبيق أو مجموعتك.\n\nلاحظ أن هذه الخيارات ليست مناسبة لمعظم المستخدمين لذلك فهي ليست مترجمة بل معروضة بالإنجليزية.</string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-ar/17-model-manager.xml b/AnkiDroid/src/main/res/values-ar/17-model-manager.xml
index 9c318846b3c3..28de8a7ba385 100644
--- a/AnkiDroid/src/main/res/values-ar/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ar/17-model-manager.xml
@@ -72,9 +72,9 @@
     <string name="model_delete_warning">هل أنت متأكد من رغبتك في حذف نوع الملحوظة هذا؟</string>
     <string name="field_delete_warning">هل أنت متأكد من رغبتك في حذف هذا الحقل؟</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">إضافة: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">استنساخ: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">أدخل القالب الذي سيستخدمه متصفح البطاقات لعرض بطاقاتك. استخدم هذا لعرض جواب أقصر.\n\nيمكن اختصار قالب أمامي يحتوي على «عاصمة {{Country}} هي:»\nفي متصفح البطاقات بـ «عاصمة: {{Country}}»</string>
     <string name="card_template_browser_appearance_question_format">صيغة السؤال</string>
diff --git a/AnkiDroid/src/main/res/values-az/02-strings.xml b/AnkiDroid/src/main/res/values-az/02-strings.xml
index 28e0288f1569..38610f3b019a 100644
--- a/AnkiDroid/src/main/res/values-az/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-az/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-az/03-dialogs.xml b/AnkiDroid/src/main/res/values-az/03-dialogs.xml
index 36c60a1f1c9c..43cba5ed7764 100644
--- a/AnkiDroid/src/main/res/values-az/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-az/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Verilənlər bazası səhvi</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Səhv bildir</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Doğrudan verilənlər bazasını bərpa etməyə çalışırsınız?Keçirilməyə başlamazdan əvvəl,alt klasörlerde bir kopya yaradılacaq \"%s\"</string>
     <string name="intent_aedict_empty">Kateqoriya \"default\" boşdur</string>
     <string name="intent_aedict_category">AnkiDroid kartlarını əlavə etmək üçün bütün Notepad kateqoriyalarını silin və ya \"default\" adını əlavə edin</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-az/10-preferences.xml b/AnkiDroid/src/main/res/values-az/10-preferences.xml
index 4fda357d1c06..a04d6d329aae 100644
--- a/AnkiDroid/src/main/res/values-az/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-az/10-preferences.xml
@@ -297,8 +297,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-az/17-model-manager.xml b/AnkiDroid/src/main/res/values-az/17-model-manager.xml
index 4a80076d0bd6..002a59502830 100644
--- a/AnkiDroid/src/main/res/values-az/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-az/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Bu sahəni silmək istədiyinizə əminsiniz?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Əlavə et: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Klonla: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>
diff --git a/AnkiDroid/src/main/res/values-be/02-strings.xml b/AnkiDroid/src/main/res/values-be/02-strings.xml
index 772cf506039a..3902bf933dcd 100644
--- a/AnkiDroid/src/main/res/values-be/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-be/02-strings.xml
@@ -241,7 +241,7 @@
     <string name="note_editor_image_too_large">Занадта вялікі відарыс, паспрабуйце ўставіць відарыс уручную</string>
     <string name="note_editor_video_too_large">Занадта вялікі відэафайл, паспрабуйце ўставіць відэа ўручную</string>
     <string name="note_editor_audio_too_large">Занадта вялікі аўдыяфайл, паспрабуйце ўставіць аўдыя ўручную</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Адбываецца рэзервовае капіяванне аперацыйнай сістэмы. Паспрабуйце яшчэ раз</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">Паспрабуйце скарыстацца праграмай iManager для таго, каб дазволіць AnkiDroid дадаваць ярлыкі</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Ваш галоўны экран не дазваляе праграме дадаваць ярлыкі</string>
     <string name="create_shortcut_error">\"Памылка дабаўлення ярлыка: %s</string>
@@ -315,16 +315,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Запіс захаваны</string>
     <string name="deleting_selected_notes">Выдаленне выбраных нататак</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Націсніце на голас, каб паслухаць
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Перад выкарыстаннем неабходна ўсталяваць голас</string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Усё роўна скарыстацца</string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Памылка сінтэзу маўлення (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Інтэрнэт</string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Усталяваць</string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Не ўдалося адкрыць налады сінтэзу маўлення
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Увайдзіце, каб спампаваць больш калод</string>
     <string name="deck_description_field_hint">Апісанне</string>
     <string name="failed_to_copy">Не ўдалося скапіяваць</string>
diff --git a/AnkiDroid/src/main/res/values-be/03-dialogs.xml b/AnkiDroid/src/main/res/values-be/03-dialogs.xml
index 7eabc2e271c1..4166443e7a9b 100644
--- a/AnkiDroid/src/main/res/values-be/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-be/03-dialogs.xml
@@ -68,7 +68,7 @@
     <string name="answering_error_title">Памылка базы даных</string>
     <string name="answering_error_message">Збой запісу ў калекцыю. Прычынаю можа быць пашкоджаная база даных або недахоп свабоднага месца на дыску.\n\nПаспрабуйце праверыць базу даных або аднавіць калекцыю з рэзервовай копіі. Для гэтага націсніце \"Параметры\". \n\Таксама гэта памылка можа быць выклікана самой праграмай; паведаміце пра гэта распрацоўшчыкам.</string>
     <string name="answering_error_report">Паведаміць пра памылку</string>
-    <string name="storage_full_message">Недастаткова свабоднага месца, каб адрыць AnkiDroid. Вызваліце крыху месца на прыладзе, каб працягнуць.</string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Вы сапраўды хочаце аднавіць базу даных?\n\nПерад спробай па яе аднаўленні, будзе створана копія ў  падпапцы \'%s\'.</string>
     <string name="intent_aedict_empty">Катэгорыя “default” нічога не змяшчае</string>
     <string name="intent_aedict_category">Для таго, каб дадаць карткі ў AnkiDroid, выдаліце ўсе катэгорыі Notepad або дадайце катэгорыю з назвай \"default\"</string>
@@ -220,12 +220,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Пазней</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Больш не паказваць</string>
     <string name="dismiss_backup_warning_title">Папярэджанне пра страту даных</string>
-    <string name="dismiss_backup_warning_new_user">        У сувязі са змяненнямі палітыкі прыватнасці Android, пасля выдалення праграмы вашы даныя і аўтаматычныя рэзервовыя копіі будуць выдалены з вашай прылады
-    
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        У сувязі са змяненнямі палітыкі прыватнасці Android, пасля выдалення праграмы вашы даныя і аўтаматычныя рэзервовыя копіі стануць недаступны
-    
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Калода ўжо існуе</string>
     <string name="empty_deck_name">Калода не можа быць пустой</string>
     <string name="create_deck_numeric_hint">Калі ў вас ёсць праблемы з парадкам калод (напрыклад, ‘10’  калода стаіць перад ‘2’), замяніце ‘2’ на ‘02’ </string>
diff --git a/AnkiDroid/src/main/res/values-be/10-preferences.xml b/AnkiDroid/src/main/res/values-be/10-preferences.xml
index ada55da0c3cc..88eace8a4167 100644
--- a/AnkiDroid/src/main/res/values-be/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-be/10-preferences.xml
@@ -301,8 +301,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Параметры распрацоўшчыка</string>
     <string name="dev_options_enabled_pref" maxLength="41">Уключыць параметры распрацоўшчыка</string>
     <string name="disable_dev_options">Адключыць параметры распрацоўшчыка</string>
-    <string name="dev_options_warning">        Пераканайцеся, што вы сапраўды ўпэўнены ў сваіх дзеяннях. Гэтыя параметры з\'яўляюцца небяспечнымі і могуць парушыць працу праграмы або пашкодзіць вашу калекцыю.\n\nЗвярніце ўвагу, што гэтыя параметры не пасуюць для большасці карыстальнікаў і таму, яны не перакладаюцца. Па гэтай прычыны, яны пішуцца толькі на англійскай мове.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-be/17-model-manager.xml b/AnkiDroid/src/main/res/values-be/17-model-manager.xml
index 5a0b4dd2867a..0ccc70fd96fb 100644
--- a/AnkiDroid/src/main/res/values-be/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-be/17-model-manager.xml
@@ -68,9 +68,9 @@
     <string name="model_delete_warning">Вы сапраўды хочаце выдаліць гэты тып нататкі?</string>
     <string name="field_delete_warning">Вы сапраўды хочаце выдаліць гэта поле?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Дадаць: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Кланіраваць: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Увядзіце шаблон, які аглядальнік картак будзе выкарыстоўваць для адлюстравання вашых картак. Выкарыстоўвайце яго для адлюстравання найбольш дакладнага адказу.\n\n Шаблон для пярэдняга боку карткі\n \"Сталіца {{Country}}:\nможна сціснуць у аглядальніку картак да\n\"Сталіца: {{Country}}\"</string>
     <string name="card_template_browser_appearance_question_format">Фармат пытання</string>
diff --git a/AnkiDroid/src/main/res/values-bg/02-strings.xml b/AnkiDroid/src/main/res/values-bg/02-strings.xml
index 5f4fbe86fed0..c2c06458f33a 100644
--- a/AnkiDroid/src/main/res/values-bg/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-bg/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Грешка, добавяйки пряк път: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-bg/03-dialogs.xml b/AnkiDroid/src/main/res/values-bg/03-dialogs.xml
index 0b9e151c2e14..6c695bc6b23b 100644
--- a/AnkiDroid/src/main/res/values-bg/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-bg/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Грешка в базата данни</string>
     <string name="answering_error_message">Писането в колекцията е неуспешна. Базата данни може да е повредена или може да няма свободно пространство на диска.\n\nАко това се случва по-често, опитайте да проверите базата данни, да поправите колекцията или да възстановите я от резервно копия. Докоснете \"Опции\" за това.\n\Това може да е грешка в AnkiDroid; Моля, съобщете за тази грешка, да можем да я проверим.</string>
     <string name="answering_error_report">Доклад грешки</string>
-    <string name="storage_full_message">Няма достатъчно място в хранилището, за да се отвори AnkiDroid. Освободете някакво място, за да продължите. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Наистина ли искате да опитате да поправите базата данни? \n\nПреди да започнете, копие ще бъде създадено в папка \"%s\".</string>
     <string name="intent_aedict_empty">Категория \"по подразбиране\" е празна</string>
     <string name="intent_aedict_category">За да добавите карти за AnkiDroid, премахнете всички категории на Notepad или добавите такава с име \'default\'</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">По-късно</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Без ново показване</string>
     <string name="dismiss_backup_warning_title">Предупреждение за загуба на данни</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-bg/10-preferences.xml b/AnkiDroid/src/main/res/values-bg/10-preferences.xml
index 1491c80a5400..119b6b45b39d 100644
--- a/AnkiDroid/src/main/res/values-bg/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-bg/10-preferences.xml
@@ -296,8 +296,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-bg/17-model-manager.xml b/AnkiDroid/src/main/res/values-bg/17-model-manager.xml
index 55ce8a4507a6..f38dda468d4f 100644
--- a/AnkiDroid/src/main/res/values-bg/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-bg/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Наистина ли искате да изтриете този тип бележка?</string>
     <string name="field_delete_warning">Сигурни ли сте, че желаете изтриване на модела?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Добавяне: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Клониране: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Формат на въпрос</string>
diff --git a/AnkiDroid/src/main/res/values-bn/02-strings.xml b/AnkiDroid/src/main/res/values-bn/02-strings.xml
index 0664676cb3a5..4567f40ffea2 100644
--- a/AnkiDroid/src/main/res/values-bn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-bn/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">ছবি খুবই বড়, অনুগ্রহ করে ম্যানুয়ালি ছবি ঢোকান</string>
     <string name="note_editor_video_too_large">ভিডিও ফাইলটি খুব বড়, দয়া করে ভিডিওটি ম্যানুয়ালি ঢোকান৷</string>
     <string name="note_editor_audio_too_large">অডিও ফাইলটি খুব বড়, অনুগ্রহ করে ম্যানুয়ালি অডিও ঢোকান৷</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">অ্যান্ড্রয়েড ব্যাকআপ চলছে। আবার চেষ্টা করুন</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">AnkiDroid-কে শর্টকাট যোগ করার অনুমতি দিতে আপনাকে iManager ব্যবহার করতে হতে পারে</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">আপনার হোম স্ক্রীন AnkiDroid-কে শর্টকাট যোগ করার অনুমতি দেয় না</string>
     <string name="create_shortcut_error">শর্টকাট যোগ করার সময় ত্রুটি: %s</string>
@@ -305,14 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">রেকর্ডিং সংরক্ষিত হয়</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">শুনতে একটি ভয়েস আলতো চাপুন</string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">ব্যবহারের আগে ভয়েস ইনস্টল করা উচিত</string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">যাইহোক এটি ব্যবহার করুন</string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">টেক্সট টু স্পিচ ত্রুটি (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">ইন্টারনেট</string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">ইনস্টল করুন</string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">টেক্সট টু স্পিচ সেটিংস খুলতে ব্যর্থ হয়েছে</string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">আরো ডেক ডাউনলোড করতে লগ ইন করুন</string>
     <string name="deck_description_field_hint">বর্ণনা</string>
     <string name="failed_to_copy">অনুলিপি ব্যর্থ হয়েছে</string>
diff --git a/AnkiDroid/src/main/res/values-bn/03-dialogs.xml b/AnkiDroid/src/main/res/values-bn/03-dialogs.xml
index 1c0cf570db0e..51249d409c1b 100644
--- a/AnkiDroid/src/main/res/values-bn/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-bn/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">ডাটাবেস ত্রুটি</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">ত্রুটি রিপোর্ট</string>
-    <string name="storage_full_message">AnkiDroid খোলার জন্য পর্যাপ্ত ফ্রি স্টোরেজ স্পেস নেই। চালিয়ে যেতে কিছু জায়গা খালি করুন।</string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">আপনি কি ডাটাবেস মেরামত করার চেষ্টা করার বিষয়ে নিশ্চিত?\n\nপ্রয়াস শুরু করার আগে, সাবফোল্ডার “%s”-এ একটি অনুলিপি তৈরি করা হবে।</string>
     <string name="intent_aedict_empty">বিভাগ \"ডিফল্ট\" খালি</string>
     <string name="intent_aedict_category">AnkiDroid-এ কার্ড যোগ করতে নোটপ্যাডের সমস্ত বিভাগ সরিয়ে ফেলুন বা \"ডিফল্ট\" নামে একটি যোগ করুন।</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">আবার দেখাবেন না</string>
     <string name="dismiss_backup_warning_title">ডেটা হারানোর সতর্কতা</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">ডেক ইতিমধ্যেই বিদ্যমান</string>
     <string name="empty_deck_name">ডেকের নাম খালি রাখা যাবে না</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-bn/10-preferences.xml b/AnkiDroid/src/main/res/values-bn/10-preferences.xml
index 024723d875a3..66d5d8ccea2c 100644
--- a/AnkiDroid/src/main/res/values-bn/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-bn/10-preferences.xml
@@ -297,8 +297,7 @@
     <string name="pref_cat_dev_options" maxLength="41">বিকাশকারী বিকল্প</string>
     <string name="dev_options_enabled_pref" maxLength="41">বিকাশকারী বিকল্পগুলি সক্ষম করুন৷</string>
     <string name="disable_dev_options">বিকাশকারী বিকল্পগুলি অক্ষম করুন</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-bn/17-model-manager.xml b/AnkiDroid/src/main/res/values-bn/17-model-manager.xml
index 875e607ec032..b262d457f3e5 100644
--- a/AnkiDroid/src/main/res/values-bn/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-bn/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">আপনি এই নোট টাইপ মুছে ফেলার বিষয়ে নিশ্চিত?</string>
     <string name="field_delete_warning">আপনি এই ক্ষেত্র মুছে ফেলার বিষয়ে নিশ্চিত?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">যোগ করুন: %1$s</string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">ক্লোন: %1$s</string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">প্রশ্ন বিন্যাস</string>
diff --git a/AnkiDroid/src/main/res/values-ca/02-strings.xml b/AnkiDroid/src/main/res/values-ca/02-strings.xml
index 5ba93670e8e1..2061d5b4293e 100644
--- a/AnkiDroid/src/main/res/values-ca/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ca/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">La imatge és massa gran per enganxar-la. Inseriu-la manualment si us plau</string>
     <string name="note_editor_video_too_large">El vídeo és massa gran per enganxar-lo. Inseriu-lo manualment si us plau</string>
     <string name="note_editor_audio_too_large">L\'àudio és massa gran per enganxar-lo. Inseriu-lo manualment si us plau</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        S\'està fent una còpia de seguretat d\'Android. Prova-ho un altre vegada si us plau</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">Potser haureu de fer servir iManager per permetre a AnkiDroid afegir dreceres</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">La pantalla d\'inici no permet que AnkiDroid afegeixi dreceres</string>
     <string name="create_shortcut_error">Error afegint drecera: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">S\'ha desat l\'enregistrament.</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Descripció</string>
     <string name="failed_to_copy">No s\'ha pogut copiar!</string>
diff --git a/AnkiDroid/src/main/res/values-ca/03-dialogs.xml b/AnkiDroid/src/main/res/values-ca/03-dialogs.xml
index 6bcb708fe277..0043277a3fec 100644
--- a/AnkiDroid/src/main/res/values-ca/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ca/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Error de la base de dades</string>
     <string name="answering_error_message">No s\'ha pogut escriure a la col·lecció. La base de dades podria estar malmesa o potser no hi ha prou espai buit al disc. \n\nSi això passa més sovint, proveu de comprovar la base de dades, reparar la col·lecció o restaurar-la des d\'una còpia de seguretat. Toqueu \"opcions\" per fer-ho.\n\nTambé podria ser un error d\'AnkiDroid; Informeu de l’error perquè puguem comprovar-ho.</string>
     <string name="answering_error_report">Informa dels errors</string>
-    <string name="storage_full_message">No hi ha prou espai d\'emmagatzematge lliure per obrir AnkiDroid. Allibereu una mica d\'espai per continuar. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Realment voleu intentar reparar la base de dades? \n\nAbans de començar, es desarà una còpia a la carpeta \'%s\'.</string>
     <string name="intent_aedict_empty">La categoria \'per omissió\' és buida</string>
     <string name="intent_aedict_category">Per afegir fitxes d\'AnkiDroid treieu totes les categories del bloc de notes o afegiu-ne una anomenada \'per omissió\'</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Més endavant</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">No ho mostris més</string>
     <string name="dismiss_backup_warning_title">Avís de pèrdua de dades</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-ca/10-preferences.xml b/AnkiDroid/src/main/res/values-ca/10-preferences.xml
index 826fc3d511cb..2ec70292a9a1 100644
--- a/AnkiDroid/src/main/res/values-ca/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ca/10-preferences.xml
@@ -296,8 +296,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Opcions per a desenvolupadors</string>
     <string name="dev_options_enabled_pref" maxLength="41">Activa les opcions per a desenvolupadors</string>
     <string name="disable_dev_options">Desactiva les opcions per a desenvolupadors</string>
-    <string name="dev_options_warning">        Assegureu-vos abans d\'activar les opcions de desenvolupador. Aquestes opcions són perilloses i podrien trencar l\'aplicació o danyar la vostra col·lecció.\n\nTingueu en compte que aquestes opcions no són adequades per a la majoria dels usuaris i, per tant, no estan traduïdes, de manera que estan en anglès.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-ca/17-model-manager.xml b/AnkiDroid/src/main/res/values-ca/17-model-manager.xml
index e8c1167937be..2b47155e3eb5 100644
--- a/AnkiDroid/src/main/res/values-ca/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ca/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Esteu segur de que voleu suprimir aquest tipus de nota?</string>
     <string name="field_delete_warning">Esteu segur que voleu suprimir aquest camp?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Afegeix: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clona: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Introduïu la plantilla que utilitzarà el navegador de cartes per mostrar les vostres cartes. Utilitzeu aquesta opció per mostrar una resposta més concisa.\n\nUna plantilla frontal de\n “La capital de {{Country}} és:”\nes pot comprimir al navegador de targetes com\n “Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Format de la pregunta</string>
diff --git a/AnkiDroid/src/main/res/values-ckb/02-strings.xml b/AnkiDroid/src/main/res/values-ckb/02-strings.xml
index 2b293d912ddc..5236a1f3c028 100644
--- a/AnkiDroid/src/main/res/values-ckb/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ckb/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-ckb/03-dialogs.xml b/AnkiDroid/src/main/res/values-ckb/03-dialogs.xml
index d99b9cb1805c..5b0841bd8f48 100644
--- a/AnkiDroid/src/main/res/values-ckb/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ckb/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Çewtiya danegehê</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Report error</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-ckb/10-preferences.xml b/AnkiDroid/src/main/res/values-ckb/10-preferences.xml
index 76fb669b6a37..1a12afc3c31c 100644
--- a/AnkiDroid/src/main/res/values-ckb/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ckb/10-preferences.xml
@@ -297,8 +297,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-ckb/17-model-manager.xml b/AnkiDroid/src/main/res/values-ckb/17-model-manager.xml
index 6b89a122d404..eff2650b23bb 100644
--- a/AnkiDroid/src/main/res/values-ckb/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ckb/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Are you sure you wish to delete this field?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>
diff --git a/AnkiDroid/src/main/res/values-cs/02-strings.xml b/AnkiDroid/src/main/res/values-cs/02-strings.xml
index 077c692dab2c..6528744fb89c 100644
--- a/AnkiDroid/src/main/res/values-cs/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-cs/02-strings.xml
@@ -195,7 +195,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Pozadí</string>
     <string name="choose_an_image" maxLength="41">Vybrat obrázek</string>
-    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Odebrat pozadí</string>
     <string name="remove_background_image">Odebrat pozadí?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Obnovit výchozí</string>
@@ -241,7 +241,7 @@
     <string name="note_editor_image_too_large">Obrázek je příliš velký, vložte ho prosím ručně</string>
     <string name="note_editor_video_too_large">Video je příliš velké, vložte ho prosím ručně</string>
     <string name="note_editor_audio_too_large">Zvukový soubor je příliš velký, vložte ho prosím ručně</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Probíhá zálohování Androidu. Zkuste to prosím znovu</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">Prosím použijte iManager, abyste povolili přidávání zástupců AnkiDroid</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Vaše domovská obrazovka neumožňuje AnkiDroidu přidávat zástupce</string>
     <string name="create_shortcut_error">Chyba při přidávání zástupce: %s</string>
@@ -315,20 +315,14 @@
     <string name="browser_options_dialog_heading">Možnosti prohlížeče</string>
     <string name="audio_saved">Nahrávka uložena</string>
     <string name="deleting_selected_notes">Mažou se vybrané poznámky</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Klepnutím na hlas poslechnout
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Hlas by měl být před použitím nainstalován
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Přesto použít
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Chyba převodu textu na řeč (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Instalovat
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Nepodařilo se otevřít nastavení převodu textu na řeč
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Prosím přihlaste se, abyste mohli stáhnout více balíčků</string>
     <string name="deck_description_field_hint">Popisek</string>
     <string name="failed_to_copy">Kopírování se nezdařilo</string>
diff --git a/AnkiDroid/src/main/res/values-cs/03-dialogs.xml b/AnkiDroid/src/main/res/values-cs/03-dialogs.xml
index c1a511b8c5a7..72f3d2f70815 100644
--- a/AnkiDroid/src/main/res/values-cs/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-cs/03-dialogs.xml
@@ -68,7 +68,7 @@
     <string name="answering_error_title">Chyba databáze</string>
     <string name="answering_error_message">Zápis do kolekce se nezdařil. Databáze může být poškozena nebo nemusí být dostatek prázdného místa na disku.\n\nPokud se to děje častěji, zkuste zkontrolovat databázi, opravit kolekci nebo ji obnovit ze zálohy. Klepněte na „možnosti“.\n\nNebo to může být také chyba AnkiDroid, prosím nahlaste chybu, abychom to mohli zkontrolovat.</string>
     <string name="answering_error_report">Hlášení chyby</string>
-    <string name="storage_full_message">Není dostatek volného místa v úložišti pro otevření AnkiDroid. Uvolněte nějaké místo, abyste mohli pokračovat. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Opravdu se chcete pokusit opravit databázi?\n\nPřed obnovou bude vytvořena kopie v podadresáři „%s“.</string>
     <string name="intent_aedict_empty">Kategorie „výchozí“ je prázdná</string>
     <string name="intent_aedict_category">Chcete-li přidat karty do AnkiDroid, odstraňte všechny kategorie Poznámkového bloku nebo přidejte jednu s názvem „default“</string>
@@ -220,10 +220,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Později</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Znovu nezobrazovat</string>
     <string name="dismiss_backup_warning_title">Varování před ztrátou dat</string>
-    <string name="dismiss_backup_warning_new_user">        V důsledku změn ochrany osobních údajů systému Android budou vaše data a automatické zálohy odstraněny z telefonu, pokud bude aplikace odinstalována
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        V důsledku změn ochrany osobních údajů systému Android budou vaše data a automatické zálohy nedostupné, pokud bude aplikace odinstalována
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Balíček již existuje</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">Pokud máte problémy s pořadím balíčků (např. „10“ je před „2“), nahraďte „2“ číslem „02“</string>
diff --git a/AnkiDroid/src/main/res/values-cs/10-preferences.xml b/AnkiDroid/src/main/res/values-cs/10-preferences.xml
index 8b03c0412e8d..e77478b1e220 100644
--- a/AnkiDroid/src/main/res/values-cs/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-cs/10-preferences.xml
@@ -300,8 +300,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Možnosti pro vývojáře</string>
     <string name="dev_options_enabled_pref" maxLength="41">Povolit možnosti pro vývojáře</string>
     <string name="disable_dev_options">Zakázat možnosti pro vývojáře</string>
-    <string name="dev_options_warning">        Prosím buďte si jisti před povolením možností pro vývojáře. Tyto možnosti jsou nebezpečné a mohou poškodit aplikaci nebo vaši kolekci.\n\nVšimněte si, že tyto možnosti nejsou vhodné pro většinu uživatelů, a proto nejsou přeloženy, takže jsou v angličtině.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-cs/17-model-manager.xml b/AnkiDroid/src/main/res/values-cs/17-model-manager.xml
index 31baf6d625f4..d2ab662ce0d7 100644
--- a/AnkiDroid/src/main/res/values-cs/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-cs/17-model-manager.xml
@@ -68,9 +68,9 @@
     <string name="model_delete_warning">Opravdu si přejete odstranit tento typ poznámky?</string>
     <string name="field_delete_warning">Opravdu si přejete odstranit toto pole?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Přidat: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Klon: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Zadejte šablonu, kterou bude prohlížeč karet používat k zobrazení vašich karet. Použijte tuto možnost, abyste zobrazili stručnější odpovědi.\n\nŠablona líce\n„Hlavní město země {{Country}} je:“\nmůže být zestručněna v prohlížeči karet na\n„Hlavní město: {{Country}}“</string>
     <string name="card_template_browser_appearance_question_format">Formát otázky</string>
diff --git a/AnkiDroid/src/main/res/values-da/02-strings.xml b/AnkiDroid/src/main/res/values-da/02-strings.xml
index 45fb462a9dca..edc52f998108 100644
--- a/AnkiDroid/src/main/res/values-da/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-da/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-da/03-dialogs.xml b/AnkiDroid/src/main/res/values-da/03-dialogs.xml
index 4bc3e0510360..b4fe8a9fe445 100644
--- a/AnkiDroid/src/main/res/values-da/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-da/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Database fejl</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Report error</string>
-    <string name="storage_full_message">Der er ikke nok ledig lagerplads til at åbne AnkiDroid. Frigør plads for at fortsætte. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-da/10-preferences.xml b/AnkiDroid/src/main/res/values-da/10-preferences.xml
index d7f181212461..87963480083c 100644
--- a/AnkiDroid/src/main/res/values-da/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-da/10-preferences.xml
@@ -297,8 +297,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-da/17-model-manager.xml b/AnkiDroid/src/main/res/values-da/17-model-manager.xml
index aee4d51cdafd..eea20a4de042 100644
--- a/AnkiDroid/src/main/res/values-da/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-da/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Are you sure you wish to delete this field?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>
diff --git a/AnkiDroid/src/main/res/values-de/02-strings.xml b/AnkiDroid/src/main/res/values-de/02-strings.xml
index bb0dd039df32..722c6b00b582 100644
--- a/AnkiDroid/src/main/res/values-de/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-de/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">Das Bild ist zu groß, bitte fügen Sie das Bild manuell ein</string>
     <string name="note_editor_video_too_large">Die Videodatei ist zu groß, bitte fügen Sie das Video manuell ein</string>
     <string name="note_editor_audio_too_large">Die Audiodatei ist zu groß, bitte fügen Sie das Audio manuell ein</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android-Sicherung im Gange. Bitte versuchen Sie es erneut</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">Bitte verwenden Sie iManager, um AnkiDroid das Hinzufügen von Verknüpfungen zu erlauben</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Ihr Startbildschirm erlaubt AnkiDroid nicht, Verknüpfungen hinzuzufügen</string>
     <string name="create_shortcut_error">Fehler beim Hinzufügen der Verknüpfung: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Browser Einstellungen</string>
     <string name="audio_saved">Aufnahme gespeichert</string>
     <string name="deleting_selected_notes">Lösche ausgewählte Notizen</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Stimme berühren, um sie anzuhören
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Stimme sollte vor der Benutzung installiert sein
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Trotzdem
-    verwenden    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Fehler in der Sprachausgabe (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Installation
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Fehler beim Öffnen der TTS-Einstellungen
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Bitte melde dich an, um weitere Stapel herunterzuladen</string>
     <string name="deck_description_field_hint">Beschreibung</string>
     <string name="failed_to_copy">Kopieren fehlgeschlagen</string>
diff --git a/AnkiDroid/src/main/res/values-de/03-dialogs.xml b/AnkiDroid/src/main/res/values-de/03-dialogs.xml
index 14a4b52bd9ed..e653d6552973 100644
--- a/AnkiDroid/src/main/res/values-de/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-de/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Datenbankfehler</string>
     <string name="answering_error_message">Es konnte nicht in die Sammlung geschrieben werden. Dies kann an einer beschädigten Datenbank oder an unzureichendem Speicherplatz liegen.\n\nFalls dies häufiger vorkommt, versuchen Sie bitte, die Datenbank zu überprüfen, die Sammlung zu reparieren oder sie von einer Sicherung wiederherzustellen. Tippen Sie hierfür auf »Optionen«.\n\nEs könnte aber auch ein Fehler in AnkiDroid vorliegen. Damit wird dies überprüfen können, bitten wir Sie, den Fehler zu melden.</string>
     <string name="answering_error_report">Fehler melden</string>
-    <string name="storage_full_message">Es gibt nicht genug freien Speicherplatz, um AnkiDroid zu öffnen. Freier Speicherplatz zum Fortfahren. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Möchten Sie wirklich versuchen, die Datenbank zu reparieren?\n\nBevor der Versuch startet, wird eine Kopie im Unterordner »%s« angelegt.</string>
     <string name="intent_aedict_empty">Kategorie »Standard« ist leer</string>
     <string name="intent_aedict_category">Entfernen Sie alle Notepad-Kategorien um Karten zu AnkiDroid hinzuzufügen oder fügen Sie die Kategorie »Standard« hinzu</string>
@@ -212,8 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Später</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Nicht erneut anzeigen</string>
     <string name="dismiss_backup_warning_title">Warnung wegen Datenverlust</string>
-    <string name="dismiss_backup_warning_new_user">Aufgrund von Änderungen in den Privatsphäreeinstellungen von Android, werden deine Daten und automatische Backups gelöscht, sobald du die App deinstallierst.</string>
-    <string name="dismiss_backup_warning_upgrade">Aufgrund von Änderungen in den Privatsphäreeinstellungen von Android, werden deine Daten und automatische Backups nicht mehr zugreifbar sein, falls du die App deinstallierst.</string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Stapel bereits vorhanden</string>
     <string name="empty_deck_name">Stapelname darf nicht leer sein</string>
     <string name="create_deck_numeric_hint">Wenn Sie Probleme mit der Reihenfolge der Stapel haben (z.B. \'10\' erscheint vor \'2\'), ersetzen Sie \'2\' durch \'02\'</string>
diff --git a/AnkiDroid/src/main/res/values-de/10-preferences.xml b/AnkiDroid/src/main/res/values-de/10-preferences.xml
index cab02774a1e1..23dd939c435c 100644
--- a/AnkiDroid/src/main/res/values-de/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-de/10-preferences.xml
@@ -296,8 +296,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Entwicklermodus</string>
     <string name="dev_options_enabled_pref" maxLength="41">Entwicklermodus aktivieren</string>
     <string name="disable_dev_options">Entwicklermodus deaktivieren</string>
-    <string name="dev_options_warning">        Bevor Sie den Entwicklermodus aktivieren, beachten Sie bitte, dass Sie damit die App oder Ihre Sammlung beschädigen können.\n\nBeachten Sie außerdem, dass diese Einstellungen für die meisten Benutzer nicht geeignet sind und deshalb nicht übersetzt werden und daher nur auf Englisch verfügbar sind.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-de/17-model-manager.xml b/AnkiDroid/src/main/res/values-de/17-model-manager.xml
index e20dcbb958e3..fa5352aa4f28 100644
--- a/AnkiDroid/src/main/res/values-de/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-de/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Möchten Sie diesen Notiztyp wirklich löschen?</string>
     <string name="field_delete_warning">Möchten Sie dieses Feld wirklich löschen?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Hinzufügen: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Klonen: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Geben Sie die Vorlage ein, die die Kartenübersicht zum Anzeigen Ihrer Karten verwendet, um eine kürzere Antwort anzuzeigen.\n\nEine Vorderseitenvorlage von\n»Die Hauptstadt von {{Country}} ist:«\nkönnte in der Kartenübersicht komprimiert werden zu\n»Hauptstadt: {{Country}}«</string>
     <string name="card_template_browser_appearance_question_format">Frageformat</string>
diff --git a/AnkiDroid/src/main/res/values-el/02-strings.xml b/AnkiDroid/src/main/res/values-el/02-strings.xml
index 7e85cb05b044..97e17a82c6c7 100644
--- a/AnkiDroid/src/main/res/values-el/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-el/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">Η εικόνα είναι πολύ μεγάλη, παρακαλώ εισάγετε την εικόνα χειροκίνητα</string>
     <string name="note_editor_video_too_large">Το αρχείο βίντεο είναι πολύ μεγάλο, παρακαλώ εισάγετε το βίντεο χειροκίνητα</string>
     <string name="note_editor_audio_too_large">Το αρχείο ήχου είναι πολύ μεγάλο, παρακαλώ εισάγετε ήχο χειροκίνητα</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Αντίγραφο ασφαλείας Android σε εξέλιξη. Παρακαλώ προσπαθήστε ξανά</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">Ίσως χρειαστεί να χρησιμοποιήσετε το iManager για να επιτρέψετε στο AnkiDroid να προσθέσει συντομεύσεις</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Η αρχική σας οθόνη δεν επιτρέπει στο AnkiDroid να προσθέσει συντομεύσεις</string>
     <string name="create_shortcut_error">Σφάλμα κατά την προσθήκη συντόμευσης: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Η ηχογράφηση αποθηκεύτηκε</string>
     <string name="deleting_selected_notes">Διαγραφή επιλεγμένων σημειώσεων</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Πατήστε μια φωνή για ακρόαση
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Η φωνή πρέπει να εγκατασταθεί πριν από τη χρήση
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Χρήση οπωσδήποτε
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Σφάλμα κειμένου σε ομιλία (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Διαδίκτυο
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Εγκατάσταση
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Αποτυχία ανοίγματος ρυθμίσεων κειμένου σε ομιλία
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Παρακαλώ συνδεθείτε για να κατεβάσετε περισσότερες τράπουλες</string>
     <string name="deck_description_field_hint">Περιγραφή</string>
     <string name="failed_to_copy">Αποτυχία αντιγραφής</string>
diff --git a/AnkiDroid/src/main/res/values-el/03-dialogs.xml b/AnkiDroid/src/main/res/values-el/03-dialogs.xml
index f7895f65d938..6ed1cc24b0c7 100644
--- a/AnkiDroid/src/main/res/values-el/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-el/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Σφάλμα βάσης δεδομένων</string>
     <string name="answering_error_message">Παρουσιάστηκε σφάλμα κατά την εγγραφή στη συλλογή. Αυτό θα μπορεί να σχετίζεται με κατεστραμμένη βάση δεδομένων ή ανεπαρκή αποθηκευτικό χώρο.\n\nΑν συμβαίνει συχνά, προσπαθήστε να ελέγξετε τη βάση δεδομένων, να επιδιορθώσετε τη συλλογή ή να την επαναφέρετε από ένα αντίγραφο. Κάντε κλικ στις σχετικές «επιλογές».\n\nΕκτός αυτού, μπορεί να είναι και σφάλμα του AnkiDroid· παρακαλούμε αναφέρετε το σφάλμα ώστε να το ελέγξουμε.</string>
     <string name="answering_error_report">Αναφορά σφάλματος</string>
-    <string name="storage_full_message">Δεν υπάρχει αρκετός ελεύθερος αποθηκευτικός χώρος για το άνοιγμα του AnkiDroid. Ελευθερώστε λίγο χώρο για να συνεχίσετε. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Είστε βέβαιοι ότι θέλετε να επιδιορθώσετε τη βάση δεδομένων;\n\nΠριν να ξεκινήσει η απόπειρα, θα δημιουργηθεί ένα αντίγραφο στον υποφάκελο \'%s\'.</string>
     <string name="intent_aedict_empty">Η κατηγορία «προεπιλεγμένο» είναι κενή</string>
     <string name="intent_aedict_category">Για να προσθέσετε κάρτες στο Ανκί-Ντρόιντ αφαιρέστε όλες τις κατηγορίες Notepad ή προσθέστε μία με όνομα «προεπιλεγμένο»</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Αργότερα</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Να μην εμφανιστεί ξανά</string>
     <string name="dismiss_backup_warning_title">Προειδοποίηση απώλειας δεδομένων</string>
-    <string name="dismiss_backup_warning_new_user">        Λόγω αλλαγών στο απόρρητο του Android, τα δεδομένα και τα αυτοματοποιημένα αντίγραφα ασφαλείας θα διαγραφούν από το τηλέφωνό σας, εάν η εφαρμογή απεγκατασταθεί
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Λόγω αλλαγών στο απόρρητο του Android, τα δεδομένα και τα αυτοματοποιημένα αντίγραφα ασφαλείας δεν θα είναι προσβάσιμα, εάν η εφαρμογή απεγκατασταθεί
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Αυτή η τράπουλα υπάρχει ήδη</string>
     <string name="empty_deck_name">Το όνομα της τράπουλας δεν μπορεί να είναι κενό</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-el/10-preferences.xml b/AnkiDroid/src/main/res/values-el/10-preferences.xml
index ff04aaab6dbb..b3c3c0e6f50a 100644
--- a/AnkiDroid/src/main/res/values-el/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-el/10-preferences.xml
@@ -297,8 +297,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Επιλογές για προγραμματιστές</string>
     <string name="dev_options_enabled_pref" maxLength="41">Ενεργοποίηση επιλογών προγραμματιστών</string>
     <string name="disable_dev_options">Απενεργοποίηση επιλογών προγραμματιστών</string>
-    <string name="dev_options_warning">        Βεβαιωθείτε πριν ενεργοποιήσετε τις επιλογές προγραμματιστή. Αυτές οι επιλογές είναι επικίνδυνες και θα μπορούσαν να καταστρέψουν την εφαρμογή ή να καταστρέψουν τη συλλογή σας.\n\nΣημειώστε ότι αυτές οι επιλογές δεν είναι κατάλληλες για τους περισσότερους χρήστες και ως εκ τούτου δεν μεταφράζονται, οπότε είναι στα αγγλικά.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-el/17-model-manager.xml b/AnkiDroid/src/main/res/values-el/17-model-manager.xml
index 8333f9c3f4fa..19e50d681234 100644
--- a/AnkiDroid/src/main/res/values-el/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-el/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Θέλετε σίγουρα να διαγράψετε αυτό τον τύπο σημείωσης;</string>
     <string name="field_delete_warning">Θέλετε σίγουρα να διαγράψετε αυτό το πεδίο;</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Προσθήκη: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Κλώνος: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Εισάγετε το πρότυπο που θα χρησιμοποιήσει ο περιηγητής της κάρτας για την εμφάνιση των καρτών σας. Χρησιμοποιήστε αυτό για να εμφανίσετε μια πιο συνοπτική απάντηση.\n\nΈνα μπροστινό πρότυπο του\n“Η πρωτεύουσα του {{Country}} είναι:”\nθα μπορούσε να συμπιεστεί στον περιηγητή της κάρτας σε\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Μορφή ερώτησης</string>
diff --git a/AnkiDroid/src/main/res/values-eo/02-strings.xml b/AnkiDroid/src/main/res/values-eo/02-strings.xml
index aa07e30f0f65..db3c1392d6ea 100644
--- a/AnkiDroid/src/main/res/values-eo/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-eo/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">La bildo estas tro granda, enmetu la bildon permane</string>
     <string name="note_editor_video_too_large">La filmeto estas tro granda enmetu la filmeton permane</string>
     <string name="note_editor_audio_too_large">La sonaĵo estas tro granda, enmetu la sonaĵon permane</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Restarigado de Android-sekurkopio. Reprovu</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">Uzu iManager por permesi al AnkiDroid krei fenestraĵojn</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Via aplikaĵlanĉilo ne permesas al AnkiDroid krei fenestraĵojn</string>
     <string name="create_shortcut_error">Eraro dum krei fenestraĵon: %s</string>
@@ -305,14 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Sonaĵo konservita</string>
     <string name="deleting_selected_notes">Forigado de elektitaj notoj</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Frapetu voĉon por aŭskulti</string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voĉo devas esti instalita antaŭ ol uzi ĝin</string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Uzi malgraŭ tio</string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Eraro pri parolsintezilo (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Enretaj</string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Instaleblaj</string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Malsukcesis malfermi agordojn pri parolsintezo</string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Ensalutu por elŝuti pliajn kartarojn</string>
     <string name="deck_description_field_hint">Priskribo</string>
     <string name="failed_to_copy">Malsukcesis kopii</string>
diff --git a/AnkiDroid/src/main/res/values-eo/03-dialogs.xml b/AnkiDroid/src/main/res/values-eo/03-dialogs.xml
index d28824c2d5cc..f935383efc63 100644
--- a/AnkiDroid/src/main/res/values-eo/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-eo/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Eraro pri datumbazo</string>
     <string name="answering_error_message">Malsukcesis skribi al la kolekto. La datumbazo povas esti difektita aŭ eble mankas spaco en la konservejo.\n\nSe tio ĉi okazos pli ofte, provu kontroli la datumbazon, ripari la kolekton aŭ restarigi ĝin el sekurkopio. Frapetu “agordojn” por fari tion.\nAŭ tio ĉi povas esti eraro en AnkiDroid, do bonvolu raporti ĝin por ke ni povu ĝin ripari.</string>
     <string name="answering_error_report">Raporti eraron</string>
-    <string name="storage_full_message">Ne estas sufiĉe da libera konserva spaco por  malfermi AnkiDroid. Liberigi iom da spaco por pluigi.</string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Ĉu vi certe volas ripari la datumbazon?\n\nAntaŭ ol komenci, kopio estos kreita en subdosierujo “%s”.</string>
     <string name="intent_aedict_empty">La ĉefa kategorio estas malplena</string>
     <string name="intent_aedict_category">Por aldoni kartojn al AnkiDroid, forigu ĉiujn kategoriojn de kajero kaj aldonu unu nomitan «default»</string>
@@ -212,8 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Poste</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Ne montri denove</string>
     <string name="dismiss_backup_warning_title">Averto pri perdi datumojn</string>
-    <string name="dismiss_backup_warning_new_user">Pro privatecaj ŝanĝoj en la operaciumo Android, viaj datumoj kaj aŭtomataj sekurkopioj estos forigitaj el via telefono, se la aplikaĵo estos malinstalita</string>
-    <string name="dismiss_backup_warning_upgrade">Pro privatecaj ŝanĝoj en la operaciumo Android, viaj datumoj kaj aŭtomataj sekurkopioj estos nealireblaj, se la aplikaĵo estos malinstalita</string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Kartaro jam ekzistas</string>
     <string name="empty_deck_name">Nomo de kartaro ne estu malplena</string>
     <string name="create_deck_numeric_hint">Se vi havas problemojn pri karta ordigo (ekzemple “10” troviĝas antaŭ “2”), renomu “2” al “02”</string>
diff --git a/AnkiDroid/src/main/res/values-eo/10-preferences.xml b/AnkiDroid/src/main/res/values-eo/10-preferences.xml
index 8c49d5fc33af..1c0a8108ef8a 100644
--- a/AnkiDroid/src/main/res/values-eo/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-eo/10-preferences.xml
@@ -292,7 +292,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Programistaj agordoj</string>
     <string name="dev_options_enabled_pref" maxLength="41">Aktivigi programistajn agordojn</string>
     <string name="disable_dev_options">Malaktivigi programistajn agordojn</string>
-    <string name="dev_options_warning">Antaŭ ol aktivigi programistajn agordojn, certiĝu, ke vi scias kion vi faras. Tiuj ĉi agordoj estas danĝeraj kaj povas difekti la aplikaĵon aŭ vian kolekton.\n\nRimarko: tiuj ĉi agordoj ne taŭgas por kutimaj uzantoj, do ne estas tradukitaj (estas en la angla).</string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-eo/17-model-manager.xml b/AnkiDroid/src/main/res/values-eo/17-model-manager.xml
index f5d563702c27..e2dc5e1ccbf2 100644
--- a/AnkiDroid/src/main/res/values-eo/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-eo/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Ĉu vi certe volas forigi tiun ĉi nototipon?</string>
     <string name="field_delete_warning">Ĉu vi efektive volas forigi tiun kampon?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Aldoni: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Kloni: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enigu la ŝablonon, kiu estos uzata de la kart‑foliumilo por vidigi kartojn. Uzu tion ĉi por vidigi pli koncizan respondon.\n\nEkzemple  la antaŭa ŝablono de\n\n“La ĉefurbo de {{Country}} estas:”\npovus esti mallongigita al\n“Ĉefurbo: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Formo de demando</string>
diff --git a/AnkiDroid/src/main/res/values-es-rAR/02-strings.xml b/AnkiDroid/src/main/res/values-es-rAR/02-strings.xml
index 133d7211ce16..2384629a2cfa 100644
--- a/AnkiDroid/src/main/res/values-es-rAR/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-es-rAR/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">La imagen es demasiado grande, por favor inserta la imagen manualmente</string>
     <string name="note_editor_video_too_large">El archivo de vídeo es demasiado grande, por favor inserta el vídeo manualmente</string>
     <string name="note_editor_audio_too_large">El archivo de audio es demasiado grande, por favor inserta el audio manualmente</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Copia de seguridad Android en progreso. Inténtalo de nuevo</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">Puede que necesite usar iManager para permitir que AnkiDroid añada accesos directos</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Tu pantalla de inicio no permite que AnkiDroid añada accesos directos</string>
     <string name="create_shortcut_error">Error al añadir acceso directo: %s</string>
@@ -305,19 +305,14 @@
     <string name="browser_options_dialog_heading">Opciones del explorador</string>
     <string name="audio_saved">Grabación guardada</string>
     <string name="deleting_selected_notes">Eliminando notas seleccionadas</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Toca una voz para escucharla
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">La voz debe instalarse antes de usarla</string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Utilizar de todos modos
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Error de conversión de texto a voz (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Instalar
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Error al abrir la configuración de texto a voz
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Por favor, inicia sesión para descargar más mazos</string>
     <string name="deck_description_field_hint">Descripción</string>
     <string name="failed_to_copy">Error al copiar</string>
diff --git a/AnkiDroid/src/main/res/values-es-rAR/03-dialogs.xml b/AnkiDroid/src/main/res/values-es-rAR/03-dialogs.xml
index 511e92f83c89..2f87fdab2044 100644
--- a/AnkiDroid/src/main/res/values-es-rAR/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-es-rAR/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Error en base de datos</string>
     <string name="answering_error_message">Se ha producido un error al escribir en la colección. Esto podría estar relacionado con una base de datos dañada o con un espacio en disco insuficiente.\n\nSi esto ocurre con más frecuencia, intenta verificar la base de datos, reparar la colección o restaurar desde una copia de seguridad. Para ello, presiona \"Opciones\".\n\nDe todos modos, podría ser un error de AnkiDroid; por favor, informa del error para que podamos comprobarlo.</string>
     <string name="answering_error_report">Reportar un error</string>
-    <string name="storage_full_message">No hay suficiente espacio de almacenamiento libre para abrir AnkiDroid. Libera algo de espacio para continuar. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">¿Desea realmente intentar reparar la base de datos?\n\nAntes de comenzar con el intento, una copia será creada en el subdirectorio \'%s\'.</string>
     <string name="intent_aedict_empty">La categoría \'predeterminado\' está vacía</string>
     <string name="intent_aedict_category">Para añadir tarjetas a AnkiDroid elimine todas las categorías de los blocks de notas y agregue una llamada \'predeterminado\'</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Más tarde</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">No mostrar de nuevo</string>
     <string name="dismiss_backup_warning_title">Aviso de pérdida de datos</string>
-    <string name="dismiss_backup_warning_new_user">        Debido a cambios en la privacidad de Android, tus datos y copias de seguridad automatizadas se eliminarán de tu teléfono si la aplicación es desinstalada
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Debido a cambios en la privacidad de Android, tus datos y copias de seguridad automatizadas serán inaccesibles si la aplicación es desinstalada
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">El mazo ya existe.</string>
     <string name="empty_deck_name">El nombre del mazo no puede estar vacío</string>
     <string name="create_deck_numeric_hint">Si tienes problemas de ordenamiento de mazos (por ejemplo ‘10’ aparece antes de ‘2’), reemplaza ‘2’ con ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-es-rAR/10-preferences.xml b/AnkiDroid/src/main/res/values-es-rAR/10-preferences.xml
index 56bcd859927e..98f252272ffd 100644
--- a/AnkiDroid/src/main/res/values-es-rAR/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-es-rAR/10-preferences.xml
@@ -296,8 +296,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Opciones de desarrollador</string>
     <string name="dev_options_enabled_pref" maxLength="41">Activar opciones de desarrollador</string>
     <string name="disable_dev_options">Desactivar opciones de desarrollador</string>
-    <string name="dev_options_warning">        Por favor, asegúrate antes de activar las opciones de desarrollador. Estas opciones son peligrosas y podrían romper la aplicación o dañar tu colección.\n\nTen en cuenta que estas opciones no son adecuadas para la mayoría de los usuarios y, por lo tanto, no están traducidas, así que están en inglés.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-es-rAR/17-model-manager.xml b/AnkiDroid/src/main/res/values-es-rAR/17-model-manager.xml
index f11343bf38f4..3239a4ae9463 100644
--- a/AnkiDroid/src/main/res/values-es-rAR/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-es-rAR/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">¿Está seguro que desea eliminar este tipo de nota?</string>
     <string name="field_delete_warning">¿Seguro que deseas eliminar este campo?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Añadir: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clonar: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Introduce la plantilla que utilizará el navegador de la tarjeta para mostrar tus tarjetas. Utiliza esto para mostrar una respuesta más concisa.\n\nUna plantilla del anverso de\n“La capital de {{Country}} es:”\npodría comprimirse en el navegador de la tarjeta a\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Formato de Pregunta</string>
diff --git a/AnkiDroid/src/main/res/values-es-rES/02-strings.xml b/AnkiDroid/src/main/res/values-es-rES/02-strings.xml
index 0e6b60ca08f4..2dfa2336b1b4 100644
--- a/AnkiDroid/src/main/res/values-es-rES/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-es-rES/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">La imagen es demasiado grande, por favor inserta la imagen manualmente</string>
     <string name="note_editor_video_too_large">El archivo de vídeo es demasiado grande, por favor inserta el vídeo manualmente</string>
     <string name="note_editor_audio_too_large">El archivo de audio es demasiado grande, por favor inserta el audio manualmente</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Copia de seguridad Android en progreso. Inténtalo de nuevo</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">Puede que necesite usar iManager para permitir que AnkiDroid añada accesos directos</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Tu pantalla de inicio no permite que AnkiDroid añada accesos directos</string>
     <string name="create_shortcut_error">Error al añadir acceso directo: %s</string>
@@ -305,19 +305,14 @@
     <string name="browser_options_dialog_heading">Opciones del explorador</string>
     <string name="audio_saved">Grabación guardada</string>
     <string name="deleting_selected_notes">Eliminando notas seleccionadas</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Toca una voz para escucharla
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">La voz debe instalarse antes de usarla</string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Utilizar de todos modos
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Error de conversión de texto a voz (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Instalar
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Error al abrir la configuración de texto a voz
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Por favor, inicia sesión para descargar más mazos</string>
     <string name="deck_description_field_hint">Descripción</string>
     <string name="failed_to_copy">Error al copiar</string>
diff --git a/AnkiDroid/src/main/res/values-es-rES/03-dialogs.xml b/AnkiDroid/src/main/res/values-es-rES/03-dialogs.xml
index 8d2165b014b8..abb8d6bc777e 100644
--- a/AnkiDroid/src/main/res/values-es-rES/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-es-rES/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Error en la base de datos</string>
     <string name="answering_error_message">Se ha producido un error al escribir en la colección. Esto podría estar relacionado con una base de datos dañada o con un espacio en disco insuficiente.\n\nSi esto ocurre con más frecuencia, intenta verificar la base de datos, reparar la colección o restaurar desde una copia de seguridad. Para ello, presiona \"Opciones\".\n\nDe todos modos, podría ser un error de AnkiDroid; por favor, informa del error para que podamos comprobarlo.</string>
     <string name="answering_error_report">Reportar error</string>
-    <string name="storage_full_message">No hay suficiente espacio de almacenamiento libre para abrir AnkiDroid. Libera algo de espacio para continuar. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">¿Realmente deseas intentar reparar la base de datos?\n\nAntes de iniciar el intento, se creará una copia en la subcarpeta \'%s\'.</string>
     <string name="intent_aedict_empty">La categoría \'por defecto\' está vacía</string>
     <string name="intent_aedict_category">Para añadir tarjetas AnkiDroid borra todas las categorías del Bloc de notas o agrega una llamada \'por defecto\'</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Más tarde</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">No mostrar de nuevo</string>
     <string name="dismiss_backup_warning_title">Aviso de pérdida de datos</string>
-    <string name="dismiss_backup_warning_new_user">        Debido a cambios en la privacidad de Android, tus datos y copias de seguridad automatizadas se eliminarán de tu teléfono si la aplicación es desinstalada
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Debido a cambios en la privacidad de Android, tus datos y copias de seguridad automatizadas serán inaccesibles si la aplicación es desinstalada
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">El mazo ya existe.</string>
     <string name="empty_deck_name">El nombre del mazo no puede estar vacío</string>
     <string name="create_deck_numeric_hint">Si tienes problemas de ordenamiento de mazos (por ejemplo ‘10’ aparece antes de ‘2’), reemplaza ‘2’ con ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-es-rES/10-preferences.xml b/AnkiDroid/src/main/res/values-es-rES/10-preferences.xml
index 333fa025b753..f865444b4378 100644
--- a/AnkiDroid/src/main/res/values-es-rES/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-es-rES/10-preferences.xml
@@ -296,8 +296,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Opciones de desarrollador</string>
     <string name="dev_options_enabled_pref" maxLength="41">Activar opciones de desarrollador</string>
     <string name="disable_dev_options">Desactivar opciones de desarrollador</string>
-    <string name="dev_options_warning">        Por favor, asegúrate antes de activar las opciones de desarrollador. Estas opciones son peligrosas y podrían romper la aplicación o dañar tu colección.\n\nTen en cuenta que estas opciones no son adecuadas para la mayoría de los usuarios y, por lo tanto, no están traducidas, así que están en inglés.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-es-rES/17-model-manager.xml b/AnkiDroid/src/main/res/values-es-rES/17-model-manager.xml
index c256f16673c1..9a6c43254f45 100644
--- a/AnkiDroid/src/main/res/values-es-rES/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-es-rES/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">¿Está seguro que desea eliminar este tipo de nota?</string>
     <string name="field_delete_warning">¿Seguro que deseas eliminar este campo?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Añadir: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clonar: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Introduce la plantilla que utilizará el navegador de la tarjeta para mostrar tus tarjetas. Utiliza esto para mostrar una respuesta más concisa.\n\nUna plantilla del anverso de\n“La capital de {{Country}} es:”\npodría comprimirse en el navegador de la tarjeta a\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Formato de Pregunta</string>
diff --git a/AnkiDroid/src/main/res/values-et/02-strings.xml b/AnkiDroid/src/main/res/values-et/02-strings.xml
index 36e5748b0c10..0abf47c5ef2c 100644
--- a/AnkiDroid/src/main/res/values-et/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-et/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-et/03-dialogs.xml b/AnkiDroid/src/main/res/values-et/03-dialogs.xml
index 954d7637f5cb..fbc0e9783ca7 100644
--- a/AnkiDroid/src/main/res/values-et/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-et/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Andmebaasi viga</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Teata veast</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-et/10-preferences.xml b/AnkiDroid/src/main/res/values-et/10-preferences.xml
index 5f7decb917a0..755b2dccb4f5 100644
--- a/AnkiDroid/src/main/res/values-et/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-et/10-preferences.xml
@@ -297,8 +297,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-et/17-model-manager.xml b/AnkiDroid/src/main/res/values-et/17-model-manager.xml
index 50fe144462b5..7656a73cd98b 100644
--- a/AnkiDroid/src/main/res/values-et/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-et/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Kas olete kindel, et soovite kustutada selle välja?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Lisa: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Klooni: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>
diff --git a/AnkiDroid/src/main/res/values-eu/02-strings.xml b/AnkiDroid/src/main/res/values-eu/02-strings.xml
index 91442992839b..c6f1ce3c67e8 100644
--- a/AnkiDroid/src/main/res/values-eu/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-eu/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-eu/03-dialogs.xml b/AnkiDroid/src/main/res/values-eu/03-dialogs.xml
index 4593a44d6d5c..006e9df92626 100644
--- a/AnkiDroid/src/main/res/values-eu/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-eu/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Datubasearen errorea</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Jakinarazi errorea</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">\"Lehenetsia\" kategoria hutsik dago</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-eu/10-preferences.xml b/AnkiDroid/src/main/res/values-eu/10-preferences.xml
index 5f4d827fd720..ab146548fe5d 100644
--- a/AnkiDroid/src/main/res/values-eu/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-eu/10-preferences.xml
@@ -297,8 +297,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-eu/17-model-manager.xml b/AnkiDroid/src/main/res/values-eu/17-model-manager.xml
index 786269c01d40..f2254e77bb2a 100644
--- a/AnkiDroid/src/main/res/values-eu/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-eu/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Ziur zaude eremu hau ezabatu nahi izateaz?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Gehitu: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>
diff --git a/AnkiDroid/src/main/res/values-fa/02-strings.xml b/AnkiDroid/src/main/res/values-fa/02-strings.xml
index 1ed75b6e6bed..5add67c79d36 100644
--- a/AnkiDroid/src/main/res/values-fa/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fa/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">عکس زیادی بزرگ است، لطفا عکس را دستی وارد کنید</string>
     <string name="note_editor_video_too_large">فایل ویدیو زیادی بزرگ است، لطفا ویدیو را دستی وارد کنید</string>
     <string name="note_editor_audio_too_large">فایل صدا زیادی بزرگ است، لطفا صدا را دستی وارد کنید</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">پشتیبانی Android در حال انجام است. لطفا دوباره سعی کنید</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">شما به iManager نیاز دارید تا به AnkiDroid اجازه اضافه کردن میانبر بدهید</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">صفحه اصلی شما به AnkiDroid اجازه میانبور اضافه کردن نمیدهد </string>
     <string name="create_shortcut_error">خطا در افزودن میانبُر: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">تنظیمات مرورگر</string>
     <string name="audio_saved">مورد ضبط شده ذخیره شد</string>
     <string name="deleting_selected_notes">در حال حذف یادداشت های انتخاب شده</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">                برای گوش دادن روی صدا ضربه بزنید
-        </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">صدا باید قبل از استفاده نصب شود
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">به هر حال استفاده کن
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">خطای متن به گفتار (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">                اینترنت
-        </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">                نصب
-        </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">                باز کردن تنظیمات متن به گفتار ناموفق بود
-        </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">لطفا وارد حساب کاربری خود شوید که دسته های بیشتری را دانلود کنید</string>
     <string name="deck_description_field_hint">توضیحات</string>
     <string name="failed_to_copy">کپی کردن ناموفق بود</string>
diff --git a/AnkiDroid/src/main/res/values-fa/03-dialogs.xml b/AnkiDroid/src/main/res/values-fa/03-dialogs.xml
index d498c152f4c2..f793e04ea764 100644
--- a/AnkiDroid/src/main/res/values-fa/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-fa/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">خطای پایگاه داده</string>
     <string name="answering_error_message">ذخیرۀ مجموعه انجام نشد. دیتابیس ممکن است خراب باشد یا ممکن است فضای کافی نداشته باشید.\n\nاگر این اتفاق غالباً رخ می‌دهد، بررسی دیتابیس، تعمیر مجموعه یا بازنشانی مجموعه از یک فایل پشتیبان قبلی را برای حل کردن مشکل امتحان کنید. برای این کار به \"گزینه‌ها\" مراجعه کنید.\nاین خطا همچنین ممکن است به دلیل مشکل در آنکی‌دروید باشد؛ اگر هیچ یک از موارد بالا مشکل شما را حل نکرد، لطفاً خطا را به ما گزارش دهید تا ما بتوانیم به بررسی آن بپردازیم.</string>
     <string name="answering_error_report">گزارش خطا</string>
-    <string name="storage_full_message">فضای خالی کافی برای باز شدن انکی‌دروید وجود ندارد. کمی فضای خالی برای ادامه دادن کار، ایجاد کنید.</string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">آیا شما واقعا می خواهید پایگاه داده را تعمیر کنید؟\n\nقبل از شروع , یک کپی در پوشه فرعی \'%s\' به وجود خواهد آمد .</string>
     <string name="intent_aedict_empty">مجموعه \'پیش فرض\' خالی است</string>
     <string name="intent_aedict_category">اضافه کردن کارت به آنکی دروید سبب حذف همه یادداشت های مجموعه ها یا اضافه کردن یک نام پیش فرض به آنها می شود</string>
@@ -212,8 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">بعداً</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">دوباره نشان نده</string>
     <string name="dismiss_backup_warning_title">خطر از دست رفتن داده‌ها</string>
-    <string name="dismiss_backup_warning_new_user">        بنابر تغییرات حریم خصوصی اندروید، در صورت پاک کردن اپلیکیشن از روی موبایل، داده‌ها و پشتیبان‌های اتوماتیک نیز حذف خواهند شد    </string>
-    <string name="dismiss_backup_warning_upgrade">        بنابر تغییرات حریم خصوصی اندروید، در صورت پاک کردن اپلیکیشن از روی موبایل، داده‌ها و پشتیبان‌های اتوماتیک، از دسترس خارج خواهند شد    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">دسته کارت از قبل وجود دارد</string>
     <string name="empty_deck_name">نام دسته نمیتواند خالی باشد</string>
     <string name="create_deck_numeric_hint">اگر مشکل ترتیب دسته کارت‌ها دارید (مثلاً ‘10’ قبل از ‘2’ ظاهر می‌شود)، ‘2’ را با ‘02’ جایگزین کنید</string>
diff --git a/AnkiDroid/src/main/res/values-fa/10-preferences.xml b/AnkiDroid/src/main/res/values-fa/10-preferences.xml
index fe2ce5d51c72..02aeb7c86e89 100644
--- a/AnkiDroid/src/main/res/values-fa/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-fa/10-preferences.xml
@@ -296,8 +296,7 @@
     <string name="pref_cat_dev_options" maxLength="41">گزینه های توسعه دهنده</string>
     <string name="dev_options_enabled_pref" maxLength="41">فعال‌سازی گزینه های توسعه دهنده</string>
     <string name="disable_dev_options">غیر فعال‌سازی گزینه‌های توسعه دهنده</string>
-    <string name="dev_options_warning">        لطفا از تصمیم خود برای فعال‌سازی گزینه‌های توسعه دهنده مطمئن شوید. این گزینه ها خطرناک هستند و توانایی خراب کردن برنامه یا فاسد کردن مجموعه ی شما را دارند.\n\nاین را بدانید که این گزینه ها مخصوص اکثریت افراد نیستند و بنابراین ترجمه نشده اند، پس به زبان انگلیسی هستند.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-fa/17-model-manager.xml b/AnkiDroid/src/main/res/values-fa/17-model-manager.xml
index d3c1459c5f76..65caf5547260 100644
--- a/AnkiDroid/src/main/res/values-fa/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-fa/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">آیا از حذف این نوع یادداشت اطمینان دارید؟</string>
     <string name="field_delete_warning">از حذف این فیلد مطمئن هستید؟</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">افزودن: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">بدل: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">قالب نمایش کارت برای مرورگر کارت را وارد کنید. از این ویژگی برای نمایش پاسخی مختصر استفاده کنید.\n\nبرای مثال قالب جلویی به شکل:\n\"نام پایتخت برای {{کشور}} چیست؟\"\nرا می‌توانید به‌صورت\n\"پایتخت {{کشور}}؟\"\nخلاصه کنید.</string>
     <string name="card_template_browser_appearance_question_format">قالب سوال</string>
diff --git a/AnkiDroid/src/main/res/values-fi/02-strings.xml b/AnkiDroid/src/main/res/values-fi/02-strings.xml
index 743c9354a6d0..4c8e7c66ed18 100644
--- a/AnkiDroid/src/main/res/values-fi/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fi/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">Kuva on liian suuri, aseta kuva käsin</string>
     <string name="note_editor_video_too_large">Videotiedosto on liian suuri, aseta video käsin</string>
     <string name="note_editor_audio_too_large">Äänitiedosto on liian suuri, aseta ääni käsin</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Androidin varmuuskopiointi käynnissä. Yritä uudelleen</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">Saatat joutua käyttämään iManageria, jotta AnkiDroid voi lisätä pikanäppäimiä.</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Aloitusnäyttösi ei salli AnkiDroidin lisätä pikakuvakkeita</string>
     <string name="create_shortcut_error">Virhe lisättäessä pikakuvaketta: %s</string>
@@ -305,17 +305,14 @@
     <string name="browser_options_dialog_heading">Selaimen asetukset</string>
     <string name="audio_saved">Äänitys tallennettu</string>
     <string name="deleting_selected_notes">Poistetaan valittuja muistiinpanoja</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Kuuntele napauttamalla ääntä</string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Ääni tulee asentaa ennen käyttöä
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Käytä silti</string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Tekstistä puheeksi -toiminnon virhe (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Asenna
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">       Teksti puheeksi -asetusten avaaminen ei onnistunut    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Kirjaudu sisään ladataksesi lisää pakkoja</string>
     <string name="deck_description_field_hint">Kuvaus</string>
     <string name="failed_to_copy">Kopiointi epäonnistui</string>
diff --git a/AnkiDroid/src/main/res/values-fi/03-dialogs.xml b/AnkiDroid/src/main/res/values-fi/03-dialogs.xml
index 725a88356345..a83e8e02fd21 100644
--- a/AnkiDroid/src/main/res/values-fi/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-fi/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Tietokantavirhe</string>
     <string name="answering_error_message">Kirjoittaminen kokoelmaan epäonnistui. Tietokanta voi olla vioittunut tai levyllä ei ole tarpeeksi tyhjää tilaa.\n\nJos näin tapahtuu useammin, tarkista tietokanta, korjaa kokoelma tai palauta se varmuuskopiosta. Löydät tämän asetuksista.\n\Mahdollisesti kyseessä voi olla myös AnkiDroidin virhe; ilmoita virheestä, jotta voimme tarkistaa sen.</string>
     <string name="answering_error_report">Ilmoita viasta</string>
-    <string name="storage_full_message">AnkiDroidin avaamiseen ei ole riittävästi vapaata tallennustilaa. Vapauta tilaa jatkaaksesi. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Haluatko varmasti yrittää korjata tietokannan?\n\nEnnen yritystä kopio tietokannasta luodaan alihakemistoon ”%s”.</string>
     <string name="intent_aedict_empty">Oletus-luokka on tyhjä</string>
     <string name="intent_aedict_category">Lisätäksesi kortteja AnkiDroidiin poista kaikki Notepad-kategoriat tai lisää uusi nimellä ”default”</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Myöhemmin</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Älä näytä uudelleen</string>
     <string name="dismiss_backup_warning_title">Varoitus tietojen menettämisestä</string>
-    <string name="dismiss_backup_warning_new_user">        Androidin tietosuojamuutosten vuoksi tietosi ja automaattiset varmuuskopiot poistetaan laitteestasi, jos sovellus poistetaan.
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Androidin tietosuojamuutosten vuoksi tietoihisi ja automaattisiin varmuuskopioihin ei pääse käsiksi, jos sovellus poistetaan.
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Pakka on jo olemassa</string>
     <string name="empty_deck_name">Pakan nimi ei voi olla tyhjä</string>
     <string name="create_deck_numeric_hint">Jos pakan järjestyksen kanssa onongelmia (esim. ”10” näkyy ennen ”2”:a), korvaa ”2” merkinnällä ”02”.</string>
diff --git a/AnkiDroid/src/main/res/values-fi/10-preferences.xml b/AnkiDroid/src/main/res/values-fi/10-preferences.xml
index 86bd204c0988..798bec4dafd3 100644
--- a/AnkiDroid/src/main/res/values-fi/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-fi/10-preferences.xml
@@ -296,8 +296,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Kehittäjän asetukset</string>
     <string name="dev_options_enabled_pref" maxLength="41">Ota kehittäjän asetukset käyttöön</string>
     <string name="disable_dev_options">Poista kehittäjän asetukset käytöstä</string>
-    <string name="dev_options_warning">        Ymmärrä mitä olet tekemässä, ennen kuin otat kehittäjän asetukset käyttöön. Nämä asetukset ovat vaarallisia ja voivat rikkoa sovelluksen tai vahingoittaa kokoelmaasi.\n\nHuomaa, että nämä asetukset eivät sovellu useimmille käyttäjille, ja siksi niitä ei ole käännetty, joten ne ovat englanniksi.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-fi/17-model-manager.xml b/AnkiDroid/src/main/res/values-fi/17-model-manager.xml
index a27752aa9775..306a184caae4 100644
--- a/AnkiDroid/src/main/res/values-fi/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-fi/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Haluatko varmasti poistaa tämän muistiinpanotyypin?</string>
     <string name="field_delete_warning">Oletko varma, että haluat poistaa tämän kentän?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Lisää: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Monista:%1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Anna malli, jota korttiselain käyttää korttien näyttämiseen. Käytä tätä, jos haluat näyttää tiiviimmän vastauksen.\n\nEtupuolen malli\n \"Maan {{Maa}} pääkaupunki on:\"\nvoitaisiin tiivistää korttiselaimessa muotoon\n \"Pääkaupunki: {{Maa}}\"</string>
     <string name="card_template_browser_appearance_question_format">Kysymyksen muoto</string>
diff --git a/AnkiDroid/src/main/res/values-fil/02-strings.xml b/AnkiDroid/src/main/res/values-fil/02-strings.xml
index 9f2a6389b970..d7d3ebf6f779 100644
--- a/AnkiDroid/src/main/res/values-fil/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fil/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Nagsasagawa ng Android backup. Mangyaring subukan muli</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">Maaring kailangang gumamit ng iManager upang payagan ang AnkiDroid na magdagdag ng mga gitis.</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Hindi pinpayagan ang AnkiDroid na maglagay ng gitis sa iyong home screen.</string>
     <string name="create_shortcut_error">Kamalian sa pagdagdag ng gitis: %s</string>
@@ -305,19 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Nai-save ang narekord</string>
     <string name="deleting_selected_notes">Binubura ang mga napiling tala</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Pumindot ng boses para pakinggan
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Kailangan munang i-install ang boses bago ito magamit
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Gamitin pa rin</string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Error sa text-to-speech (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-     </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        I-install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Bigo na buksan ang setting ng text to speech
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Mangyaring maglog-in para makapag-download pa ng mga deck</string>
     <string name="deck_description_field_hint">Paglalarawan</string>
     <string name="failed_to_copy">Bigo na kopyahin</string>
diff --git a/AnkiDroid/src/main/res/values-fil/03-dialogs.xml b/AnkiDroid/src/main/res/values-fil/03-dialogs.xml
index 7275d610ccd5..31a1c99e84eb 100644
--- a/AnkiDroid/src/main/res/values-fil/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-fil/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Database error</string>
     <string name="answering_error_message">Ang pagsulat sa koleksyon ay nabigo. Maaaring sira ang database o di kaya`y hindi sapat ang bakanteng space sa disk. \n\n Kung ito ay nangyayari ng madalas, subukang tignan ang database, ayusin ang koleksyon o ibalik ito mula sa isang backup. Pindutin ang \"mga opsyon\" para diyan. \n\Maaaring ito rin ay isang AnkiDroid bug; i-ulat ang mali upang maiayos namin ito.</string>
     <string name="answering_error_report">Maling ulat</string>
-    <string name="storage_full_message">Hindi sapat ang bakanteng storage upang buksan ang AnkiDroid. Magbukas pa ng space para makapagpatuloy. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Gusto mo ba talagang subukan ang pag-aayos ng database? \n\n Bago mo simulan ang pagtatangka, isang kopya ang lilikhain sa mga subfolder \"%s\".</string>
     <string name="intent_aedict_empty">Ang kategoryang \"default\" ay walng laman</string>
     <string name="intent_aedict_category">Upang magdagdag ng mga kard sa AnkiDroid alisin lahat ng mga kategorya ng Notepad o magdagdag ng isa na pinangalanang \"default\"</string>
@@ -213,10 +213,8 @@ Mga file na may di-wastong pag-encode:%d</string>
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Mamaya</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Huwag ipakita muli</string>
     <string name="dismiss_backup_warning_title">Babala sa pagkawala ng datos</string>
-    <string name="dismiss_backup_warning_new_user">        Dahil sa pagbabago ng praybasi ng Android, mabubura ang iyong datos at automated na backup sa iyong phone kapag inuninstall ang app.
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Dahil sa pagbabago ng praybasi ng Android, mabubura ang iyong datos at automated na backup sa iyong phone kapag inuninstall ang app.
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Umiiral na ang deck na ito</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">Kung may mga isyu ka sa hanay ng iyong deck (hal. lumabas ang \'10\' bago ang \'2\'), palitan ang \'2\' ng \'02\'</string>
diff --git a/AnkiDroid/src/main/res/values-fil/10-preferences.xml b/AnkiDroid/src/main/res/values-fil/10-preferences.xml
index ce04bba9aa07..50a3eb688465 100644
--- a/AnkiDroid/src/main/res/values-fil/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-fil/10-preferences.xml
@@ -297,8 +297,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Mga opsyon pangdeveloper</string>
     <string name="dev_options_enabled_pref" maxLength="41">Paganahin ang mga opsyon pangdeveloper</string>
     <string name="disable_dev_options">Huwag paganahin ang mga opsyon pangdeveloper</string>
-    <string name="dev_options_warning">        Siguraduhin na gusto mong paganahin ang mga opsyon pangdeveloper. Ang mga opsyon dito ay delikado at maaring ikasira ng app o ika-corrupt ng iyong mga tipon.\n\nTandaan na ang mga opsyon na ito ay hindi angkop sa karamihan ng mga user at samakatwid ay hindi sinalin ang mga ito, kaya naka-Ingles ang mga ito.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-fil/17-model-manager.xml b/AnkiDroid/src/main/res/values-fil/17-model-manager.xml
index 5de94739c64e..ce3920a269b2 100644
--- a/AnkiDroid/src/main/res/values-fil/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-fil/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Sigurado ka ba na nais mong burahin ang uri ng tala na ito?</string>
     <string name="field_delete_warning">Sigurado ka bang nais mong tanggalin ang field na ito?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Magdagdag ng:%1$s</string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">I-clone:%1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Ilagay ang template na gagamitin ng card browser upang maipakita ang iyong mga card. Gamitin ito upang maipakita ang mas maiksi na sagot.\n\nAng harap na template ng\n\"Ang kabisera ng {{Country}} ay:\"\nay maaaring paiksiin sa card browser bilang\n\"Kabisera: {{Country}}\"</string>
     <string name="card_template_browser_appearance_question_format">Format ng Tanong</string>
diff --git a/AnkiDroid/src/main/res/values-fr/02-strings.xml b/AnkiDroid/src/main/res/values-fr/02-strings.xml
index e3a00af704c7..a430034d98cb 100644
--- a/AnkiDroid/src/main/res/values-fr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fr/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">L’image est trop grande, veuillez insérer l’image manuellement</string>
     <string name="note_editor_video_too_large">Le fichier vidéo est trop volumineux, insérez la vidéo manuellement.</string>
     <string name="note_editor_audio_too_large">Le fichier audio est trop volumineux, insérez l’audio manuellement.</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Sauvergarde Android en cours. Veuillez réessayer</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">Veuillez utiliser iManager pour autoriser AnkiDroid à ajouter des raccourcis</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Votre écran d\'accueil ne permet pas à AnkiDroid d\'ajouter des raccourcis</string>
     <string name="create_shortcut_error">Erreur lors de l\'ajout du raccourci : %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Options du navigateur</string>
     <string name="audio_saved">Enregistrement sauvegardé</string>
     <string name="deleting_selected_notes">Suppression des notes sélectionnées</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Touchez une voix pour l\'écouter
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">La voix doit être installée avant l\'utilisation
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Utiliser quand même
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Erreur de synthèse vocale (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Installer
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Échec de l\'ouverture des paramètres de synthèse vocale
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Veuillez vous connecter pour télécharger plus de decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Échec de la copie</string>
diff --git a/AnkiDroid/src/main/res/values-fr/03-dialogs.xml b/AnkiDroid/src/main/res/values-fr/03-dialogs.xml
index 802900bf7d92..04248244537f 100644
--- a/AnkiDroid/src/main/res/values-fr/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-fr/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Erreur de la base de données</string>
     <string name="answering_error_message">L\'écriture de la collection a échoué. La base de données pourrait être corrompue ou il se peut qu\'il n\'y ait pas assez d\'espace libre sur le disque.\n\nSi ceci se produit plus souvent, essayez de vérifier la base de données, de réparer la collection ou de la restaurer à partir d\'une sauvegarde. Touchez « options » pour cela.\n\Ou il pourrait s\'agir d\'une erreur AnkiDroid ; veuillez signaler l\'erreur pour que nous puissions vérifier ceci.</string>
     <string name="answering_error_report">Signaler les erreurs</string>
-    <string name="storage_full_message">Il n\'y a pas assez d\'espace de stockage libre pour ouvrir AnkiDroid. Libérez de l\'espace pour continuer. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Voulez-vous vraiment essayer de réparer la base de données ?\n\nAvant de commencer, une copie sera créée dans le sous-dossier « %s ».</string>
     <string name="intent_aedict_empty">La catégorie « default » est vide</string>
     <string name="intent_aedict_category">Pour ajouter des cartes à AnkiDroid, enlevez toutes les catégories du Bloc-notes, ou créez une catégorie « default »</string>
@@ -212,8 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Plus tard</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Ne plus me montrer</string>
     <string name="dismiss_backup_warning_title">Risque de perte de données</string>
-    <string name="dismiss_backup_warning_new_user">En raison de changement dans la politique de confidentialité d\'Android, vos données et sauvegardes automatiques seront supprimées de votre téléphone si l\'application est désinstallée</string>
-    <string name="dismiss_backup_warning_upgrade">En raison de changement dans la politique de confidentialité d\'Android, vos données et sauvegardes automatiques seront inaccessibles si l\'application est désinstallée</string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Le paquet existe déjà</string>
     <string name="empty_deck_name">Le nom du paquet ne peut pas être vide</string>
     <string name="create_deck_numeric_hint">Si vous avez des problèmes de tri des paquets (par exemple, ‘10’ apparaît avant ‘2’), remplacez ‘2’ par ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-fr/10-preferences.xml b/AnkiDroid/src/main/res/values-fr/10-preferences.xml
index a92d84ba8821..53d993b0443c 100644
--- a/AnkiDroid/src/main/res/values-fr/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-fr/10-preferences.xml
@@ -296,7 +296,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Options de développement</string>
     <string name="dev_options_enabled_pref" maxLength="41">Activer les options de développement</string>
     <string name="disable_dev_options">Désactiver les options de développement</string>
-    <string name="dev_options_warning">        Veuillez être sûr·e avant d\'activer les options de développement. Ces options sont dangereuses et peuvent casser l\'application ou corrompre votre collection.\n\nNotez que ces options ne sont pas adaptées à la majorité des utilisateurs et par conséquent, elles ne sont pas traduites, elles sont donc en anglais.</string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-fr/17-model-manager.xml b/AnkiDroid/src/main/res/values-fr/17-model-manager.xml
index c5f01e7cb2d8..b6f2ac6b2dce 100644
--- a/AnkiDroid/src/main/res/values-fr/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-fr/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Voulez-vous vraiment effacer ce type de note ?</string>
     <string name="field_delete_warning">Voulez-vous vraiment supprimer ce champ ?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Ajouter : %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone : %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Entrez le modèle que le navigateur de cartes utilisera pour afficher vos cartes. Utilisez ceci pour afficher une réponse plus concise.\n\nUn modèle comme\n« La capitale de {{Country}} est : »\npourrait être compressé dans le navigateur de cartes en\n« Capitale : {{Country}} »</string>
     <string name="card_template_browser_appearance_question_format">Format de la question</string>
diff --git a/AnkiDroid/src/main/res/values-fy/02-strings.xml b/AnkiDroid/src/main/res/values-fy/02-strings.xml
index d066c3e6e9d0..6ae640061210 100644
--- a/AnkiDroid/src/main/res/values-fy/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fy/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-fy/03-dialogs.xml b/AnkiDroid/src/main/res/values-fy/03-dialogs.xml
index 9b2b5d8e4c74..0ff8839b613a 100644
--- a/AnkiDroid/src/main/res/values-fy/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-fy/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Database error</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Report error</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-fy/10-preferences.xml b/AnkiDroid/src/main/res/values-fy/10-preferences.xml
index 203308260ac1..c7cc047f24b0 100644
--- a/AnkiDroid/src/main/res/values-fy/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-fy/10-preferences.xml
@@ -297,8 +297,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-fy/17-model-manager.xml b/AnkiDroid/src/main/res/values-fy/17-model-manager.xml
index 6b89a122d404..eff2650b23bb 100644
--- a/AnkiDroid/src/main/res/values-fy/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-fy/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Are you sure you wish to delete this field?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>
diff --git a/AnkiDroid/src/main/res/values-ga/02-strings.xml b/AnkiDroid/src/main/res/values-ga/02-strings.xml
index 3773915615c1..5fe286b30389 100644
--- a/AnkiDroid/src/main/res/values-ga/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ga/02-strings.xml
@@ -245,7 +245,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -320,20 +320,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-ga/03-dialogs.xml b/AnkiDroid/src/main/res/values-ga/03-dialogs.xml
index ab6f2043d491..047f51bc6ad6 100644
--- a/AnkiDroid/src/main/res/values-ga/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ga/03-dialogs.xml
@@ -70,7 +70,7 @@
     <string name="answering_error_title">Database error</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Report error</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
@@ -224,10 +224,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-ga/10-preferences.xml b/AnkiDroid/src/main/res/values-ga/10-preferences.xml
index 72f7ab23ce99..e5ece8a446fa 100644
--- a/AnkiDroid/src/main/res/values-ga/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ga/10-preferences.xml
@@ -303,8 +303,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-ga/17-model-manager.xml b/AnkiDroid/src/main/res/values-ga/17-model-manager.xml
index 07ad00e41c0a..91bff2bce278 100644
--- a/AnkiDroid/src/main/res/values-ga/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ga/17-model-manager.xml
@@ -70,9 +70,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Are you sure you wish to delete this field?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>
diff --git a/AnkiDroid/src/main/res/values-gl/02-strings.xml b/AnkiDroid/src/main/res/values-gl/02-strings.xml
index fc1a00e8a56e..1f612c0fd92d 100644
--- a/AnkiDroid/src/main/res/values-gl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-gl/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-gl/03-dialogs.xml b/AnkiDroid/src/main/res/values-gl/03-dialogs.xml
index 154e7bc9c308..369a6efd45ce 100644
--- a/AnkiDroid/src/main/res/values-gl/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-gl/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Erro na base de datos</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Informar de erros</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Tes a certeza de querer tentar reparar a base de datos?\n\nAntes de comezar, crearase unha copia no cartafol \"%s\".</string>
     <string name="intent_aedict_empty">A categoría \'predeterminado\' está baleira</string>
     <string name="intent_aedict_category">Para engadir cartóns ao AnkiDroid elimina todas as categorías do caderno de notas ou engade unha chamada \"predefinido\"</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-gl/10-preferences.xml b/AnkiDroid/src/main/res/values-gl/10-preferences.xml
index 6d793bf7c9eb..182df6030014 100644
--- a/AnkiDroid/src/main/res/values-gl/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-gl/10-preferences.xml
@@ -297,8 +297,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-gl/17-model-manager.xml b/AnkiDroid/src/main/res/values-gl/17-model-manager.xml
index ecb1b289a3b5..19c54ce826b7 100644
--- a/AnkiDroid/src/main/res/values-gl/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-gl/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Tes a certeza de querer eliminar este campo?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Engadir: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clonar: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>
diff --git a/AnkiDroid/src/main/res/values-got/02-strings.xml b/AnkiDroid/src/main/res/values-got/02-strings.xml
index ec86ba08a56e..6795a8d34c13 100644
--- a/AnkiDroid/src/main/res/values-got/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-got/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-got/03-dialogs.xml b/AnkiDroid/src/main/res/values-got/03-dialogs.xml
index 682594197941..8ad9bb19a234 100644
--- a/AnkiDroid/src/main/res/values-got/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-got/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Database error</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Report error</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-got/10-preferences.xml b/AnkiDroid/src/main/res/values-got/10-preferences.xml
index 29e92629b16c..2afb72668806 100644
--- a/AnkiDroid/src/main/res/values-got/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-got/10-preferences.xml
@@ -297,8 +297,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-got/17-model-manager.xml b/AnkiDroid/src/main/res/values-got/17-model-manager.xml
index 6b89a122d404..eff2650b23bb 100644
--- a/AnkiDroid/src/main/res/values-got/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-got/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Are you sure you wish to delete this field?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>
diff --git a/AnkiDroid/src/main/res/values-gu/02-strings.xml b/AnkiDroid/src/main/res/values-gu/02-strings.xml
index 14970fc644f5..1e51aa6f1b29 100644
--- a/AnkiDroid/src/main/res/values-gu/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-gu/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">படம் மிகவும் பெரிதாக உள்ளது, படத்தை கைமுறையாக செருகவும்</string>
     <string name="note_editor_video_too_large">வீடியோ கோப்பு மிகவும் பெரியதாக உள்ளது, வீடியோவை கைமுறையாக செருகவும்</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android બેકઅપ ચાલુ છે. મહેરબાની કરીને ફરીથી પ્રયતન કરો</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">AnkiDroid ને શૉર્ટકટ્સ ઉમેરવાની મંજૂરી આપવા માટે તમારે iManager નો ઉપયોગ કરવાની જરૂર પડી શકે છે</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">તમારી હોમ સ્ક્રીન AnkiDroid ને શોર્ટકટ ઉમેરવાની મંજૂરી આપતી નથી</string>
     <string name="create_shortcut_error">શૉર્ટકટ ઉમેરવામાં ભૂલ: %s</string>
@@ -305,19 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">રેકોર્ડિંગ સાચવ્યું</string>
     <string name="deleting_selected_notes">પસંદ કરેલી નોંધો કાઢી નાખી રહ્યાં છીએ</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">સાંભળવા માટે અવાજ પર ટૅપ કરો</string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">ઉપયોગ કરતા પહેલા વૉઇસ ઇન્સ્ટોલ થવો જોઈએ
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">કોઈપણ રીતે ઉપયોગ કરો
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">ટેક્સ્ટ ટુ સ્પીચ ભૂલ (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        ઈન્ટરનેટ
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        ઇન્સ્ટોલ કરો
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        ટેક્સ્ટ ટુ સ્પીચ સેટિંગ્સ ખોલવામાં નિષ્ફળ
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">વધુ ડેક ડાઉનલોડ કરવા માટે કૃપા કરીને લૉગ ઇન કરો</string>
     <string name="deck_description_field_hint">વર્ણન</string>
     <string name="failed_to_copy">કૉપિ કરવામાં નિષ્ફળ</string>
diff --git a/AnkiDroid/src/main/res/values-gu/03-dialogs.xml b/AnkiDroid/src/main/res/values-gu/03-dialogs.xml
index 5e6d826b7c67..e1066b3c1f02 100644
--- a/AnkiDroid/src/main/res/values-gu/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-gu/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">ડેટાબેઝ ભૂલ</string>
     <string name="answering_error_message">સંગ્રહમાં લખવાનું નિષ્ફળ થયું. ડેટાબેઝ દૂષિત હોઈ શકે છે અથવા ડિસ્ક પર પૂરતી ખાલી જગ્યા ન હોઈ શકે.\n\nજો આવું વધુ વખત થાય, તો ડેટાબેઝને તપાસવાનો, સંગ્રહને રિપેર કરવાનો અથવા તેને બેકઅપમાંથી પુનઃસ્થાપિત કરવાનો પ્રયાસ કરો. તેના માટે \"વિકલ્પો\" ને ટચ કરો.\n\અથવા તે AnkiDroid બગ પણ હોઈ શકે છે; કૃપા કરીને ભૂલની જાણ કરો જેથી અમે આ તપાસી શકીએ.</string>
     <string name="answering_error_report">ભૂલની જાણ કરો</string>
-    <string name="storage_full_message">AnkiDroid ખોલવા માટે પૂરતી ખાલી જગ્યા નથી. ચાલુ રાખવા માટે થોડી જગ્યા ખાલી કરો.</string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">શું તમે ખરેખર ડેટાબેઝને રિપેર કરવાનો પ્રયાસ કરવા માંગો છો?\n\nપ્રયાસ શરૂ કરતા પહેલા, સબફોલ્ડર “%s” માં એક નકલ બનાવવામાં આવશે.</string>
     <string name="intent_aedict_empty">કેટેગરી \"ડિફોલ્ટ\" ખાલી છે</string>
     <string name="intent_aedict_category">AnkiDroid માં કાર્ડ ઉમેરવા માટે નોટપેડની બધી કેટેગરી દૂર કરો અથવા \"ડિફોલ્ટ\" નામની એક ઉમેરો</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">પાછળથી</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">ફરી બતાવશો નહીં</string>
     <string name="dismiss_backup_warning_title">ડેટા નુકશાન ચેતવણી</string>
-    <string name="dismiss_backup_warning_new_user">        એન્ડ્રોઇડ ગોપનીયતા ફેરફારોને કારણે, જો એપ્લિકેશન અનઇન્સ્ટોલ કરવામાં આવશે તો તમારો ડેટા અને સ્વચાલિત બેકઅપ તમારા ફોનમાંથી કાઢી નાખવામાં આવશે
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        એન્ડ્રોઇડ ગોપનીયતા ફેરફારોને કારણે, જો એપ્લિકેશન અનઇન્સ્ટોલ કરવામાં આવે તો તમારો ડેટા અને સ્વચાલિત બેકઅપ અગમ્ય હશે
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">ડેક પહેલેથી જ અસ્તિત્વમાં છે</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">જો તમને ડેક ઓર્ડરિંગ સમસ્યાઓ છે (દા.ત. \'10\' \'2\' પહેલાં દેખાય છે), તો \'2\' ને \'02\' સાથે બદલો</string>
diff --git a/AnkiDroid/src/main/res/values-gu/10-preferences.xml b/AnkiDroid/src/main/res/values-gu/10-preferences.xml
index 70712163126c..d51ba7c13a76 100644
--- a/AnkiDroid/src/main/res/values-gu/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-gu/10-preferences.xml
@@ -296,7 +296,7 @@
     <string name="pref_cat_dev_options" maxLength="41">વિકાસકર્તા વિકલ્પો</string>
     <string name="dev_options_enabled_pref" maxLength="41">વિકાસકર્તા વિકલ્પો સક્ષમ કરો</string>
     <string name="disable_dev_options">વિકાસકર્તા વિકલ્પોને અક્ષમ કરો</string>
-    <string name="dev_options_warning">વિકાસકર્તા વિકલ્પોને સક્ષમ કરતા પહેલા કૃપા કરીને ખાતરી કરો. આ વિકલ્પો ખતરનાક છે અને એપને તોડી શકે છે અથવા તમારા સંગ્રહને બગાડી શકે છે.\n\nનોંધ લો કે આ વિકલ્પો મોટાભાગના વપરાશકર્તાઓ માટે યોગ્ય નથી અને તેથી અનુવાદિત નથી, તેથી તેઓ અંગ્રેજીમાં છે.</string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-gu/17-model-manager.xml b/AnkiDroid/src/main/res/values-gu/17-model-manager.xml
index 487d308dbc96..257bc64223ed 100644
--- a/AnkiDroid/src/main/res/values-gu/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-gu/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">શું તમે ખરેખર આ નોંધ પ્રકાર કાઢી નાખવા માંગો છો?</string>
     <string name="field_delete_warning">શું તમે ખરેખર આ ફીલ્ડ કાઢી નાખવા માંગો છો?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">ઉમેરો: %1$s</string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">ક્લોન: %1$s</string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">કાર્ડ બ્રાઉઝર તમારા કાર્ડ પ્રદર્શિત કરવા માટે ઉપયોગ કરશે તે ટેમ્પલેટ દાખલ કરો. વધુ સંક્ષિપ્ત જવાબ પ્રદર્શિત કરવા માટે આનો ઉપયોગ કરો.\n\n\"{{Country}} ની રાજધાની છે:\"\n\"રાજધાની: {{Country}}\"માં સંકુચિત કરી શકાય છે.</string>
     <string name="card_template_browser_appearance_question_format">પ્રશ્ન ફોર્મેટ</string>
diff --git a/AnkiDroid/src/main/res/values-heb/02-strings.xml b/AnkiDroid/src/main/res/values-heb/02-strings.xml
index 99f62f4597b0..6a1133e62e7f 100644
--- a/AnkiDroid/src/main/res/values-heb/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-heb/02-strings.xml
@@ -241,7 +241,7 @@
     <string name="note_editor_image_too_large">התמונה גדולה מדי, אנא הכנס אותה באופן ידני</string>
     <string name="note_editor_video_too_large">קובץ הווידאו גדול מדי, אנא הכנס אותו באופן ידני</string>
     <string name="note_editor_audio_too_large">קובץ השמע גדול מדי, אנא הכנס אותו באופן ידני</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">בתהליך עדכון אנדרואיד, נסה שנית.</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">ייתכן שיהיה עליך להשתמש ב- iManager כדי לאפשר ל- AnkiDroid להוסיף קיצורי דרך</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">מסך הבית שלך אינו מאפשר ל- AnkiDroid להוסיף קיצורי דרך</string>
     <string name="create_shortcut_error">שגיאה בהוספת קיצור הדרך: %s</string>
@@ -315,14 +315,14 @@
     <string name="browser_options_dialog_heading">אפשרויות דפדפן</string>
     <string name="audio_saved">ההקלטה נשמרה</string>
     <string name="deleting_selected_notes">מחיקת הערות שנבחרו</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">הקש על קול כדי להאזין</string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">יש להתקין קול לפני השימוש</string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">השתמש בכל אופן</string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">שגיאת טקסט לדיבור (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">אינטרנט</string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">התקן</string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">פתיחת הגדרות טקסט לדיבור נכשלה</string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">אנא התחבר כדי להוריד חפיסות נוספות</string>
     <string name="deck_description_field_hint">תיאור</string>
     <string name="failed_to_copy">ההעתקה נכשלה</string>
diff --git a/AnkiDroid/src/main/res/values-heb/03-dialogs.xml b/AnkiDroid/src/main/res/values-heb/03-dialogs.xml
index 3affe6223155..fd1ea3da056c 100644
--- a/AnkiDroid/src/main/res/values-heb/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-heb/03-dialogs.xml
@@ -68,7 +68,7 @@
     <string name="answering_error_title">שגיאת מסד נתונים</string>
     <string name="answering_error_message">כתיבה לאוסף נכשלה. מאגר המידע אולי שבור או שאין מספיק מקום בדיסק.\n\n אם זה קורה שוב ושוב, אפשר לבדוק את מאגר המידע, לתקן את האוסף או לשחזר אותו מגיבוי. לחץ \'אפשרויות\' עבור כך. \n כמו כן ייתכן שזוהי תקלה בAnkiDroid. נא לדווח את השגיאה כדי שנוכל לבדוק זאת.</string>
     <string name="answering_error_report">דיווח על שגיאה</string>
-    <string name="storage_full_message">אין מספיק שטח אחסון פנוי כדי לפתוח את AnkiDroid.  פנה קצת מקום כדי להמשיך.</string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">לתקן את המאגר?\n\n
 לפני תחילת ניסיון התיקון, יתבצע שמירת העתק בתקייה %s</string>
     <string name="intent_aedict_empty">הקטגוריה \'ברירת מחדל\' ריקה</string>
@@ -221,8 +221,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">מאוחר יותר</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">אל תציג שוב</string>
     <string name="dismiss_backup_warning_title">אזהרת אובדן נתונים</string>
-    <string name="dismiss_backup_warning_new_user">עקב שינויים בפרטיות של Android, הנתונים והגיבויים האוטומטיים שלך יימחקו מהטלפון שלך אם האפליקציה תוסר</string>
-    <string name="dismiss_backup_warning_upgrade">עקב שינויים בפרטיות של Android, הנתונים והגיבויים האוטומטיים שלך לא יהיו נגישים אם האפליקציה תוסר</string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">החפיסה כבר קיימת</string>
     <string name="empty_deck_name">שם החפיסה לא יכול להיות ריק</string>
     <string name="create_deck_numeric_hint">אם יש לך בעיות בסדר החפיסות (למשל, \'10\' מופיע לפני \'2\'), החלף את \'2\' ב-\'02\'</string>
diff --git a/AnkiDroid/src/main/res/values-heb/10-preferences.xml b/AnkiDroid/src/main/res/values-heb/10-preferences.xml
index 4a1c832cab89..98947e1146a5 100644
--- a/AnkiDroid/src/main/res/values-heb/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-heb/10-preferences.xml
@@ -300,8 +300,7 @@
     <string name="pref_cat_dev_options" maxLength="41">אפשרויות מפתח</string>
     <string name="dev_options_enabled_pref" maxLength="41">הפעלת מצב מפתח</string>
     <string name="disable_dev_options">השבת את מצב המפתח</string>
-    <string name="dev_options_warning">        אנא ודא לפני הפעלת מצב מפתח. אפשרויות אלה מסוכנות ועלולות להשבית את האפליקציה או להשחית את האוסף שלך.\n\nשים לב שהאפשרויות הללו אינן מתאימות לרוב המשתמשים ולכן אינן מתורגמות, ולכן הן באנגלית.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-heb/17-model-manager.xml b/AnkiDroid/src/main/res/values-heb/17-model-manager.xml
index 19458f765e99..a3ef8bd01e5f 100644
--- a/AnkiDroid/src/main/res/values-heb/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-heb/17-model-manager.xml
@@ -68,9 +68,9 @@
     <string name="model_delete_warning">האם אתה בטוח שברצונך למחוק את סוג פתק זה?</string>
     <string name="field_delete_warning">למחוק את השדה הזה?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">הוספה: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">שכפול: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">הזן את התבנית שבה ישתמש דפדפן הכרטיסים כדי להציג את הכרטיסים שלך. השתמש בזה כדי להציג תשובה תמציתית יותר.\n\nתבנית קדמית של\n\"בירת {{מדינה}} היא:\"\nניתן לדחוס בדפדפן הכרטיסים ל\n\"בירה: {{מדינה}}\"</string>
     <string name="card_template_browser_appearance_question_format">סגנון שאלה</string>
diff --git a/AnkiDroid/src/main/res/values-hi/02-strings.xml b/AnkiDroid/src/main/res/values-hi/02-strings.xml
index 4ecb5f975383..fdc65729afed 100644
--- a/AnkiDroid/src/main/res/values-hi/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-hi/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">छवि बहुत बड़ी है, कृपया छवि को मैन्युअल रूप से डालें</string>
     <string name="note_editor_video_too_large">वीडियो फ़ाइल बहुत बड़ी है, कृपया वीडियो को मैन्युअल रूप से डालें</string>
     <string name="note_editor_audio_too_large">ऑडियो फ़ाइल बहुत बड़ी है, कृपया ऑडियो मैन्युअल रूप से डालें</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">एन्ड्रॉयड बैकप प्रगति पर है। कृपया पुन: प्रयास करें</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">अंकीड्रॉइड को शॉर्टकट जोड़ने की अनुमति देने के लिए आपको  आईमैनेजर का उपयोग करने की आवश्यकता हो सकती है</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">आपकी होम स्क्रीन अंकीड्रॉइड को शॉर्टकट जोड़ने की अनुमति नहीं देती है</string>
     <string name="create_shortcut_error">शॉर्टकट जोड़ने में त्रुटि: %s</string>
@@ -305,17 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">रिकॉर्डिंग को सहेजा गया</string>
     <string name="deleting_selected_notes">चयनित नोट्स हटाये जा रहे हैं</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">सुनने के लिए किसी आवाज़ पर टैप करें
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">उपयोग से पहले वॉइस इंस्टॉल किया जाना चाहिए</string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">कैसे भी प्रयोग करें
-
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">पाठ से वाक् त्रुटि (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">इंटरनेट</string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">इनस्टॉल</string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">टेक्स्ट टू स्पीच सेटिंग खोलने में विफल</string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">कृपया अधिक डेक डाउनलोड करने के लिए लॉग इन करें</string>
     <string name="deck_description_field_hint">विवरण</string>
     <string name="failed_to_copy">प्रतिलिपि बनाने में विफल</string>
diff --git a/AnkiDroid/src/main/res/values-hi/03-dialogs.xml b/AnkiDroid/src/main/res/values-hi/03-dialogs.xml
index 3020bee43de3..2f315009adcb 100644
--- a/AnkiDroid/src/main/res/values-hi/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-hi/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">डेटाबेस त्रुटि</string>
     <string name="answering_error_message">संग्रह में लेखन विफल रहा। डेटाबेस दूषित हो सकता है या डिस्क पर पर्याप्त खाली स्थान नहीं हो सकता है। \n\n यदि यह अधिक बार होता है, तो डेटाबेस की जाँच करने, संग्रह की मरम्मत करने या इसे बैकअप से पुनर्स्थापित करने का प्रयास करें। इसके लिए \"विकल्प\" स्पर्श करें। \n या यह एक एंकॉइड बग भी हो सकता है; कृपया त्रुटि रिपोर्ट करें ताकि हम इसकी जांच कर सकें।</string>
     <string name="answering_error_report">त्रुटि की सूचना दें</string>
-    <string name="storage_full_message">AnkiDroid को खोलने के लिए पर्याप्त फ्री स्टोरेज स्पेस नहीं है। जारी रखने के लिए कुछ जगह खाली करें। </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">क्या आप वास्तव में डेटाबेस को सुधारने का प्रयास करना चाहते हैं? \n\nBefore प्रयास प्रारंभ कर रहा है, एक प्रतिलिपि सबफ़ोल्डर \"%s\" में बनाया जाएगा ।</string>
     <string name="intent_aedict_empty">श्रेणी \"डिफ़ॉल्ट\" रिक्त है</string>
     <string name="intent_aedict_category">AnkiDroid में कार्ड जोड़ने के लिए सभी नोटपैड श्रेणियों को हटाएँ या एक \"डिफ़ॉल्ट\" नामक पत्ता जोड़ें</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">बाद में</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">दोबारा न दिखाएं</string>
     <string name="dismiss_backup_warning_title">डेटा हानि चेतावनी</string>
-    <string name="dismiss_backup_warning_new_user">        एंड्रॉइड गोपनीयता परिवर्तनों के कारण, ऐप अनइंस्टॉल होने पर आपका डेटा और स्वचालित बैकअप आपके फोन से हटा दिए जाएंगे
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        एंड्रॉइड गोपनीयता परिवर्तनों के कारण, ऐप अनइंस्टॉल होने पर आपका डेटा और स्वचालित बैकअप पहुंच योग्य नहीं होगा
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">डेक पहले से मौजूद है</string>
     <string name="empty_deck_name">डेक का नाम खाली नहीं हो सकता</string>
     <string name="create_deck_numeric_hint">यदि आपके पास डेक ऑर्डरिंग समस्याएं हैं (उदाहरण के लिए \'10\' \'2\' से पहले आता है), तो \'2\' को \'02\' से बदलें</string>
diff --git a/AnkiDroid/src/main/res/values-hi/10-preferences.xml b/AnkiDroid/src/main/res/values-hi/10-preferences.xml
index 16842b9319c7..3fdc576069f3 100644
--- a/AnkiDroid/src/main/res/values-hi/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-hi/10-preferences.xml
@@ -293,7 +293,7 @@
     <string name="pref_cat_dev_options" maxLength="41">डेवलपर विकल्प</string>
     <string name="dev_options_enabled_pref" maxLength="41">डेवलपर विकल्प सक्षम करें</string>
     <string name="disable_dev_options">डेवलपर विकल्प अक्षम करें</string>
-    <string name="dev_options_warning">ध्यान दें: डेवलपर विकल्प ऐप या आपके संग्रह को नुकसान पहुंचा सकते हैं, यह इस बात पर निर्भर करता है कि आप उनका उपयोग कैसे करते हैं। \n\nये विकल्प अधिकांश उपयोगकर्ताओं के लिए उपयुक्त नहीं हैं और केवल अंग्रेज़ी में प्रदर्शित होते हैं।</string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-hi/17-model-manager.xml b/AnkiDroid/src/main/res/values-hi/17-model-manager.xml
index 9f01712ab164..3d4e2be5c310 100644
--- a/AnkiDroid/src/main/res/values-hi/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-hi/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">आप सुनिश्चित करें कि आप इस नोटों को हटाना चाहते हैं?</string>
     <string name="field_delete_warning">क्या आप सचमुच इस फ़ील्ड को मिटाना चाहते हैं?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">जोड़ें: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">जुड़वाँ: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">वह टेम्प्लेट दर्ज करें जिसका उपयोग कार्ड ब्राउज़र आपके कार्ड प्रदर्शित करने के लिए करेगा।अधिक संक्षिप्त उत्तर प्रदर्शित करने के लिए इसका उपयोग करें।\n\n एक \"{{Country}} की राजधानी है:\" अग्र टेम्पलेट को \n कार्ड ब्राउज़र में \n \"राजधानी:{{Country}}\" की तरह संपीड़ित किया जा सकता है I</string>
     <string name="card_template_browser_appearance_question_format">प्रश्न प्रारूप</string>
diff --git a/AnkiDroid/src/main/res/values-hr/02-strings.xml b/AnkiDroid/src/main/res/values-hr/02-strings.xml
index bb07610f22c3..a18e11ad9748 100644
--- a/AnkiDroid/src/main/res/values-hr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-hr/02-strings.xml
@@ -237,7 +237,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -310,20 +310,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-hr/03-dialogs.xml b/AnkiDroid/src/main/res/values-hr/03-dialogs.xml
index a3019398680a..44c6bd15e7bb 100644
--- a/AnkiDroid/src/main/res/values-hr/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-hr/03-dialogs.xml
@@ -66,7 +66,7 @@
     <string name="answering_error_title">Database error</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Report error</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
@@ -216,10 +216,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-hr/10-preferences.xml b/AnkiDroid/src/main/res/values-hr/10-preferences.xml
index 2ca6452442b9..b7e587005dc8 100644
--- a/AnkiDroid/src/main/res/values-hr/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-hr/10-preferences.xml
@@ -299,8 +299,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-hr/17-model-manager.xml b/AnkiDroid/src/main/res/values-hr/17-model-manager.xml
index ed29308a2f68..d4d9c736663d 100644
--- a/AnkiDroid/src/main/res/values-hr/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-hr/17-model-manager.xml
@@ -66,9 +66,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Jeste li sigurni da želite izbrisati ovo polje?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Dodavanje: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Kloniranje: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>
diff --git a/AnkiDroid/src/main/res/values-hu/02-strings.xml b/AnkiDroid/src/main/res/values-hu/02-strings.xml
index 2193f5fb70da..38c27b9cfe7f 100644
--- a/AnkiDroid/src/main/res/values-hu/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-hu/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android biztonsági mentés folyamatban. Próbálkozzon később</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">Az AnkiDroidban rövidítések használatához szükséges lehet az iManager használata</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">A Kezdőképernyőd nem engedi AnkiDroid közvetlen elérések elhelyezését</string>
     <string name="create_shortcut_error">Hiba történt a közvetlen elérés hozzáadásakor: %s</string>
@@ -306,14 +306,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Felvétel mentve</string>
     <string name="deleting_selected_notes">A kijelölt jegyzetek törlése.</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Nyomj egy hangra a meghallgatáshoz</string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">A hangot le kell tölteni használat előtt</string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Használat letöltés nélkül</string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Hiba a(z) (%s) felolvasásakor</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Letöltés</string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">A felolvasás beállítások megnyitása sikertelen</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Több pakli letöltéséhez jelentkezz be</string>
     <string name="deck_description_field_hint">Megjegyzés</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-hu/03-dialogs.xml b/AnkiDroid/src/main/res/values-hu/03-dialogs.xml
index 719d4a9e235e..1ca1666dbded 100644
--- a/AnkiDroid/src/main/res/values-hu/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-hu/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Adatbázis hiba</string>
     <string name="answering_error_message">A gyűjteménybe írás sikertelen. Az adatbázis lehet, hogy korrupt vagy nincs elég hely a lemezen.\n\n. Ha gyakrabban történik ilyen, akkor próbálja ellenőrizni az adatbázist, javítsa meg a gyűjteményt vagy állítsa azt vissza egy biztonsági másolatból. Ehhez nyomjon rá a \"beállításokra\".\n. Vagy lehet, hogy ez egy AnkiDroid bug; kérjük jelentse a hibát, hogy le tudjuk ellenőrizni.</string>
     <string name="answering_error_report">Hibák jelentése</string>
-    <string name="storage_full_message">Nincs elég szabad tárhely az AnkiDroid megnyitásához. Szabadítson fel helyet a folytatáshoz.</string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Tényleg megpróbálod megjavítani az adatbázist?\n\nEnnek megkísérlése előtt a program létrehoz egy másolatot a \'%s\' almappában.</string>
     <string name="intent_aedict_empty">Az \"alap\" kategória üres</string>
     <string name="intent_aedict_category">Hogy új kártyákat adj az AnkiDroid-hoz, távolítsd el az összes Jegyzettömb/Notepad/ kategóriát, vagy adj hozzá egyet \'default\' névvel</string>
@@ -212,8 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Később</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Ne mutassa újra</string>
     <string name="dismiss_backup_warning_title">Figyelmeztetés adatveszteségről</string>
-    <string name="dismiss_backup_warning_new_user">Az Android adatvédelmi módosításai miatt az adatok és az automatikus biztonsági mentések is törlődnek, ha az alkalmazás eltávolításra kerül.</string>
-    <string name="dismiss_backup_warning_upgrade">Az Android adatvédelmi módosításai miatt az adatok és az automatikus biztonsági mentések is elérhetetlenné válnak, ha az alkalmazás eltávolításra kerül.</string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-hu/10-preferences.xml b/AnkiDroid/src/main/res/values-hu/10-preferences.xml
index d120512883ab..291b6bc44260 100644
--- a/AnkiDroid/src/main/res/values-hu/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-hu/10-preferences.xml
@@ -296,7 +296,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Fejlesztői beállítások</string>
     <string name="dev_options_enabled_pref" maxLength="41">Fejlesztői beállítások engedélyezése</string>
     <string name="disable_dev_options">Fejlesztői beállítások letiltása</string>
-    <string name="dev_options_warning">        Kérjük, győződjön meg róla, mielőtt engedélyezné a fejlesztői beállításokat. Ezek a beállítások veszélyesek és tönkretehetik az alkalmazást vagy korruptá tehetik a gyűjteményt.\n\nMegjegyezzük, hogy ezek az opciók nem alkalmasak a legtöbb felhasználó számára, ezért nincsenek lefordítva, szóval angolul vannak.</string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-hu/17-model-manager.xml b/AnkiDroid/src/main/res/values-hu/17-model-manager.xml
index 395cb2e0c203..920ccba1be76 100644
--- a/AnkiDroid/src/main/res/values-hu/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-hu/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Biztosan törölni akarja ezt a jegyzettípust?</string>
     <string name="field_delete_warning">Biztosan törölni akarja ezt a mezőt?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Hozzáadás: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Klón: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Írja be a mintát, amit a kártya böngésző használni fog, hogy megjelenítse a kártyákat. Használja ezt, hogy tömörebb választ kapjon.\n\nAz első oldali sablonon található \n\"{{Country}} fővárosa:\"\na kártya böngészőben tömörítve így néz ki\n\"Főváros: {{Country}}\"</string>
     <string name="card_template_browser_appearance_question_format">Kérdés formátuma</string>
diff --git a/AnkiDroid/src/main/res/values-hy/02-strings.xml b/AnkiDroid/src/main/res/values-hy/02-strings.xml
index 8c9d505c0f41..f163451aa1ae 100644
--- a/AnkiDroid/src/main/res/values-hy/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-hy/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-hy/03-dialogs.xml b/AnkiDroid/src/main/res/values-hy/03-dialogs.xml
index dc126001a1c4..04325e9e027c 100644
--- a/AnkiDroid/src/main/res/values-hy/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-hy/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Շտեմարանի սխալ</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Report error</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
@@ -212,8 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Ավելի ուշ</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Այլևս ցույց չտալ</string>
     <string name="dismiss_backup_warning_title">Տվյալների կորուստի մասին նախազգուշացում</string>
-    <string name="dismiss_backup_warning_new_user">Android-ի գաղտնիության փոփոխությունների պատճառով ձեր տվյալները և նրանց` ավտոմատ կերպով ստեղծված պատճենները կջնջվեն` ծրագրի ապատեղադրման ժամանակ։</string>
-    <string name="dismiss_backup_warning_upgrade">Android-ի գաղտնիության փոփոխությունների պատճառով ձեր տվյալները և նրանց` ավտոմատ կերպով ստեղծված պատճենները անհասանելի կլինեն` ծրագրի ապատեղադրման ժամանակ։</string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-hy/10-preferences.xml b/AnkiDroid/src/main/res/values-hy/10-preferences.xml
index 668bc1fb82b1..9e453f0acc53 100644
--- a/AnkiDroid/src/main/res/values-hy/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-hy/10-preferences.xml
@@ -297,8 +297,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-hy/17-model-manager.xml b/AnkiDroid/src/main/res/values-hy/17-model-manager.xml
index a29697f32409..66bc3d7cc2e6 100644
--- a/AnkiDroid/src/main/res/values-hy/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-hy/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Are you sure you wish to delete this field?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>
diff --git a/AnkiDroid/src/main/res/values-ind/02-strings.xml b/AnkiDroid/src/main/res/values-ind/02-strings.xml
index a54bf0ed2a75..dbf325ac3bb0 100644
--- a/AnkiDroid/src/main/res/values-ind/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ind/02-strings.xml
@@ -229,7 +229,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Pencadangan android sedang dalam proses. Mohon coba lagi.</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">Anda mungkin perlu menggunakan iManager untuk memperbolehkan AnkiDroid menambah pintasan</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Layar utama Anda tidak memperbolehkan AnkiDroid untuk menambah pintasan</string>
     <string name="create_shortcut_error">Gagal menambah shortcut: %s</string>
@@ -300,20 +300,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Rekaman disimpan</string>
     <string name="deleting_selected_notes">Menghapus catatan yang dipilih</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Ketuk sebuah suara untuk didengarkan
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Suara harus dipasang sebelum digunakan
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Gunakan saja
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Eror teks ke suara (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Pasang
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Gagal membuka pengaturan teks ke suara
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Silakan masuk ke akun untuk mengunduh lebih banyak dek</string>
     <string name="deck_description_field_hint">Deskripsi</string>
     <string name="failed_to_copy">Gagal menyalin</string>
diff --git a/AnkiDroid/src/main/res/values-ind/03-dialogs.xml b/AnkiDroid/src/main/res/values-ind/03-dialogs.xml
index 41f34ef2d9e3..3e113efdbd22 100644
--- a/AnkiDroid/src/main/res/values-ind/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ind/03-dialogs.xml
@@ -62,7 +62,7 @@
     <string name="answering_error_title">Galat basisdata</string>
     <string name="answering_error_message">Menulis ke koleksi gagal. Basisdata mungkin korup atau tidak cukup ruang pada penyimpanan. \ n \ n Jika ini sering terjadi, cobalah periksa database, perbaiki koleksi atau mengembalikan dari cadangan. Sentuh \"pengaturan\" untuk ini. \ n \ Atau bisa juga bug dari AnkiDroid; harap laporkan galatnya agar kami bisa mengeceknya.</string>
     <string name="answering_error_report">Laporkan galat</string>
-    <string name="storage_full_message">Tidak ada ruang penyimpanan yang cukup untuk membuka AnkiDroid. Bebaskan sedikit ruang untuk melanjutkan.</string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Apakah Anda benar-benar ingin memperbaiki basis data?\n\nSebelum memulai, salinan akan dibuat ke dalam subfolder \'%s\'.</string>
     <string name="intent_aedict_empty">Kategori \'awalan\' kosong</string>
     <string name="intent_aedict_category">Untuk menambah kartu ke AnkiDroid hapus semua kategori catatan atau tambahkan satu bernama \"bawaan\"</string>
@@ -208,10 +208,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Nanti</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Jangan tampilkan lagi</string>
     <string name="dismiss_backup_warning_title">Peringatan kehilangan data</string>
-    <string name="dismiss_backup_warning_new_user">        Karena perubahan privasi Android, data dan cadangan otomatis Anda akan dihapus dari ponsel Anda jika aplikasi ini dicopot pemasangannya
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Karena perubahan privasi Android, data dan cadangan otomatis Anda tidak akan dapat diakses jika aplikasi ini dicopot pemasangannya
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-ind/10-preferences.xml b/AnkiDroid/src/main/res/values-ind/10-preferences.xml
index 9c53493d7c8d..cb00181bee9a 100644
--- a/AnkiDroid/src/main/res/values-ind/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ind/10-preferences.xml
@@ -295,8 +295,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Opsi pengembang</string>
     <string name="dev_options_enabled_pref" maxLength="41">Aktifkan opsi pengembang</string>
     <string name="disable_dev_options">Nonaktifkan opsi pengembang</string>
-    <string name="dev_options_warning">        Pastikan sebelum mengaktifkan opsi pengembang. Opsi ini berbahaya dan dapat merusak aplikasi atau merusak koleksi Anda.\n\nPerhatikan bahwa opsi-opsi ini tidak cocok untuk sebagian besar pengguna dan oleh karena itu tidak diterjemahkan, jadi opsi-opsi ini dalam bahasa Inggris.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-ind/17-model-manager.xml b/AnkiDroid/src/main/res/values-ind/17-model-manager.xml
index a6dc3d24f7bd..819954f182c3 100644
--- a/AnkiDroid/src/main/res/values-ind/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ind/17-model-manager.xml
@@ -62,9 +62,9 @@
     <string name="model_delete_warning">Yakin ingin menghapus tipe catatan ini?</string>
     <string name="field_delete_warning">Yakin ingin menghapus kolom ini?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Tambah: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Duplikat: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Masukkan templat yang penelusur kartu akan gunakan untuk menampilkan kartumu. Gunakan ini untuk menampilkan jawaban yang lebih ringkas.\n\nContoh: templat depan\n“Ibukota {{Negara}} adalah:”\nbisa diringkas lagi di penelusur kartu menjadi\n“Ibukota: {{Negara}}”</string>
     <string name="card_template_browser_appearance_question_format">Format pertanyaan</string>
diff --git a/AnkiDroid/src/main/res/values-is/02-strings.xml b/AnkiDroid/src/main/res/values-is/02-strings.xml
index d3c686c3bb2f..c2a6fe35b154 100644
--- a/AnkiDroid/src/main/res/values-is/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-is/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-is/03-dialogs.xml b/AnkiDroid/src/main/res/values-is/03-dialogs.xml
index 221b0b5ff1bb..86bcba56a637 100644
--- a/AnkiDroid/src/main/res/values-is/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-is/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Database error</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Report error</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-is/10-preferences.xml b/AnkiDroid/src/main/res/values-is/10-preferences.xml
index 29e92629b16c..2afb72668806 100644
--- a/AnkiDroid/src/main/res/values-is/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-is/10-preferences.xml
@@ -297,8 +297,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-is/17-model-manager.xml b/AnkiDroid/src/main/res/values-is/17-model-manager.xml
index 6b89a122d404..eff2650b23bb 100644
--- a/AnkiDroid/src/main/res/values-is/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-is/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Are you sure you wish to delete this field?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>
diff --git a/AnkiDroid/src/main/res/values-it/02-strings.xml b/AnkiDroid/src/main/res/values-it/02-strings.xml
index 133345091a8c..1d6566742efc 100644
--- a/AnkiDroid/src/main/res/values-it/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-it/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">L\'immagine è troppo grande, per favore inserisci l\'immagine manualmente</string>
     <string name="note_editor_video_too_large">Il file video è troppo grande, per favore inserisci il video manualmente.</string>
     <string name="note_editor_audio_too_large">Il file audio è troppo grande,  inserisci manualmente il file audio.</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Backup di Android in corso. Sei pregato di riprovare</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">Utilizza iManager per consentire ad AnkiDroid di aggiungere scorciatoie</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">La tua schermata iniziale non consente ad AnkiDroid di aggiungere scorciatoie</string>
     <string name="create_shortcut_error">Errore nell\'aggiunta della scorciatoia: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Registrazione salvata</string>
     <string name="deleting_selected_notes">Eliminazione delle note selezionate</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Clicca su una voce per ascoltare
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">La voce deve essere installata prima dell\'uso
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Usa comunque
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Errore sintetizzatore vocale (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Installa
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Non è stato possibile aprire le impostazioni del sintetizzatore vocale
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Accedi per scaricare altri mazzi</string>
     <string name="deck_description_field_hint">Descrizione</string>
     <string name="failed_to_copy">Copia non riuscita</string>
diff --git a/AnkiDroid/src/main/res/values-it/03-dialogs.xml b/AnkiDroid/src/main/res/values-it/03-dialogs.xml
index ad3f8f11edc9..e29f223651b3 100644
--- a/AnkiDroid/src/main/res/values-it/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-it/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Errore database</string>
     <string name="answering_error_message">Scrittura della raccolta non riuscita. La banca dati potrebbe essere danneggiata o potrebbe non esserci abbastanza spazio vuoto sul disco.\n\nSe questo accade più spesso, prova a controllare la banca dati, a riparare la collezione o a ripristinarla da un backup. Tocca «opzioni» per quello.\n\O potrebbe essere anche un errore di AnkiDroid, per favore segnala l\'errore in modo da poterlo controllare.</string>
     <string name="answering_error_report">Segnala errori</string>
-    <string name="storage_full_message">Non c\'è abbastanza spazio libero per aprire AnkiDroid. Libera spazio per continuare. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Vuoi veramente provare a riparare il database?\n\nPrima di iniziare il tentativo, verrà creata una copia nella sottocartella \'%s\'.</string>
     <string name="intent_aedict_empty">Categoria \'default\' è vuota</string>
     <string name="intent_aedict_category">Per aggiungere le carte ad AnkiDroid rimuovi tutte le categorie Notepad o aggiungine una chiamata \'default\'</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Più tardi</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Non mostrare più</string>
     <string name="dismiss_backup_warning_title">Avviso di perdita dati</string>
-    <string name="dismiss_backup_warning_new_user">        A causa delle modifiche alla privacy di Android, i tuoi dati e i backup automatici verranno eliminati dal tuo telefono se l\'app viene disinstallata
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        A causa delle modifiche alla privacy di Android, i tuoi dati e i backup automatici verranno eliminati dal tuo telefono se l\'app viene disinstallata
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Mazzo già esistente</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">In caso di problemi di ordine del mazzo (es. \'10\' appare prima di \'2\'), sostituire \'2\' con \'02\'</string>
diff --git a/AnkiDroid/src/main/res/values-it/10-preferences.xml b/AnkiDroid/src/main/res/values-it/10-preferences.xml
index 45536b662b91..be49f02d0691 100644
--- a/AnkiDroid/src/main/res/values-it/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-it/10-preferences.xml
@@ -296,8 +296,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Opzioni sviluppatore</string>
     <string name="dev_options_enabled_pref" maxLength="41">Abilita le opzioni sviluppatore</string>
     <string name="disable_dev_options">Disabilità le opzioni sviluppatore</string>
-    <string name="dev_options_warning">        Assicurati di voler abilitare le opzioni sviluppatore prima di farlo. Queste opzioni sono pericolose e potrebbero rompere l\'applicazione o corrompere la tua collezione.\n\nNota che queste opzioni non sono adatte alla maggior parte degli utenti e per questo non sono tradotte, quindi sono in inglese.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-it/17-model-manager.xml b/AnkiDroid/src/main/res/values-it/17-model-manager.xml
index 16e5d8076b74..409153627b29 100644
--- a/AnkiDroid/src/main/res/values-it/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-it/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Sei sicuro/a di voler eliminare questo tipo di nota?</string>
     <string name="field_delete_warning">Sei sicuro di voler eliminare questo campo?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Aggiungi: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clona: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Inserisci il modello che il browser delle carte userà per visualizzare le tue carte. Usa questo per visualizzare una risposta più concisa.\n\nUn modello iniziale di\n«La capitale di {{Country}} è:»\npotrebbe essere compresso nel browser delle carte a\n«Capitale: {{Country}}»</string>
     <string name="card_template_browser_appearance_question_format">Formato della domanda</string>
diff --git a/AnkiDroid/src/main/res/values-iw/02-strings.xml b/AnkiDroid/src/main/res/values-iw/02-strings.xml
index 99f62f4597b0..6a1133e62e7f 100644
--- a/AnkiDroid/src/main/res/values-iw/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-iw/02-strings.xml
@@ -241,7 +241,7 @@
     <string name="note_editor_image_too_large">התמונה גדולה מדי, אנא הכנס אותה באופן ידני</string>
     <string name="note_editor_video_too_large">קובץ הווידאו גדול מדי, אנא הכנס אותו באופן ידני</string>
     <string name="note_editor_audio_too_large">קובץ השמע גדול מדי, אנא הכנס אותו באופן ידני</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">בתהליך עדכון אנדרואיד, נסה שנית.</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">ייתכן שיהיה עליך להשתמש ב- iManager כדי לאפשר ל- AnkiDroid להוסיף קיצורי דרך</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">מסך הבית שלך אינו מאפשר ל- AnkiDroid להוסיף קיצורי דרך</string>
     <string name="create_shortcut_error">שגיאה בהוספת קיצור הדרך: %s</string>
@@ -315,14 +315,14 @@
     <string name="browser_options_dialog_heading">אפשרויות דפדפן</string>
     <string name="audio_saved">ההקלטה נשמרה</string>
     <string name="deleting_selected_notes">מחיקת הערות שנבחרו</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">הקש על קול כדי להאזין</string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">יש להתקין קול לפני השימוש</string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">השתמש בכל אופן</string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">שגיאת טקסט לדיבור (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">אינטרנט</string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">התקן</string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">פתיחת הגדרות טקסט לדיבור נכשלה</string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">אנא התחבר כדי להוריד חפיסות נוספות</string>
     <string name="deck_description_field_hint">תיאור</string>
     <string name="failed_to_copy">ההעתקה נכשלה</string>
diff --git a/AnkiDroid/src/main/res/values-iw/03-dialogs.xml b/AnkiDroid/src/main/res/values-iw/03-dialogs.xml
index 3affe6223155..fd1ea3da056c 100644
--- a/AnkiDroid/src/main/res/values-iw/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-iw/03-dialogs.xml
@@ -68,7 +68,7 @@
     <string name="answering_error_title">שגיאת מסד נתונים</string>
     <string name="answering_error_message">כתיבה לאוסף נכשלה. מאגר המידע אולי שבור או שאין מספיק מקום בדיסק.\n\n אם זה קורה שוב ושוב, אפשר לבדוק את מאגר המידע, לתקן את האוסף או לשחזר אותו מגיבוי. לחץ \'אפשרויות\' עבור כך. \n כמו כן ייתכן שזוהי תקלה בAnkiDroid. נא לדווח את השגיאה כדי שנוכל לבדוק זאת.</string>
     <string name="answering_error_report">דיווח על שגיאה</string>
-    <string name="storage_full_message">אין מספיק שטח אחסון פנוי כדי לפתוח את AnkiDroid.  פנה קצת מקום כדי להמשיך.</string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">לתקן את המאגר?\n\n
 לפני תחילת ניסיון התיקון, יתבצע שמירת העתק בתקייה %s</string>
     <string name="intent_aedict_empty">הקטגוריה \'ברירת מחדל\' ריקה</string>
@@ -221,8 +221,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">מאוחר יותר</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">אל תציג שוב</string>
     <string name="dismiss_backup_warning_title">אזהרת אובדן נתונים</string>
-    <string name="dismiss_backup_warning_new_user">עקב שינויים בפרטיות של Android, הנתונים והגיבויים האוטומטיים שלך יימחקו מהטלפון שלך אם האפליקציה תוסר</string>
-    <string name="dismiss_backup_warning_upgrade">עקב שינויים בפרטיות של Android, הנתונים והגיבויים האוטומטיים שלך לא יהיו נגישים אם האפליקציה תוסר</string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">החפיסה כבר קיימת</string>
     <string name="empty_deck_name">שם החפיסה לא יכול להיות ריק</string>
     <string name="create_deck_numeric_hint">אם יש לך בעיות בסדר החפיסות (למשל, \'10\' מופיע לפני \'2\'), החלף את \'2\' ב-\'02\'</string>
diff --git a/AnkiDroid/src/main/res/values-iw/10-preferences.xml b/AnkiDroid/src/main/res/values-iw/10-preferences.xml
index 4a1c832cab89..98947e1146a5 100644
--- a/AnkiDroid/src/main/res/values-iw/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-iw/10-preferences.xml
@@ -300,8 +300,7 @@
     <string name="pref_cat_dev_options" maxLength="41">אפשרויות מפתח</string>
     <string name="dev_options_enabled_pref" maxLength="41">הפעלת מצב מפתח</string>
     <string name="disable_dev_options">השבת את מצב המפתח</string>
-    <string name="dev_options_warning">        אנא ודא לפני הפעלת מצב מפתח. אפשרויות אלה מסוכנות ועלולות להשבית את האפליקציה או להשחית את האוסף שלך.\n\nשים לב שהאפשרויות הללו אינן מתאימות לרוב המשתמשים ולכן אינן מתורגמות, ולכן הן באנגלית.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-iw/17-model-manager.xml b/AnkiDroid/src/main/res/values-iw/17-model-manager.xml
index 19458f765e99..a3ef8bd01e5f 100644
--- a/AnkiDroid/src/main/res/values-iw/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-iw/17-model-manager.xml
@@ -68,9 +68,9 @@
     <string name="model_delete_warning">האם אתה בטוח שברצונך למחוק את סוג פתק זה?</string>
     <string name="field_delete_warning">למחוק את השדה הזה?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">הוספה: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">שכפול: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">הזן את התבנית שבה ישתמש דפדפן הכרטיסים כדי להציג את הכרטיסים שלך. השתמש בזה כדי להציג תשובה תמציתית יותר.\n\nתבנית קדמית של\n\"בירת {{מדינה}} היא:\"\nניתן לדחוס בדפדפן הכרטיסים ל\n\"בירה: {{מדינה}}\"</string>
     <string name="card_template_browser_appearance_question_format">סגנון שאלה</string>
diff --git a/AnkiDroid/src/main/res/values-ja/02-strings.xml b/AnkiDroid/src/main/res/values-ja/02-strings.xml
index b7df2a545ff6..8fd0bed3e3fe 100644
--- a/AnkiDroid/src/main/res/values-ja/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ja/02-strings.xml
@@ -183,7 +183,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">デッキリスト画面の背景</string>
     <string name="choose_an_image" maxLength="41">画像を選択</string>
-    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">画像を背景から削除</string>
     <string name="remove_background_image">背景画像を削除しますか？</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">既定値に戻す</string>
@@ -229,7 +229,7 @@
     <string name="note_editor_image_too_large">画像が大きすぎます。手動で画像を挿入してください</string>
     <string name="note_editor_video_too_large">動画ファイルが大きすぎます。手動で動画を挿入してください</string>
     <string name="note_editor_audio_too_large">音声ファイルが大きすぎます。手動で音声を挿入してください</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Androidのバックアップが進行中です。もう一度やり直してください</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">AnkiDroidのショートカットを追加するには、iManagerでの許可が必要な場合があります。</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">ホーム画面へのショートカットの追加が許可されませんでした</string>
     <string name="create_shortcut_error">ショートカット追加のエラー: %s</string>
@@ -300,20 +300,14 @@
     <string name="browser_options_dialog_heading">ブラウザ オプション</string>
     <string name="audio_saved">録音を保存しました</string>
     <string name="deleting_selected_notes">選択したノートを削除しています</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        読み上げる音声をタップ 
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">使用前に音声をインストールする必要があります
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">とにかく使用
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">テキスト読み上げエラー (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        ｲﾝﾀｰﾈｯﾄ
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        ｲﾝｽﾄｰﾙ
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        テキスト読み上げの設定を開けませんでした
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">さらにデッキをダウンロードするにはログインしてください</string>
     <string name="deck_description_field_hint">デッキ説明文</string>
     <string name="failed_to_copy">コピーに失敗しました</string>
diff --git a/AnkiDroid/src/main/res/values-ja/03-dialogs.xml b/AnkiDroid/src/main/res/values-ja/03-dialogs.xml
index d68971f9a365..74cde8a6228e 100644
--- a/AnkiDroid/src/main/res/values-ja/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ja/03-dialogs.xml
@@ -62,7 +62,7 @@
     <string name="answering_error_title">データベース エラー</string>
     <string name="answering_error_message">コレクションへの書き込み中にエラーが発生しました。データベースの破損しているか、ストレージの空き容量が不足している可能性があります。\n\n繰り返しエラーが発生する場合には、「データベースをチェック」、コレクションの修復、「バックアップから復元」を試してみてください。\nまた、AnkiDroidのバグである可能性が考えられる場合は、開発者にご報告ください。</string>
     <string name="answering_error_report">エラーを報告</string>
-    <string name="storage_full_message">AnkiDroidアプリを開くための十分な空き容量がストレージにありません。続行するには空き容量を確保してください。 </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">データベースの修復を試みて本当によろしいですか？\n\n試行の開始前に、サブフォルダ \"%s\" にコピーを作成します。</string>
     <string name="intent_aedict_empty">カテゴリー \"default\" が空です</string>
     <string name="intent_aedict_category">AnkiDroidにカードを登録するため、すべてのNotepadカテゴリを削除するか、\"default\" という名前のカテゴリを追加してください</string>
@@ -208,9 +208,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">後で</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">今後表示しない</string>
     <string name="dismiss_backup_warning_title">データ損失の警告</string>
-    <string name="dismiss_backup_warning_new_user">        Androidのプライバシーポリシーの変更に伴い、今後AnkiDroidをアンインストールすると、あなたのコレクションや自動バックアップのデータもこの端末から削除されます。
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Androidのプライバシーポリシーの変更に伴い、今後AnkiDroidをアンインストールすると、現在のコレクションや自動バックアップのデータにアクセスできなくなります。</string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">同じ名前のデッキがすでにあります</string>
     <string name="empty_deck_name">デッキ名の入力が必要です</string>
     <string name="create_deck_numeric_hint">デッキは名前の文字列順に並べられるため、たとえばデッキ「10」はデッキ「2」よりも上に配置されます。この場合、「2」を「02」に変更すれば、それより下に「10」を配置できます。</string>
diff --git a/AnkiDroid/src/main/res/values-ja/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-ja/07-cardbrowser.xml
index 3656f6d32491..c0af4526fb7d 100644
--- a/AnkiDroid/src/main/res/values-ja/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-ja/07-cardbrowser.xml
@@ -112,5 +112,5 @@
     <string name="user_potential_columns">使用可能</string>
     <string name="include_column">この列をブラウザのリストで使用</string>
     <string name="exclude_column">この列をブラウザのリストから除外</string>
-    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
+    <string name="browser_find_replace_loading_fields">フィールド名を取得しています&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ja/10-preferences.xml b/AnkiDroid/src/main/res/values-ja/10-preferences.xml
index ce51ab4adc5c..143070d5aa84 100644
--- a/AnkiDroid/src/main/res/values-ja/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ja/10-preferences.xml
@@ -294,8 +294,7 @@
     <string name="pref_cat_dev_options" maxLength="41">開発者向けオプション</string>
     <string name="dev_options_enabled_pref" maxLength="41">開発者向けオプションを有効にする</string>
     <string name="disable_dev_options">開発者向けオプションを無効にする</string>
-    <string name="dev_options_warning">        注意：開発者向けのオプションは、使い方によってはアプリ自体やコレクションを破損させるおそれがあります。\n\nこれらのオプションはほとんどのユーザーには適していないため、英語でのみ表示されます。
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-ja/17-model-manager.xml b/AnkiDroid/src/main/res/values-ja/17-model-manager.xml
index e81c69afade7..e470a29b0e0b 100644
--- a/AnkiDroid/src/main/res/values-ja/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ja/17-model-manager.xml
@@ -62,9 +62,9 @@
     <string name="model_delete_warning">このノートタイプを削除します。本当によろしいですか？</string>
     <string name="field_delete_warning">このフィールドを削除します。本当によろしいですか？</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">追加: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">複製: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">カードブラウザでカードをリスト表示する際に使用するテンプレートを設定できます。これを利用すると、内容をより簡潔に表示することができます。\n\n例えば、\n「 {{Country}} の首都はどこですか？」\nという内容の表面テンプレートについて、\n「 {{Country}} の首都」\nという、リストの質問欄用のテンプレートを設定することによって、「フランス の首都」「ドイツ の首都」のように、カード表面の内容をコンパクトに示すことができます。</string>
     <string name="card_template_browser_appearance_question_format">質問欄テンプレート</string>
diff --git a/AnkiDroid/src/main/res/values-jv/02-strings.xml b/AnkiDroid/src/main/res/values-jv/02-strings.xml
index 18b51e859232..6344ffa4695e 100644
--- a/AnkiDroid/src/main/res/values-jv/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-jv/02-strings.xml
@@ -229,7 +229,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -300,20 +300,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-jv/03-dialogs.xml b/AnkiDroid/src/main/res/values-jv/03-dialogs.xml
index 4c4d14477486..e649b069ab31 100644
--- a/AnkiDroid/src/main/res/values-jv/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-jv/03-dialogs.xml
@@ -62,7 +62,7 @@
     <string name="answering_error_title">Database error</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Report error</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
@@ -208,10 +208,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-jv/10-preferences.xml b/AnkiDroid/src/main/res/values-jv/10-preferences.xml
index 0b680887a4dd..0f0b55cad9c9 100644
--- a/AnkiDroid/src/main/res/values-jv/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-jv/10-preferences.xml
@@ -295,8 +295,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-jv/17-model-manager.xml b/AnkiDroid/src/main/res/values-jv/17-model-manager.xml
index 5fa571a5e4a9..c92fe77e4302 100644
--- a/AnkiDroid/src/main/res/values-jv/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-jv/17-model-manager.xml
@@ -62,9 +62,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Are you sure you wish to delete this field?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>
diff --git a/AnkiDroid/src/main/res/values-ka/02-strings.xml b/AnkiDroid/src/main/res/values-ka/02-strings.xml
index 03d405cd5529..73ceaacafdaf 100644
--- a/AnkiDroid/src/main/res/values-ka/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ka/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">სურათი ზედმეტად დიდია. გთხოვთ, სურათი ხელით ჩაამატოთ</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        მიმდინარეობს Android-ის სარეზერვო ასლის შექმნა. გთხოვთ, ხელახლა სცადოთ</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">შესაძლოა iManager-ის გამოყენება დაგჭირდეთ, რათა AnkiDroid-ით სწრაფი ბმულის დამატება შეძლოთ</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">თქვენი საწყისი ეკრანი არ აძლევს AnkiDroid-ს სწრაფი ბმულის დამატების უფლებას</string>
     <string name="create_shortcut_error">შეცდომა სწრაფი ბმულის დამატებისას: %s</string>
@@ -305,19 +305,14 @@
     <string name="browser_options_dialog_heading">ბარათების საძიებოს პარამეტრები</string>
     <string name="audio_saved">ჩანაწერი შენახულია</string>
     <string name="deleting_selected_notes">მონიშნული შენიშვნების წაშლა</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        მოსასმენად შეეხეთ ხმას
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">უმჯობესია, ხმა გამოყენებამდე გადმოიწეროთ
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">მაინც გამოყენება</string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">ხმოვანი წამკითხველის შეცდომა (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        ინტერნეტი
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        დაყენება
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        ხმოვანი წამკითხველის პარამეტრები ვერ გაიხსნა
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">მეტი დასტის გადმოსაწერად, გთხოვთ, გაიაროთ ავტორიზაცია</string>
     <string name="deck_description_field_hint">აღწერა</string>
     <string name="failed_to_copy">კოპირება ვერ მოხერხდა</string>
diff --git a/AnkiDroid/src/main/res/values-ka/03-dialogs.xml b/AnkiDroid/src/main/res/values-ka/03-dialogs.xml
index efd2c32584f6..e5b9f258b5b9 100644
--- a/AnkiDroid/src/main/res/values-ka/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ka/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">მონაცემთა ბაზის შეცდომა</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">შეცდომის შეტყობინება</string>
-    <string name="storage_full_message">არ არის საკმარისი თავისუფალი მეხსიერების სივრცე, რომ AnkiDroid-ის გახსნა მოხერხდეს. გთხოვთ, მეხსიერების სივრცეში ადგილი გაანთავისუფლოთ.</string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">ნამდვილად გსურთ, სცადოთ მონაცემთა ბაზის შეკეთება?\n\nმცდელობის დაწყებამდე შეიქმნება ასლი ქვესაქაღალდეში: „%s“.</string>
     <string name="intent_aedict_empty">კატეგორია „ნაგულისხმევი“ ცარიელია</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">მოგვიანებით</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">აღარ მაჩვენო</string>
     <string name="dismiss_backup_warning_title">მონაცემთა დაკარგვის გაფრთხილება</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">დასტა უკვე არსებობს</string>
     <string name="empty_deck_name">დასტის სახელი არ შეიძლება იყოს ცარიელი</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-ka/10-preferences.xml b/AnkiDroid/src/main/res/values-ka/10-preferences.xml
index 0987fb3f8a16..5905109b8d0b 100644
--- a/AnkiDroid/src/main/res/values-ka/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ka/10-preferences.xml
@@ -296,8 +296,7 @@
     <string name="pref_cat_dev_options" maxLength="41">დეველოპერის პარამეტრები</string>
     <string name="dev_options_enabled_pref" maxLength="41">დეველოპერის პარამეტრების ჩართვა</string>
     <string name="disable_dev_options">დეველოპერის პარამეტრების გამორთვა</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-ka/17-model-manager.xml b/AnkiDroid/src/main/res/values-ka/17-model-manager.xml
index 196079ef0202..3feb994bd55c 100644
--- a/AnkiDroid/src/main/res/values-ka/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ka/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">ნამდვილად გსურთ ამ შენიშვნის ტიპის წაშლა?</string>
     <string name="field_delete_warning">ნამდვილად გსურთ ამ ველის წაშლა?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">დამატება: %1$s</string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">კლონი: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">შეიყვანეთ შაბლონი, რომელსაც ბარათების საძიებო პასუხების შემოკლებული ვერსიების საჩვენებლად გამოიყენებს.\n\n\"{{ქვეყანა}}-ს დედაქალაქი არის:\"\nრომ ავიღოთ მაგალითად, მისი შიგთავსი შეიძლება წინა შაბლონით შემოკლდეს როგორც\n\"დედაქალაქი: {{ქვეყანა}}\"</string>
     <string name="card_template_browser_appearance_question_format">კითხვის ფორმატი</string>
diff --git a/AnkiDroid/src/main/res/values-kk/02-strings.xml b/AnkiDroid/src/main/res/values-kk/02-strings.xml
index d3c686c3bb2f..c2a6fe35b154 100644
--- a/AnkiDroid/src/main/res/values-kk/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-kk/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-kk/03-dialogs.xml b/AnkiDroid/src/main/res/values-kk/03-dialogs.xml
index 4c7e5145537a..61889054ad3c 100644
--- a/AnkiDroid/src/main/res/values-kk/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-kk/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Database error</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Report error</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-kk/10-preferences.xml b/AnkiDroid/src/main/res/values-kk/10-preferences.xml
index 29e92629b16c..2afb72668806 100644
--- a/AnkiDroid/src/main/res/values-kk/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-kk/10-preferences.xml
@@ -297,8 +297,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-kk/17-model-manager.xml b/AnkiDroid/src/main/res/values-kk/17-model-manager.xml
index 6b89a122d404..eff2650b23bb 100644
--- a/AnkiDroid/src/main/res/values-kk/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-kk/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Are you sure you wish to delete this field?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>
diff --git a/AnkiDroid/src/main/res/values-km/02-strings.xml b/AnkiDroid/src/main/res/values-km/02-strings.xml
index 20586fe7adbf..1efb4edd7665 100644
--- a/AnkiDroid/src/main/res/values-km/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-km/02-strings.xml
@@ -229,7 +229,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -300,16 +300,14 @@
     <string name="browser_options_dialog_heading">ជម្រើសក្នុងការរុករក</string>
     <string name="audio_saved">ការថតទុកត្រូវបានរក្សាទុក</string>
     <string name="deleting_selected_notes">លុបកំណត់ត្រាដែលបានរើស</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">សំឡេងគួរតែត្រូវបានដំឡើងមុនពេលប្រើ</string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">នៅតែប្រើ</string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">អ៊ីនធឺណិត</string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">ដំឡើង</string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">សូមចុះឈ្មោះចូលដើម្បីទាញយកជាន់ច្រើនទៀត</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">បរាជ័យក្នុងការចម្លង</string>
diff --git a/AnkiDroid/src/main/res/values-km/03-dialogs.xml b/AnkiDroid/src/main/res/values-km/03-dialogs.xml
index 94f28d1f119a..6a129bf68e6a 100644
--- a/AnkiDroid/src/main/res/values-km/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-km/03-dialogs.xml
@@ -62,7 +62,7 @@
     <string name="answering_error_title">Database error</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">រាយការណ៍កំហុស</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
@@ -208,10 +208,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-km/10-preferences.xml b/AnkiDroid/src/main/res/values-km/10-preferences.xml
index d0dd398e541e..7580650b7d07 100644
--- a/AnkiDroid/src/main/res/values-km/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-km/10-preferences.xml
@@ -295,8 +295,7 @@
     <string name="pref_cat_dev_options" maxLength="41">ជម្រើសអ្នកអភិវឌ្ឍ</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-km/17-model-manager.xml b/AnkiDroid/src/main/res/values-km/17-model-manager.xml
index 5fa571a5e4a9..c92fe77e4302 100644
--- a/AnkiDroid/src/main/res/values-km/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-km/17-model-manager.xml
@@ -62,9 +62,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Are you sure you wish to delete this field?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>
diff --git a/AnkiDroid/src/main/res/values-kn/02-strings.xml b/AnkiDroid/src/main/res/values-kn/02-strings.xml
index 2ae278f8d1c4..427e1ccc5496 100644
--- a/AnkiDroid/src/main/res/values-kn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-kn/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android ಬ್ಯಾಕಪ್ ಪ್ರಗತಿಯಲ್ಲಿದೆ. ದಯವಿಟ್ಟು ಪುನಃ ಪ್ರಯತ್ನಿಸಿ</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">ಶಾರ್ಟ್‌ಕಟ್‌ಗಳನ್ನು ಸೇರಿಸಲು AnkiDroid ಅನ್ನು ಅನುಮತಿಸಲು ನೀವು iManager ಅನ್ನು ಬಳಸಬೇಕಾಗಬಹುದು</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">ಶಾರ್ಟ್‌ಕಟ್‌ಗಳನ್ನು ಸೇರಿಸಲು ನಿಮ್ಮ ಮುಖಪುಟವು ಆಂಕಿಡ್ರಾಯ್ಡ್‌ಗೆ ಅನುಮತಿಸುವುದಿಲ್ಲ</string>
     <string name="create_shortcut_error">ಶಾರ್ಟ್‌ಕಟ್ ಸೇರಿಸುವಲ್ಲಿ ದೋಷ:%s</string>
@@ -305,14 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">ರೆಕಾರ್ಡಿಂಗ್ ಅನ್ನು ಉಳಿಸಲಾಗಿದೆ</string>
     <string name="deleting_selected_notes">ಆಯ್ದ ಟಿಪ್ಪಣಿಗಳನ್ನು ಅಳಿಸಲಾಗುತ್ತಿದೆ</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">ಕೇಳಲು ಧ್ವನಿಯನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ</string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">ಬಳಕೆಗೆ ಮೊದಲು ಧ್ವನಿಯನ್ನು ಅಳವಡಿಸಬೇಕು</string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">ಹೇಗಾದರೂ ಬಳಸಿ</string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">ಪಠ್ಯದಿಂದ ಭಾಷಣ ದೋಷ (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">ಇಂಟರ್ನೆಟ್</string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">ಸ್ಥಾಪಿಸಿ</string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">ಧ್ವನಿ ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ಪಠ್ಯವನ್ನು ತೆರೆಯಲು ವಿಫಲವಾಗಿದೆ</string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">ಹೆಚ್ಚಿನ ಡೆಕ್‌ಗಳನ್ನು ಡೌನ್‌ಲೋಡ್ ಮಾಡಲು ದಯವಿಟ್ಟು ಲಾಗ್ ಇನ್ ಮಾಡಿ</string>
     <string name="deck_description_field_hint">ವಿವರಣೆ</string>
     <string name="failed_to_copy">ನಕಲಿಸಲು ವಿಫಲವಾಗಿದೆ</string>
diff --git a/AnkiDroid/src/main/res/values-kn/03-dialogs.xml b/AnkiDroid/src/main/res/values-kn/03-dialogs.xml
index 8525a75a65de..a7f568e31906 100644
--- a/AnkiDroid/src/main/res/values-kn/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-kn/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">ಡೇಟಾಬೇಸ್ ದೋಷ</string>
     <string name="answering_error_message">ಸಂಗ್ರಹಣೆಗೆ ಬರೆಯುವುದು ವಿಫಲವಾಗಿದೆ. ಡೇಟಾಬೇಸ್ ದೋಷಪೂರಿತವಾಗಿರಬಹುದು ಅಥವಾ ಡಿಸ್ಕ್‌ನಲ್ಲಿ ಸಾಕಷ್ಟು ಖಾಲಿ ಜಾಗವಿಲ್ಲದಿರಬಹುದು.\n\nಇದು ಹೆಚ್ಚಾಗಿ ಸಂಭವಿಸಿದರೆ, ಡೇಟಾಬೇಸ್ ಅನ್ನು ಪರಿಶೀಲಿಸಲು ಪ್ರಯತ್ನಿಸಿ, ಸಂಗ್ರಹಣೆಯನ್ನು ಸರಿಪಡಿಸಲು ಅಥವಾ ಬ್ಯಾಕಪ್‌ನಿಂದ ಅದನ್ನು ಮರುಸ್ಥಾಪಿಸಲು. ಅದಕ್ಕಾಗಿ \"ಆಯ್ಕೆಗಳನ್ನು\" ಸ್ಪರ್ಶಿಸಿ.\n\ಅಥವಾ ಇದು AnkiDroid ದೋಷವೂ ಆಗಿರಬಹುದು; ದಯವಿಟ್ಟು ದೋಷವನ್ನು ವರದಿ ಮಾಡಿ ಇದರಿಂದ ನಾವು ಇದನ್ನು ಪರಿಶೀಲಿಸಬಹುದು.</string>
     <string name="answering_error_report">ದೋಷವನ್ನು ವರದಿ ಮಾಡಿ</string>
-    <string name="storage_full_message">AnkiDroid ತೆರೆಯಲು ಸಾಕಷ್ಟು ಉಚಿತ ಸಂಗ್ರಹಣೆ ಸ್ಥಳವಿಲ್ಲ. ಮುಂದುವರಿಯಲು ಸ್ವಲ್ಪ ಜಾಗವನ್ನು ಮುಕ್ತಗೊಳಿಸಿ.</string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">ಡೇಟಾಬೇಸ್ ಅನ್ನು ಸರಿಪಡಿಸಲು ನೀವು ಖಚಿತವಾಗಿ ಬಯಸುವಿರಾ?\n\nಪ್ರಯತ್ನವನ್ನು ಪ್ರಾರಂಭಿಸುವ ಮೊದಲು, \"%s\" ಉಪಫೋಲ್ಡರ್‌ನಲ್ಲಿ ನಕಲನ್ನು ರಚಿಸಲಾಗುತ್ತದೆ.</string>
     <string name="intent_aedict_empty">\"ಡೀಫಾಲ್ಟ್\" ವರ್ಗ ಖಾಲಿಯಾಗಿದೆ</string>
     <string name="intent_aedict_category">ಎಲ್ಲಾ ನೋಟ್‌ಪ್ಯಾಡ್ ವಿಭಾಗಗಳನ್ನು ತೆಗೆದುಹಾಕಿ ಅಥವಾ AnkiDroid ಗೆ ಕಾರ್ಡ್‌ಗಳನ್ನು ಸೇರಿಸಲು \"ಡೀಫಾಲ್ಟ್\" ಹೆಸರಿನ ಒಂದನ್ನು ಸೇರಿಸಿ</string>
@@ -212,8 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">ನಂತರ</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">ಅದನ್ನು ಮತ್ತೆ ತೋರಿಸಬೇಡ</string>
     <string name="dismiss_backup_warning_title">ಡೇಟಾ ನಷ್ಟದ ಎಚ್ಚರಿಕೆ</string>
-    <string name="dismiss_backup_warning_new_user">Android ಗೌಪ್ಯತೆ ಬದಲಾವಣೆಗಳಿಂದಾಗಿ, ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ಅನ್‌ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಿದರೆ ನಿಮ್ಮ ಡೇಟಾ ಮತ್ತು ಸ್ವಯಂಚಾಲಿತ ಬ್ಯಾಕಪ್‌ಗಳನ್ನು ನಿಮ್ಮ ಫೋನ್‌ನಿಂದ ಅಳಿಸಲಾಗುತ್ತದೆ</string>
-    <string name="dismiss_backup_warning_upgrade">Android ಗೌಪ್ಯತೆ ಬದಲಾವಣೆಗಳಿಂದಾಗಿ, ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ಅನ್‌ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡುವುದರಿಂದ ನಿಮ್ಮ ಡೇಟಾ ಮತ್ತು ಸ್ವಯಂಚಾಲಿತ ಬ್ಯಾಕಪ್‌ಗಳನ್ನು ಪ್ರವೇಶಿಸಲಾಗುವುದಿಲ್ಲ</string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">ಡೆಕ್ ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">ನೀವು ಡೆಕ್ ಆರ್ಡರ್ ಮಾಡುವ ಸಮಸ್ಯೆಗಳನ್ನು ಹೊಂದಿದ್ದರೆ (ಉದಾ \'10\' \'2\' ಮೊದಲು ಕಾಣಿಸಿಕೊಳ್ಳುತ್ತದೆ), \'2\' ಅನ್ನು \'02\' ನೊಂದಿಗೆ ಬದಲಾಯಿಸಿ</string>
diff --git a/AnkiDroid/src/main/res/values-kn/10-preferences.xml b/AnkiDroid/src/main/res/values-kn/10-preferences.xml
index 2d0acc79492a..05319dc037be 100644
--- a/AnkiDroid/src/main/res/values-kn/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-kn/10-preferences.xml
@@ -295,7 +295,7 @@
     <string name="pref_cat_dev_options" maxLength="41">ಅಭಿವೃಧಿಕಾರರ ಸೂಚನೆಗಳು</string>
     <string name="dev_options_enabled_pref" maxLength="41">ಡೆವಲಪರ್ ಆಯ್ಕೆಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ</string>
     <string name="disable_dev_options">ಡೆವಲಪರ್ ಆಯ್ಕೆಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ</string>
-    <string name="dev_options_warning">ಡೆವಲಪರ್ ಆಯ್ಕೆಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುವ ಮೊದಲು ದಯವಿಟ್ಟು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ. ಈ ಆಯ್ಕೆಗಳು ಅಪಾಯಕಾರಿ ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ಒಡೆಯಬಹುದು ಅಥವಾ ನಿಮ್ಮ ಸಂಗ್ರಹಣೆಯನ್ನು ಭ್ರಷ್ಟಗೊಳಿಸಬಹುದು.\n\nಈ ಆಯ್ಕೆಗಳು ಹೆಚ್ಚಿನ ಬಳಕೆದಾರರಿಗೆ ಸೂಕ್ತವಲ್ಲ ಮತ್ತು ಆದ್ದರಿಂದ ಅನುವಾದಿಸಲಾಗಿಲ್ಲ, ಆದ್ದರಿಂದ ಅವು ಇಂಗ್ಲಿಷ್‌ನಲ್ಲಿವೆ.</string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-kn/17-model-manager.xml b/AnkiDroid/src/main/res/values-kn/17-model-manager.xml
index 935c8d668556..0caec807a8c8 100644
--- a/AnkiDroid/src/main/res/values-kn/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-kn/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">ಈ ಟಿಪ್ಪಣಿ ಪ್ರಕಾರವನ್ನು ಅಳಿಸಲು ನೀವು ಖಚಿತವಾಗಿ ಬಯಸುವಿರಾ?</string>
     <string name="field_delete_warning">ಈ ಕ್ಷೇತ್ರವನ್ನು ಅಳಿಸಲು ನೀವು ಖಚಿತವಾಗಿ ಬಯಸುವಿರಾ?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">ಸೇರಿಸಿ: %1$s</string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">ಕ್ಲೋನ್: %1$s</string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">ನಿಮ್ಮ ಕಾರ್ಡ್‌ಗಳನ್ನು ಪ್ರದರ್ಶಿಸಲು ಕಾರ್ಡ್ ಬ್ರೌಸರ್ ಬಳಸುವ ಟೆಂಪ್ಲೇಟ್ ಅನ್ನು ನಮೂದಿಸಿ. ಹೆಚ್ಚು ಸಂಕ್ಷಿಪ್ತ ಉತ್ತರವನ್ನು ಪ್ರದರ್ಶಿಸಲು ಇದನ್ನು ಬಳಸಿ.\n\n\n“{{Country}} Capital:”\nನ ಮುಂಭಾಗದ ಟೆಂಪ್ಲೇಟ್ ಅನ್ನು \n“ಕ್ಯಾಪಿಟಲ್: {{Country}}” ಗೆ ಕಾರ್ಡ್ ಬ್ರೌಸರ್‌ನಲ್ಲಿ ಸಂಕುಚಿತಗೊಳಿಸಬಹುದು.</string>
     <string name="card_template_browser_appearance_question_format">ಪ್ರಶ್ನೆ ಸ್ವರೂಪ</string>
diff --git a/AnkiDroid/src/main/res/values-ko/02-strings.xml b/AnkiDroid/src/main/res/values-ko/02-strings.xml
index 714a277b980a..c9a325bae0e8 100644
--- a/AnkiDroid/src/main/res/values-ko/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ko/02-strings.xml
@@ -232,7 +232,7 @@ Context | Request Context    [1]</string>
     <string name="note_editor_image_too_large">이미지가 너무 큽니다. 수동으로 넣어 주세요.</string>
     <string name="note_editor_video_too_large">영상 파일이 너무 큽니다. 수동으로 넣어 주세요.</string>
     <string name="note_editor_audio_too_large">오디오 파일이 너무 큽니다. 수동으로 넣어 주세요.</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android 백업이 작동 중입니다. 다시 시도하십시오.</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">AnkiDroid 바로가기를 추가하려면 iManager가 필요할 수 있습니다.</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">홈 화면에 AnkiDroid 바로 가기를 추가할 수 없습니다.</string>
     <string name="create_shortcut_error">바로가기 생성 오류: %s</string>
@@ -303,20 +303,14 @@ Context | Request Context    [1]</string>
     <string name="browser_options_dialog_heading">브라우저 옵션</string>
     <string name="audio_saved">녹음 파일 저장됨</string>
     <string name="deleting_selected_notes">선택한 메모 삭제 중</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        음성을 들으려면 탭하세요
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">사용 전 음성을 설치해 주세요
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">그냥 사용하기
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">문장 읽어주기 오류 (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        인터넷
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        설치
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        문장 읽어주기 설정 열기 실패
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">카드 덱을 더 다운로드하려면 로그인해 주세요</string>
     <string name="deck_description_field_hint">설명</string>
     <string name="failed_to_copy">복사 실패</string>
diff --git a/AnkiDroid/src/main/res/values-ko/03-dialogs.xml b/AnkiDroid/src/main/res/values-ko/03-dialogs.xml
index bc5c6638a51f..d4099b47b2fe 100644
--- a/AnkiDroid/src/main/res/values-ko/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ko/03-dialogs.xml
@@ -62,7 +62,7 @@
     <string name="answering_error_title">데이터베이스 오류</string>
     <string name="answering_error_message">컬렉션에 쓰는 것을 실패했습니다. 데이터베이스가 손상되었거나 디스크에 충분한 여유 공간이 없을 수 있습니다.\n\n이 문제가 자주 발생하면 데이터베이스를 점검하거나 컬렉션을 복구하거나 설정에서 백업 파일을 복원해 보세요. \n\n또는 AnkiDroid 버그일 수 있으니, 오류를 보고해 주시면 확인해 보겠습니다.</string>
     <string name="answering_error_report">오류 보고하기</string>
-    <string name="storage_full_message">AnkiDroid를 열 저장 공간이 부족합니다. 계속하려면 여유 공간을 확보하세요.</string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">데이터베이스를 복구하시겠습니까?\n\n 복구를 시작하기 전에 지정된 하위폴더에 복사본 파일이 저장됩니다\'%s\'.</string>
     <string name="intent_aedict_empty">\'기본값\' 카테고리가 비어 있습니다</string>
     <string name="intent_aedict_category">AnkiDroid에 카드를 추가하기 위해 모든 메모장 범주 삭제 또는 \'기본값\'으로 지정하기</string>
@@ -208,10 +208,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">나중에</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">다시 보지 않기</string>
     <string name="dismiss_backup_warning_title">데이터 손실 경고</string>
-    <string name="dismiss_backup_warning_new_user">        안드로이드 개인정보 보호 정책 변경으로 인해 앱을 제거하면 기기에서 데이터와 자동 백업이 삭제됩니다.
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        안드로이드 개인정보 보호 정책 변경으로 인해 앱을 제거하면 데이터 및 자동 백업에 액세스할 수 없게 됩니다.
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">덱이 이미 존재합니다</string>
     <string name="empty_deck_name">덱 이름은 공백일 수 없습니다</string>
     <string name="create_deck_numeric_hint">덱 정렬에 문제가 있다면 (\'10\'이 \'2\' 앞에 올 때) \'2\'를 \'02\'로 교체하세요</string>
diff --git a/AnkiDroid/src/main/res/values-ko/10-preferences.xml b/AnkiDroid/src/main/res/values-ko/10-preferences.xml
index 63f5cc01eb1e..e08e9886466f 100644
--- a/AnkiDroid/src/main/res/values-ko/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ko/10-preferences.xml
@@ -293,7 +293,7 @@
     <string name="pref_cat_dev_options" maxLength="41">개발자 옵션</string>
     <string name="dev_options_enabled_pref" maxLength="41">개발자 옵션 활성화하기</string>
     <string name="disable_dev_options">개발자 옵션 비활성화하기</string>
-    <string name="dev_options_warning">개발자 옵션을 켜기 전에 유의할 점이 있습니다. 이 옵션들은 앱을 고장내거나 카드 모음을 이상하게 만들 위험성이 있습니다. 이 옵션들은 대부분의 유저에게는 사용할 필요가 없기 때문에 영어인 채로 번역되지 않았습니다.</string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-ko/17-model-manager.xml b/AnkiDroid/src/main/res/values-ko/17-model-manager.xml
index 835e4c217edb..946a10eedd38 100644
--- a/AnkiDroid/src/main/res/values-ko/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ko/17-model-manager.xml
@@ -31,7 +31,7 @@
     <!--Toasts-->
     <string name="toast_last_model">마지막 노트 유형은 삭제 할 수 없습니다.</string>
     <string name="toast_last_field">노트 유형에는 최소한 하나의 필드가 필요합니다.</string>
-    <string name="toast_empty_name">이름을 입력하셔야 합니다.</string>
+    <string name="toast_empty_name">이름을 입력해야 합니다</string>
     <string name="toast_duplicate_field">필드 이름이 이미 사용 중 입니다.</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
@@ -62,9 +62,9 @@
     <string name="model_delete_warning">이 노트 유형을 삭제하시겠습니까?</string>
     <string name="field_delete_warning">이 필드를 삭제하시겠습니까?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">추가: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">클론: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">문제 형식</string>
@@ -74,8 +74,8 @@
     <!-- Deck Override -->
     <string name="card_template_editor_deck_override_on">덱 덮어쓰기 on</string>
     <string name="card_template_editor_deck_override_off">덱 덮어쓰기 off</string>
-    <string name="model_manager_deck_override_added_message">Set ‘%1$s’ default deck to ‘%2$s’</string>
-    <string name="model_manager_deck_override_removed_message">Removed default deck for ‘%s’</string>
+    <string name="model_manager_deck_override_added_message">‘%1$s’을 ‘%2$s’의 기본 덱으로 설정</string>
+    <string name="model_manager_deck_override_removed_message">\'%s\'에서 기본 덱 삭제</string>
     <string name="deck_override_explanation">새 \'%s\' 카드가 들어갈 덱 선택하기</string>
-    <string name="deck_picker_dialog_filter_decks" maxLength="28">Filter decks</string>
+    <string name="deck_picker_dialog_filter_decks" maxLength="28">필터 덱</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ku/02-strings.xml b/AnkiDroid/src/main/res/values-ku/02-strings.xml
index 6914736c4005..2dbbc450b133 100644
--- a/AnkiDroid/src/main/res/values-ku/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ku/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-ku/03-dialogs.xml b/AnkiDroid/src/main/res/values-ku/03-dialogs.xml
index d99b9cb1805c..5b0841bd8f48 100644
--- a/AnkiDroid/src/main/res/values-ku/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ku/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Çewtiya danegehê</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Report error</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-ku/10-preferences.xml b/AnkiDroid/src/main/res/values-ku/10-preferences.xml
index 76fb669b6a37..1a12afc3c31c 100644
--- a/AnkiDroid/src/main/res/values-ku/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ku/10-preferences.xml
@@ -297,8 +297,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-ku/17-model-manager.xml b/AnkiDroid/src/main/res/values-ku/17-model-manager.xml
index 6b89a122d404..eff2650b23bb 100644
--- a/AnkiDroid/src/main/res/values-ku/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ku/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Are you sure you wish to delete this field?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>
diff --git a/AnkiDroid/src/main/res/values-ky/02-strings.xml b/AnkiDroid/src/main/res/values-ky/02-strings.xml
index d3c686c3bb2f..c2a6fe35b154 100644
--- a/AnkiDroid/src/main/res/values-ky/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ky/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-ky/03-dialogs.xml b/AnkiDroid/src/main/res/values-ky/03-dialogs.xml
index e9fdcb377dee..61b53dc171e5 100644
--- a/AnkiDroid/src/main/res/values-ky/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ky/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Database error</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Report error</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-ky/10-preferences.xml b/AnkiDroid/src/main/res/values-ky/10-preferences.xml
index 29e92629b16c..2afb72668806 100644
--- a/AnkiDroid/src/main/res/values-ky/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ky/10-preferences.xml
@@ -297,8 +297,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-ky/17-model-manager.xml b/AnkiDroid/src/main/res/values-ky/17-model-manager.xml
index 6b89a122d404..eff2650b23bb 100644
--- a/AnkiDroid/src/main/res/values-ky/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ky/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Are you sure you wish to delete this field?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>
diff --git a/AnkiDroid/src/main/res/values-lt/02-strings.xml b/AnkiDroid/src/main/res/values-lt/02-strings.xml
index 6aeac886b899..ddbca877d423 100644
--- a/AnkiDroid/src/main/res/values-lt/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-lt/02-strings.xml
@@ -241,7 +241,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -315,20 +315,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-lt/03-dialogs.xml b/AnkiDroid/src/main/res/values-lt/03-dialogs.xml
index 30cca55c2459..9d2e3ecb72d6 100644
--- a/AnkiDroid/src/main/res/values-lt/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-lt/03-dialogs.xml
@@ -68,7 +68,7 @@
     <string name="answering_error_title">Duomenų bazės klaida</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Pranešti apie klaidą</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Ar tikrai norite taisyti duomenų bazę?\n\nPrieš tai atliekant, poaplankyje „%s“ bus sukurta kopija.</string>
     <string name="intent_aedict_empty">Kategorija „numatytieji“ yra tuščia</string>
     <string name="intent_aedict_category">Norėdami „AnkiDroid“ programoje pridėti kortelių, pašalinkite visas „Notepad“ kategorijas arba pridėkite vieną, kuri vadintųsi „numatytoji“</string>
@@ -220,10 +220,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-lt/10-preferences.xml b/AnkiDroid/src/main/res/values-lt/10-preferences.xml
index bbd1abf46e9d..da51a0dcd14a 100644
--- a/AnkiDroid/src/main/res/values-lt/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-lt/10-preferences.xml
@@ -301,8 +301,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-lt/17-model-manager.xml b/AnkiDroid/src/main/res/values-lt/17-model-manager.xml
index 3c28a543476a..02444c5b74c1 100644
--- a/AnkiDroid/src/main/res/values-lt/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-lt/17-model-manager.xml
@@ -68,9 +68,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Ar tikrai norite ištrinti šį laukelį?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Pridėti: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Dubliuoti: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Klausimo formatas</string>
diff --git a/AnkiDroid/src/main/res/values-lv/02-strings.xml b/AnkiDroid/src/main/res/values-lv/02-strings.xml
index 81183e2c2b10..1411b824e4a9 100644
--- a/AnkiDroid/src/main/res/values-lv/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-lv/02-strings.xml
@@ -237,7 +237,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -310,20 +310,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-lv/03-dialogs.xml b/AnkiDroid/src/main/res/values-lv/03-dialogs.xml
index 0f24aa30ad6a..1c4607d23a67 100644
--- a/AnkiDroid/src/main/res/values-lv/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-lv/03-dialogs.xml
@@ -66,7 +66,7 @@
     <string name="answering_error_title">Database error</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Report error</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
@@ -216,10 +216,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-lv/10-preferences.xml b/AnkiDroid/src/main/res/values-lv/10-preferences.xml
index af545fb15c92..7e32dc0495df 100644
--- a/AnkiDroid/src/main/res/values-lv/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-lv/10-preferences.xml
@@ -299,8 +299,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-lv/17-model-manager.xml b/AnkiDroid/src/main/res/values-lv/17-model-manager.xml
index 0d282d0d0d5f..d61c99503a5d 100644
--- a/AnkiDroid/src/main/res/values-lv/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-lv/17-model-manager.xml
@@ -66,9 +66,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Are you sure you wish to delete this field?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>
diff --git a/AnkiDroid/src/main/res/values-mk/02-strings.xml b/AnkiDroid/src/main/res/values-mk/02-strings.xml
index f3403fbce26b..c7a86c6cd020 100644
--- a/AnkiDroid/src/main/res/values-mk/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-mk/02-strings.xml
@@ -234,7 +234,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -306,20 +306,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-mk/03-dialogs.xml b/AnkiDroid/src/main/res/values-mk/03-dialogs.xml
index 199572732287..f046fbd05bcc 100644
--- a/AnkiDroid/src/main/res/values-mk/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-mk/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Грешка во базата на податоци</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Пријавете грешка</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Дали навистина сакате да се обидете да ја поправите базата на податоци?\n\nПред да го започнете обидот, копијата ќе биде креирана во подпапката \"%s\".</string>
     <string name="intent_aedict_empty">Категоријата \"default\" е празна</string>
     <string name="intent_aedict_category">За да додадете картички на AnkiDroid, отстранете ги сите обележени категории или додадете еден по име \"default\"</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-mk/10-preferences.xml b/AnkiDroid/src/main/res/values-mk/10-preferences.xml
index 27df657854a1..36d535304d51 100644
--- a/AnkiDroid/src/main/res/values-mk/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-mk/10-preferences.xml
@@ -297,8 +297,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-mk/17-model-manager.xml b/AnkiDroid/src/main/res/values-mk/17-model-manager.xml
index 433093302695..45c017f4af5d 100644
--- a/AnkiDroid/src/main/res/values-mk/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-mk/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Дали сте сигурни дека сакате да го избришете ова поле?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>
diff --git a/AnkiDroid/src/main/res/values-ml/02-strings.xml b/AnkiDroid/src/main/res/values-ml/02-strings.xml
index da98f33c2ed4..760926d4599c 100644
--- a/AnkiDroid/src/main/res/values-ml/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ml/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">ചിത്രം വളരെ വലുതാണ്, ചിത്രം നേരിട്ട് ചേർക്കുക</string>
     <string name="note_editor_video_too_large">വീഡിയോ ഫയൽ വളരെ വലുതാണ്, വീഡിയോ നേരിട്ട് ചേർക്കുക</string>
     <string name="note_editor_audio_too_large">ഓഡിയോ ഫയൽ വളരെ വലുതാണ്, ഓഡിയോ നേരിട്ട് ചേർക്കുക</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">കുറുക്കുവഴികൾ ചേർക്കാൻ AnkiDroid-നെ അനുവദിക്കുന്നതിന് നിങ്ങൾ iManager ഉപയോഗിക്കേണ്ടി വന്നേക്കാം</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">കുറുക്കുവഴികൾ ചേർക്കാൻ നിങ്ങളുടെ ഹോം സ്‌ക്രീൻ AnkiDroid-നെ അനുവദിക്കുന്നില്ല</string>
     <string name="create_shortcut_error">കുറുക്കുവഴി ചേർക്കുന്നതിൽ പിശക്: %s</string>
@@ -305,14 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">കേൾക്കാൻ ഒരു ശബ്ദം ടാപ്പ് ചെയ്യുക</string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">ഉപയോഗിക്കുന്നതിന് മുമ്പ് വോയ്സ് ഇൻസ്റ്റാൾ ചെയ്യണം</string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">എന്തായാലും ഉപയോഗിക്കുക</string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">ടെക്സ്റ്റ് ടു സ്പീച്ച് പിശക് (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">ഇൻ്റർനെറ്റ്</string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">ഇൻസ്റ്റാൾ ചെയ്യുക</string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">ടെക്‌സ്‌റ്റ് ടു സ്‌പീച്ച് ക്രമീകരണം തുറക്കുന്നതിൽ പരാജയപ്പെട്ടു</string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">കൂടുതൽ ഡെക്കുകൾ ഡൗൺലോഡ് ചെയ്യാൻ ലോഗിൻ ചെയ്യുക</string>
     <string name="deck_description_field_hint">വിവരണം</string>
     <string name="failed_to_copy">പകർത്തുന്നതിൽ പരാജയപ്പെട്ടു</string>
diff --git a/AnkiDroid/src/main/res/values-ml/03-dialogs.xml b/AnkiDroid/src/main/res/values-ml/03-dialogs.xml
index cde3c6bfb91f..2da850ec18a8 100644
--- a/AnkiDroid/src/main/res/values-ml/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ml/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">ഡാറ്റാബേസ് പിശക്</string>
     <string name="answering_error_message">ശേഖരത്തിലേക്ക് എഴുതുന്നത് പരാജയപ്പെട്ടു. ഡാറ്റാബേസ് കേടായതാകാം അല്ലെങ്കിൽ ഡിസ്കിൽ വേണ്ടത്ര ശൂന്യമായ ഇടം ഉണ്ടാകണമെന്നില്ല. \n\n ഇത് പലപ്പോഴും സംഭവിക്കുകയാണെങ്കിൽ, ഡാറ്റാബേസ് പരിശോധിക്കാനോ ശേഖരം നന്നാക്കാനോ ബാക്കപ്പിൽ നിന്ന് പുന സ്ഥാപിക്കാനോ ശ്രമിക്കുക. അതിനായി “ഓപ്ഷനുകൾ” സ്‌പർശിക്കുക. \n\ അല്ലെങ്കിൽ ഇത് ഒരു അങ്കിഡ്രോയിഡ് ബഗ് ആകാം; പിശക് റിപ്പോർട്ടുചെയ്യുക, അതുവഴി ഞങ്ങൾക്ക് ഇത് പരിശോധിക്കാൻ കഴിയും.</string>
     <string name="answering_error_report">റിപ്പോർട്ട് പിശക്</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">ഡാറ്റാബേസ് നന്നാക്കാൻ നിങ്ങൾ ശരിക്കും ആഗ്രഹിക്കുന്നുണ്ടോ? \n\n ശ്രമം ആരംഭിക്കുന്നതിന് മുമ്പ്, “%s” എന്ന സബ്ഫോൾഡറിൽ ഒരു പകർപ്പ് സൃഷ്ടിക്കപ്പെടും.</string>
     <string name="intent_aedict_empty">വിഭാഗം “സ്ഥിരസ്ഥിതി” ശൂന്യമാണ്</string>
     <string name="intent_aedict_category">AnkiDroid- ലേക്ക് കാർഡുകൾ ചേർക്കുന്നതിന് എല്ലാ നോട്ട്പാഡ് വിഭാഗങ്ങളും നീക്കംചെയ്യുക അല്ലെങ്കിൽ “സ്ഥിരസ്ഥിതി” എന്ന് പേരുള്ള ഒന്ന് ചേർക്കുക</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">പിന്നീട്</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">വീണ്ടും കാണിക്കരുത്</string>
     <string name="dismiss_backup_warning_title">ഡാറ്റ നഷ്ടം മുന്നറിയിപ്പ്</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">ഡെക്ക് ഇതിനകം നിലവിലുണ്ട്</string>
     <string name="empty_deck_name">ഡെക്കിൻ്റെ പേര് ശൂന്യമാക്കാൻ കഴിയില്ല</string>
     <string name="create_deck_numeric_hint">നിങ്ങൾക്ക് ഡെക്ക് ഓർഡർ ചെയ്യുന്നതിൽ പ്രശ്‌നങ്ങളുണ്ടെങ്കിൽ (ഉദാ. \'10\' \'2\' ന് മുമ്പ് ദൃശ്യമാകുന്നു), \'2\' മാറ്റി \'02\'</string>
diff --git a/AnkiDroid/src/main/res/values-ml/10-preferences.xml b/AnkiDroid/src/main/res/values-ml/10-preferences.xml
index bf34084e55b6..ee9b1eb61620 100644
--- a/AnkiDroid/src/main/res/values-ml/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ml/10-preferences.xml
@@ -296,8 +296,7 @@
     <string name="pref_cat_dev_options" maxLength="41">ഡെവലപ്പർ ഓപ്ഷനുകൾ</string>
     <string name="dev_options_enabled_pref" maxLength="41">ഡെവലപ്പർ ഓപ്ഷനുകൾ പ്രവർത്തനക്ഷമമാക്കുക</string>
     <string name="disable_dev_options">ഡെവലപ്പർ ഓപ്ഷനുകൾ പ്രവർത്തനരഹിതമാക്കുക</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-ml/17-model-manager.xml b/AnkiDroid/src/main/res/values-ml/17-model-manager.xml
index 75dee61b85d3..0ab68b281c89 100644
--- a/AnkiDroid/src/main/res/values-ml/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ml/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">ഈ പോസ്റ്റ് തരം ഇല്ലാതാക്കണമെന്ന് തീർച്ചയാണോ?</string>
     <string name="field_delete_warning">ഈ ഫീൽഡ് ഇല്ലാതാക്കണമെന്ന് തീർച്ചയാണോ?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">ചേർക്കുക: %1$s</string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">ക്ലോൺ: %1$s</string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">ചോദ്യ ഫോർമാറ്റ്</string>
diff --git a/AnkiDroid/src/main/res/values-mn/02-strings.xml b/AnkiDroid/src/main/res/values-mn/02-strings.xml
index 7dd499cceb40..5ddffc7feb50 100644
--- a/AnkiDroid/src/main/res/values-mn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-mn/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-mn/03-dialogs.xml b/AnkiDroid/src/main/res/values-mn/03-dialogs.xml
index a90006f09ce1..5f136efb99fa 100644
--- a/AnkiDroid/src/main/res/values-mn/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-mn/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Database error</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Report error</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-mn/10-preferences.xml b/AnkiDroid/src/main/res/values-mn/10-preferences.xml
index dd70942eb764..5a7b2e0e63d5 100644
--- a/AnkiDroid/src/main/res/values-mn/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-mn/10-preferences.xml
@@ -297,8 +297,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-mn/17-model-manager.xml b/AnkiDroid/src/main/res/values-mn/17-model-manager.xml
index 6b89a122d404..eff2650b23bb 100644
--- a/AnkiDroid/src/main/res/values-mn/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-mn/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Are you sure you wish to delete this field?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>
diff --git a/AnkiDroid/src/main/res/values-mr/02-strings.xml b/AnkiDroid/src/main/res/values-mr/02-strings.xml
index d167b4c59ed1..b998d7c988bb 100644
--- a/AnkiDroid/src/main/res/values-mr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-mr/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android बॅकअप प्रगतीपथावर आहे. कृपया पुन्हा प्रयत्न करा</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">Android बॅकअप प्रगतीपथावर आहे. कृपया पुन्हा प्रयत्न करा</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">आपली मुख्य स्क्रीन AnkiDroid ला शॉर्टकट जोडण्याची परवानगी देत ​​नाही</string>
     <string name="create_shortcut_error">शॉर्टकट जोडताना त्रुटी:%s</string>
@@ -305,14 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">रेकॉर्डिंग सेव्ह केले</string>
     <string name="deleting_selected_notes">निवडलेल्या टिपा हटवत आहे</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">ऐकण्यासाठी आवाज टॅप करा</string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">वापरण्यापूर्वी ध्वनी स्थापित करणे आवश्यक आहे</string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">तरीही वापरा</string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">टेक्स्ट टू स्पीच एरर (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">इंटरनेट</string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">स्थापित करा</string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">मजकूर ते भाषण सेटिंग्ज उघडण्यात अयशस्वी</string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">कृपया अधिक डेक डाउनलोड करण्यासाठी लॉग इन करा</string>
     <string name="deck_description_field_hint">वर्णन</string>
     <string name="failed_to_copy">कॉपी करण्यात अयशस्वी</string>
diff --git a/AnkiDroid/src/main/res/values-mr/03-dialogs.xml b/AnkiDroid/src/main/res/values-mr/03-dialogs.xml
index 5ddcf4a4e9a0..db8037ee8970 100644
--- a/AnkiDroid/src/main/res/values-mr/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-mr/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">डेटाबेस त्रुटी</string>
     <string name="answering_error_message">संग्रहात लेखन अयशस्वी. डेटाबेस दूषित होऊ शकतो किंवा डिस्कवर पुरेशी रिक्त जागा असू शकत नाही. \N \n जर हे बर्‍याचदा घडले तर डेटाबेस तपासून पहा, संग्रह दुरुस्त करा किंवा बॅकअपमधून पुनर्संचयित करा. त्यासाठी “पर्याय” ला स्पर्श करा. \N\ किंवा हा अँकीड्रोइड बग देखील असू शकतो; कृपया त्रुटी नोंदवा जेणेकरुन आम्ही हे तपासू शकतो.</string>
     <string name="answering_error_report">अहवाल त्रुटी</string>
-    <string name="storage_full_message">AnkiDroid उघडण्यासाठी पुरेशी मोकळी जागा नाही. सुरू ठेवण्यासाठी काही जागा सोडा.</string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">आपण खरोखर डेटाबेस दुरुस्त करण्याचा प्रयत्न करू इच्छिता? \N\n प्रयत्न सुरू करण्यापूर्वी, एक प्रत सबफोल्डर \"%s\" मध्ये तयार केली जाईल.</string>
     <string name="intent_aedict_empty">वर्ग “डीफॉल्ट” रिक्त आहे</string>
     <string name="intent_aedict_category">AnkiDroid वर कार्डे जोडण्यासाठी सर्व नोटपॅड श्रेण्या काढा किंवा “डीफॉल्ट” नावाची एक जोडा</string>
@@ -212,8 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">नंतर</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">परत दाखवू नकोस</string>
     <string name="dismiss_backup_warning_title">डेटा गमावण्याची चेतावणी</string>
-    <string name="dismiss_backup_warning_new_user">Android गोपनीयता बदलांमुळे, ॲप अनइंस्टॉल केल्याने तुमचा डेटा आणि तुमच्या फोनवरून स्वयंचलित बॅकअप हटवले जातील</string>
-    <string name="dismiss_backup_warning_upgrade">Android गोपनीयता बदलांमुळे, ॲप अनइंस्टॉल केल्यास तुमचा डेटा आणि स्वयंचलित बॅकअप प्रवेशयोग्य असतील</string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">डेक आधीच अस्तित्वात आहे</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">तुम्हाला डेक ऑर्डरिंग समस्या असल्यास (उदा. \'10\' \'2\' च्या आधी दिसतो), \'2\' ला \'02\' ने बदला</string>
diff --git a/AnkiDroid/src/main/res/values-mr/10-preferences.xml b/AnkiDroid/src/main/res/values-mr/10-preferences.xml
index 8c9ed489bcb6..fce8239f69ed 100644
--- a/AnkiDroid/src/main/res/values-mr/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-mr/10-preferences.xml
@@ -295,7 +295,7 @@
     <string name="pref_cat_dev_options" maxLength="41">विकसक पर्याय</string>
     <string name="dev_options_enabled_pref" maxLength="41">विकसक पर्याय सक्षम करा</string>
     <string name="disable_dev_options">विकसक पर्याय अक्षम करा</string>
-    <string name="dev_options_warning">कृपया विकसक पर्याय सक्षम करण्यापूर्वी खात्री करा. हे पर्याय धोकादायक आहेत आणि ॲप खंडित करू शकतात किंवा तुमचे संग्रहण खराब करू शकतात.\n\nलक्षात ठेवा की हे पर्याय बहुतेक वापरकर्त्यांसाठी योग्य नाहीत आणि म्हणून भाषांतरित केलेले नाहीत, म्हणून ते इंग्रजीमध्ये आहेत.</string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-mr/17-model-manager.xml b/AnkiDroid/src/main/res/values-mr/17-model-manager.xml
index af6dbc60be4e..bcd24461b497 100644
--- a/AnkiDroid/src/main/res/values-mr/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-mr/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">आपली खात्री आहे की आपण हा टीप प्रकार हटवू इच्छिता?</string>
     <string name="field_delete_warning">आपली खात्री आहे की आपण हे फील्ड हटवू इच्छिता?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">जोडा:%1$s</string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">क्लोन:%1$s</string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">कार्ड ब्राउझर आपली कार्डे प्रदर्शित करण्यासाठी वापरणारे टेम्पलेट प्रविष्ट करा. अधिक संक्षिप्त उत्तर प्रदर्शित करण्यासाठी हे वापरा. ​​\N \n A n \"{{Country}}  ची राजधानी आहे:\" चे पुढील टेम्पलेट: \"\n\" कार्ड ब्राउझरमध्ये \n \"कॅपिटल: {{Country}}\" \"कॉम्प्रेस केले जाईल.</string>
     <string name="card_template_browser_appearance_question_format">प्रश्न स्वरूप</string>
diff --git a/AnkiDroid/src/main/res/values-ms/02-strings.xml b/AnkiDroid/src/main/res/values-ms/02-strings.xml
index 7d315fa1fa46..4f1311784eae 100644
--- a/AnkiDroid/src/main/res/values-ms/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ms/02-strings.xml
@@ -229,7 +229,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Sandaran Android sedang dijalankan. Sila cuba lagi</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">Anda mungkin perlu menggunakan iManager untuk membenarkan AnkiDroid tambah pintasan</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Skrin laman utama anda melarang AnkiDroid menambah pintasan</string>
     <string name="create_shortcut_error">Ralat menambah pintasan: %s</string>
@@ -300,20 +300,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-ms/03-dialogs.xml b/AnkiDroid/src/main/res/values-ms/03-dialogs.xml
index 88ca44174204..8a7d7e621d06 100644
--- a/AnkiDroid/src/main/res/values-ms/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ms/03-dialogs.xml
@@ -62,7 +62,7 @@
     <string name="answering_error_title">Ralat pangkalan data</string>
     <string name="answering_error_message">Menulis ke koleksi gagal. Pangkalan data mungkin rosak atau kehabisan ruang kosong pada cakera.\n\nJika ini berlaku kerap, cuba periksa pangkalan data, baiki koleksi atau pulih dari suatu sandaran. Sentuh \"tetapan\" untuk lakukannya.\n\Atau ia mungkin pepijat AnkiDroid; sila laporkannya agar kami boleh memeriksa ralat tersebut.</string>
     <string name="answering_error_report">Lapor ralat</string>
-    <string name="storage_full_message">Kehabisan ruang storan kosong untuk membuka AnkiDroid. Kosongkan sedikit ruang untuk teruskan. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Adakah anda pasti mahu membaiki pangkalan data?\n\nSebelum mencuba, satu salinan akan dibuat dalam subfolder “%s”.</string>
     <string name="intent_aedict_empty">Kategori “lalai” kosong</string>
     <string name="intent_aedict_category">Untuk tambah kad ke AnkiDroid buang semua kategori Papan Nota atau tambah satu bernama “default”</string>
@@ -208,10 +208,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Kemudian</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Jangan tunjukkan lagi</string>
     <string name="dismiss_backup_warning_title">Amaran kehilangan data</string>
-    <string name="dismiss_backup_warning_new_user">        Akibat perubahan privasi Android, data anda dan sandaran automatik akan dibuang dari telefon anda jika aplikasi dinyahpasang
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Akibat perubahan privasi Android, data anda dan sandaran automatik tidak akan dapat dicapai jika aplikasi dinyahpasang
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-ms/10-preferences.xml b/AnkiDroid/src/main/res/values-ms/10-preferences.xml
index 9deb06530b91..fae55e520a82 100644
--- a/AnkiDroid/src/main/res/values-ms/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ms/10-preferences.xml
@@ -295,8 +295,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Pilihan pembangun</string>
     <string name="dev_options_enabled_pref" maxLength="41">Dayakan pilihan pembangun</string>
     <string name="disable_dev_options">Lumpuhkan pilihan pembangun</string>
-    <string name="dev_options_warning">        Sila pastikan dahulu sebelum dayakan pilihan pembangun. Pilihan ini berbahaya dan boleh merosakkan aplikasi atau koleksi anda.\n\nAmbil perhatian bahawa pilihan ini tidak sesuai untuk kebanyakan pengguna dan oleh itu tidak diterjemahkan, maka mereka dalam bahasa Inggeris.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-ms/17-model-manager.xml b/AnkiDroid/src/main/res/values-ms/17-model-manager.xml
index ceaccdbe90f0..576c0cd826da 100644
--- a/AnkiDroid/src/main/res/values-ms/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ms/17-model-manager.xml
@@ -62,9 +62,9 @@
     <string name="model_delete_warning">Anda pasti ingin memadam jenis nota ini?</string>
     <string name="field_delete_warning">Anda pasti ingin menghapuskan medan ini?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Tambah: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Klon: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Masukkan templat yang pencari kad akan guna untuk tunjukkan kad anda. Gunakannya untuk memaparkan jawapan lebih ringkas.\n\nTemplat hadapan\n“Ibu negara {{Country}} adalah:”\nboleh diringkaskan dalam pencari kad kepada\n“Ibu negara: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Format Soalan</string>
diff --git a/AnkiDroid/src/main/res/values-my/02-strings.xml b/AnkiDroid/src/main/res/values-my/02-strings.xml
index 2d506f269e4d..9d6c7482d644 100644
--- a/AnkiDroid/src/main/res/values-my/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-my/02-strings.xml
@@ -229,7 +229,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -300,20 +300,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-my/03-dialogs.xml b/AnkiDroid/src/main/res/values-my/03-dialogs.xml
index dee33a42274a..ea1fdc58af16 100644
--- a/AnkiDroid/src/main/res/values-my/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-my/03-dialogs.xml
@@ -62,7 +62,7 @@
     <string name="answering_error_title">Database error</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Report error</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
@@ -208,10 +208,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-my/10-preferences.xml b/AnkiDroid/src/main/res/values-my/10-preferences.xml
index 0b680887a4dd..0f0b55cad9c9 100644
--- a/AnkiDroid/src/main/res/values-my/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-my/10-preferences.xml
@@ -295,8 +295,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-my/17-model-manager.xml b/AnkiDroid/src/main/res/values-my/17-model-manager.xml
index 5fa571a5e4a9..c92fe77e4302 100644
--- a/AnkiDroid/src/main/res/values-my/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-my/17-model-manager.xml
@@ -62,9 +62,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Are you sure you wish to delete this field?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>
diff --git a/AnkiDroid/src/main/res/values-nl/02-strings.xml b/AnkiDroid/src/main/res/values-nl/02-strings.xml
index 9adc0b8c975e..7437411e0ec8 100644
--- a/AnkiDroid/src/main/res/values-nl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-nl/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">De afbeelding is te groot, voeg de afbeelding handmatig in</string>
     <string name="note_editor_video_too_large">Het videobestand is te groot, voeg de video handmatig in</string>
     <string name="note_editor_audio_too_large">Het audiobestand is te groot, voeg de audio handmatig in</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Bezig met Android back-up. Probeer het opnieuw</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">Mogelijk moet u iManager gebruiken om AnkiDroid snelkoppelingen te laten toevoegen</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Uw startscherm staat niet toe dat AnkiDroid snelkoppelingen toevoegt</string>
     <string name="create_shortcut_error">Fout bij het toevoegen van de snelkoppeling: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Opname opgeslagen</string>
     <string name="deleting_selected_notes">Geselecteerde notities verwijderen</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tik op een stem om
-    te luisteren    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Stem moet voor gebruik worden geïnstalleerd
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Toch gebruiken
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Tekst naar spraak fout (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Installeren
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Tekst-naar-spraak-instellingen kunnen niet worden geopend
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Log in om meer sets te downloaden</string>
     <string name="deck_description_field_hint">Beschrijving</string>
     <string name="failed_to_copy">Kopiëren mislukt</string>
diff --git a/AnkiDroid/src/main/res/values-nl/03-dialogs.xml b/AnkiDroid/src/main/res/values-nl/03-dialogs.xml
index 78eec1b4d888..422af28848e6 100644
--- a/AnkiDroid/src/main/res/values-nl/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-nl/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Fout in database</string>
     <string name="answering_error_message">Het schrijven naar de collectie is mislukt. De database kan corrupt zijn of er is onvoldoende opslagruimte op de schijf.\n\nAls dit vaker gebeurt, probeer de database te controleren, de collectie te herstellen of terug te zetten vanaf een back-up. Klik hiervoor op \'instellingen\'.\n\nHet kan ook een fout in AnkiDroid zijn. Gelieve de fout te melden zodat we dit kunnen controleren.</string>
     <string name="answering_error_report">Fout melden</string>
-    <string name="storage_full_message">Er is onvoldoende opslagruimte beschikbaar om AnkiDroid te openen. Maak ruimte vrij om door te gaan. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Weet u zeker dat wilt proberen de database te repareren?\n\nVoordat dit wordt geprobeerd, wordt een kopie gemaakt in de submap \'%s\'.</string>
     <string name="intent_aedict_empty">Categorie \'standaard\' is leeg</string>
     <string name="intent_aedict_category">Om kaarten aan AnkiDroid toe te voegen verwijder je alle Notepad categorieën of voeg een toe met de naam \'standaard\'</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Dit bericht niet meer tonen</string>
     <string name="dismiss_backup_warning_title">Waarschuwing voor dataverlies</string>
-    <string name="dismiss_backup_warning_new_user">        Door wijzigingen in de privacy van Android worden uw gegevens en geautomatiseerde back-ups verwijderd van uw telefoon als de app is verwijderd
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Door wijzigingen in de privacy van Android zullen uw gegevens en geautomatiseerde back-ups niet toegankelijk zijn als de app is verwijderd
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Set bestaat al</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">Als je problemen met een leerset hebt (bijvoorbeeld ‘10’ treedt op voor ‘2’), vervang dan ‘2’ door ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-nl/10-preferences.xml b/AnkiDroid/src/main/res/values-nl/10-preferences.xml
index 655155fec673..55de3dbe51fb 100644
--- a/AnkiDroid/src/main/res/values-nl/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-nl/10-preferences.xml
@@ -296,8 +296,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Opties voor ontwikkelaars</string>
     <string name="dev_options_enabled_pref" maxLength="41">Opties voor ontwikkelaars inschakelen</string>
     <string name="disable_dev_options">Ontwikkelaarsopties uitschakelen</string>
-    <string name="dev_options_warning">        Zorg ervoor dat u zeker bent voordat u de ontwikkelaarsopties inschakelt. Deze opties zijn gevaarlijk en kunnen de app kapot maken of je collectie beschadigen.\n\nMerk op dat deze opties niet geschikt zijn voor de meeste gebruikers en daarom niet vertaald zijn, dus in het Engels zijn.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-nl/17-model-manager.xml b/AnkiDroid/src/main/res/values-nl/17-model-manager.xml
index cda5fa103223..77982f86b330 100644
--- a/AnkiDroid/src/main/res/values-nl/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-nl/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Weet u zeker dat u dit memotype wilt verwijderen?</string>
     <string name="field_delete_warning">Weet u zeker dat u dit veld wilt verwijderen?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Toevoegen: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Kloon: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Voer het sjabloon in dat de kaartenbrowser zal gebruiken om uw kaarten weer te geven. Gebruik dit om een beknopter antwoord weer te geven.\n\nEen sjabloon voor\n“De hoofdstad van {{Country}} is:”\nzou in de kaartenbrowser verkleind kunnen worden naar\n“Hoofdstad: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Vraagformaat</string>
diff --git a/AnkiDroid/src/main/res/values-nn/02-strings.xml b/AnkiDroid/src/main/res/values-nn/02-strings.xml
index 931c04a9c904..014008444199 100644
--- a/AnkiDroid/src/main/res/values-nn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-nn/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-nn/03-dialogs.xml b/AnkiDroid/src/main/res/values-nn/03-dialogs.xml
index 5d207bbdb889..52be00c8f901 100644
--- a/AnkiDroid/src/main/res/values-nn/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-nn/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Databasefeil</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Rapporter feil</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Vil du virkelig prøve å reparere databasen?\n\nEn kopi vil bli opprettet i undermappen \'%s\' før forsøket starter.</string>
     <string name="intent_aedict_empty">Kategorien \'standard\' er tom</string>
     <string name="intent_aedict_category">For å legge kort til AnkiDroid, fjern alle notisblokk-kategorier eller legg til en som heter \'default\'</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Ikke nå</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Ikke vis dette igjen</string>
     <string name="dismiss_backup_warning_title">Advarsel om datatap</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-nn/10-preferences.xml b/AnkiDroid/src/main/res/values-nn/10-preferences.xml
index 8d52ed8d93d9..b947fe8b4de8 100644
--- a/AnkiDroid/src/main/res/values-nn/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-nn/10-preferences.xml
@@ -297,8 +297,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-nn/17-model-manager.xml b/AnkiDroid/src/main/res/values-nn/17-model-manager.xml
index 896c5a01bde4..2600b686dddc 100644
--- a/AnkiDroid/src/main/res/values-nn/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-nn/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Er du sikker på at du vil slette denne notattypen?</string>
     <string name="field_delete_warning">Er du sikker på at du vil sletta dette feltet?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Legg til: %1$s</string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Kopier: %1$s</string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Spørsmålsformat</string>
diff --git a/AnkiDroid/src/main/res/values-no/02-strings.xml b/AnkiDroid/src/main/res/values-no/02-strings.xml
index ffe2c9e632bc..da30e0b8e142 100644
--- a/AnkiDroid/src/main/res/values-no/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-no/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-no/03-dialogs.xml b/AnkiDroid/src/main/res/values-no/03-dialogs.xml
index 1f0feb90cba1..f70e343d1862 100644
--- a/AnkiDroid/src/main/res/values-no/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-no/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Databasefeil</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Rapporter feil</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Vil du virkelig prøve å reparere databasen?\n\nEn kopi vil bli opprettet i undermappen \'%s\' før forsøket starter.</string>
     <string name="intent_aedict_empty">Kategorien \'standard\' er tom</string>
     <string name="intent_aedict_category">For å legge kort til AnkiDroid, fjern alle notisblokk-kategorier eller legg til en som heter \'default\'</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Ikke nå</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Ikke vis dette igjen</string>
     <string name="dismiss_backup_warning_title">Advarsel om datatap</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-no/10-preferences.xml b/AnkiDroid/src/main/res/values-no/10-preferences.xml
index 86be1ff1b2d4..e13ea649f9fb 100644
--- a/AnkiDroid/src/main/res/values-no/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-no/10-preferences.xml
@@ -297,8 +297,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-no/17-model-manager.xml b/AnkiDroid/src/main/res/values-no/17-model-manager.xml
index 7c4d063bc823..70726df85712 100644
--- a/AnkiDroid/src/main/res/values-no/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-no/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Er du sikker på at du vil slette denne notattypen?</string>
     <string name="field_delete_warning">Er du sikker på at du vil slette dette feltet?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Legg til: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Kopier: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Spørsmålsformat</string>
diff --git a/AnkiDroid/src/main/res/values-or/02-strings.xml b/AnkiDroid/src/main/res/values-or/02-strings.xml
index b67a7cad4cfc..497361a608e1 100644
--- a/AnkiDroid/src/main/res/values-or/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-or/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">ଵିଡ଼ିଓ ଫାଇଲ୍‌ଟି ଅତ୍ୟଧିକ ବଡ଼ ଅଟେ, ଦୟାକରି ହସ୍ତକୃତ ଭାବେ ଵିଡ଼ିଓଟିକୁ ସନ୍ନିବେଶ କରନ୍ତୁ</string>
     <string name="note_editor_audio_too_large">ଅଡ଼ିଓ ଫାଇଲ୍‌ଟି ଅତ୍ୟଧିକ ବଡ଼ ଅଟେ, ଦୟାକରି ହସ୍ତକୃତ ଭାବେ ଅଡ଼ିଓଟିକୁ ସନ୍ନିବେଶ କରନ୍ତୁ</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        ଆଣ୍ଡ୍ରଏଡ୍ ବ୍ୟାକଅପ୍ ଚାଲିଛି। ଦୟାକରି ପୁଣିଥରେ ଚେଷ୍ଟା କରନ୍ତୁ</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">AnkiDroid କୁ ସର୍ଟ୍‌କଟ୍ ଯୋଡ଼ିବା ଅନୁମତି ଦେବା ପାଇଁ ଆପଣଙ୍କୁ iManager ଵ୍ୟଵହାର କରିବାକୁ ପଡ଼ିପାରେ</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">ଆପଣଙ୍କ ଗୃହସ୍କ୍ରୀନ୍ AnkiDroidକୁ ସର୍ଟ୍‌କଟ୍ ଯୋଡ଼ିବାର ଅନୁମତି ଦିଏ ନାହିଁ</string>
     <string name="create_shortcut_error">ସର୍ଟ୍‌କଟ୍ ଯୋଡ଼ିବାରେ ତ୍ରୁଟି: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">ରେକର୍ଡିଂ ସଞ୍ଚୟ ହୋଇଛି</string>
     <string name="deleting_selected_notes">ବଚ୍ଛିତ ନୋଟଗୁଡ଼ିକ ବିଲୋପ କରାଯାଉଛି</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        ଶୁଣିବା ପାଇଁ ଏକ ସ୍ୱର ଉପରେ ସ୍ପର୍ଶ କରିବା
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">ବ୍ୟବହାର ପୂର୍ବରୁ ସ୍ୱର ଅଧିସ୍ଥାପିତ ହେବା ଉଚିତ୍
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">ଯେକୌଣସି ମତେ ବ୍ୟବହାର କରିବା
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">ପାଠ୍ୟ-ରୁ-କଥନ ତ୍ରୁଟି (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        ଇଣ୍ଟରନେଟ୍
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        ଅଧିସ୍ଥାପନ
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        ପାଠ୍ୟ ରୁ କଥନ ସେଟିଂ ଖୋଲିବାରେ ବିଫଳ
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">ଆହୁରି ତାସଖଣ୍ଡ ଡାଉନଲୋଡ୍ କରିବାକୁ ଦୟାକରି ଲଗ୍ ଇନ୍ କରନ୍ତୁ</string>
     <string name="deck_description_field_hint">ବର୍ଣ୍ଣନା</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-or/03-dialogs.xml b/AnkiDroid/src/main/res/values-or/03-dialogs.xml
index 19c40dba26e2..44eb04f64da5 100644
--- a/AnkiDroid/src/main/res/values-or/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-or/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">ଡାଟାବେସ୍ ତ୍ରୁଟି</string>
     <string name="answering_error_message">ସଂଗ୍ରହରେ ଲିଖନ ବିଫଳ ହେଲା। ଡାଟାବେସ୍ ଭ୍ରଷ୍ଟ ହୋଇପାରେ କିମ୍ବା ଡିସ୍କରେ ପର୍ଯ୍ୟାପ୍ତ ଖାଲି ସ୍ଥାନ ନ ଥାଇପାରେ।\n\nଯଦି ଏହା ଅଧିକ ଘଟେ, ଡାଟାବେସ୍ ଯାଞ୍ଚ କରିବାକୁ ଚେଷ୍ଟା କରନ୍ତୁ, ସଂଗ୍ରହକୁ ମରାମତି କରନ୍ତୁ କିମ୍ବା ବ୍ୟାକଅପ୍ ରୁ ପୁନଃସ୍ଥାପନ କରନ୍ତୁ। ଏଥିପାଇଁ “ବିକଳ୍ପ” କୁ ବାଛନ୍ତୁ।\nକିମ୍ବା ଏହା ଏକ AnkiDroid ବଗ୍ ମଧ୍ୟ ହୋଇପାରେ। ଦୟାକରି କୀଟ ପ୍ରତିବେଦନ କରନ୍ତୁ ଯାହା ଦ୍ୱାରା ଆମେ ଏହାକୁ ଯାଞ୍ଚ କରିପାରିବୁ।</string>
     <string name="answering_error_report">ତ୍ରୁଟି ପ୍ରତିବେଦନ କରିବା</string>
-    <string name="storage_full_message">AnkiDroid ଖୋଲିବା ପାଇଁ ପର୍ଯ୍ୟାପ୍ତ ମୁକ୍ତ ଷ୍ଟୋରେଜ୍ ସ୍ଥାନ ନାହିଁ। ଜାରି ରଖିବାକୁ ହେଲେ କିଛି ସ୍ଥାନ ଖାଲି କରନ୍ତୁ। </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">ଆପଣ ପ୍ରକୃତରେ ଡାଟାବେସ୍ ମରାମତି କରିବାକୁ ଚେଷ୍ଟା କରିବାକୁ ଚାହୁଁଛନ୍ତି କି?\n\nପ୍ରୟାସ ଆରମ୍ଭ କରିବା ପୂର୍ବରୁ, “%s” ଉପଫୋଲ୍ଡର୍ ରେ ଏକ କପି ସୃଷ୍ଟି ହେବ।</string>
     <string name="intent_aedict_empty">ବର୍ଗ “ଡିଫଲ୍ଟ” ଖାଲି ଅଛି</string>
     <string name="intent_aedict_category">AnkiDroid ରେ ପତ୍ର ଯୋଡ଼ିବା ପାଇଁ ସମସ୍ତ Notepad ବର୍ଗଗୁଡ଼ିକୁ ଅପସାରଣ କରନ୍ତୁ କିମ୍ବା “ଡିଫଲ୍ଟ” ନାମକ ଏକ ବର୍ଗ ଯୋଡ଼ନ୍ତୁ</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">ପରେ</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">ପୁନଃ ଦେଖାଅନି</string>
     <string name="dismiss_backup_warning_title">ଡାଟା କ୍ଷତି ଚେତାଵନୀ</string>
-    <string name="dismiss_backup_warning_new_user">        ଆଣ୍ଡ୍ରଏଡ୍ ଗୋପନୀୟତା ପରିଵର୍ତ୍ତନ ହେତୁ, ଆପ୍ ଅନଇନଷ୍ଟଲ୍ ହେଲେ ଆପଣଙ୍କ ଫୋନ୍‌ରୁ ଆପଣଙ୍କ ଡାଟା ଏଵଂ ସ୍ୱଚାଳିତ ବ୍ୟାକଅପ୍ ଵିଲୋପ ହୋଇଯିବ
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        ଆଣ୍ଡ୍ରଏଡ୍ ଗୋପନୀୟତା ପରିଵର୍ତ୍ତନ ହେତୁ, ଆପ୍ ଅନଇନଷ୍ଟଲ୍ ହେଲେ ଆପଣଙ୍କ ଡାଟା ଏଵଂ ସ୍ୱଚାଳିତ ବ୍ୟାକଅପ୍ ଅଗମ୍ୟ ପାଲଟିବ
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">ତାସଖଣ୍ଡ ନାମ ଖାଲି ଛଡ଼ାଯାଇପାରିବ ନାହିଁ</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-or/10-preferences.xml b/AnkiDroid/src/main/res/values-or/10-preferences.xml
index 72dead1bf6e2..441b861c4858 100644
--- a/AnkiDroid/src/main/res/values-or/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-or/10-preferences.xml
@@ -296,8 +296,7 @@
     <string name="pref_cat_dev_options" maxLength="41">ଡେଵେଲପର୍ ଵିକଳ୍ପ</string>
     <string name="dev_options_enabled_pref" maxLength="41">ଡେଵେଲପର୍ ଵିକଳ୍ପ ସକ୍ଷମ କରିବା</string>
     <string name="disable_dev_options">ଡେଵେଲପର୍ ଵିକଳ୍ପ ଅକ୍ଷମ କରିବା</string>
-    <string name="dev_options_warning">        ଡେଵେଲପର୍ ଵିକଳ୍ପ ସକ୍ଷମ କରିବା ଆଗରୁ ଦୟାକରି ନିଶ୍ଚିତ ହୁଅନ୍ତୁ। ଏଇ ଵିକଳ୍ପ ବିପଜ୍ଜନକ ଏଵଂ ଆପ୍ ଭାଙ୍ଗିପାରନ୍ତି କିମ୍ବା ଆପଣଙ୍କ ସଂଗ୍ରହକୁ ଭ୍ରଷ୍ଟ କରିପାରନ୍ତି।\n\nଧ୍ୟାନ ଦିଅନ୍ତୁ ଯେ ଏହି ଵିକଳ୍ପଗୁଡ଼ିକ ଅଧିକାଂଶ ଉପଭୋକ୍ତାଙ୍କ ପାଇଁ ଉପଯୁକ୍ତ ନୁହେଁ ଏଣୁ ଅନୁଵାଦ କରାନଯାଇ ଇଂରାଜୀରେ ହି ଥାଏ।
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-or/17-model-manager.xml b/AnkiDroid/src/main/res/values-or/17-model-manager.xml
index 5e7d43771d69..0fc4d2044ff7 100644
--- a/AnkiDroid/src/main/res/values-or/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-or/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">ଆପଣ ନିଶ୍ଚିତ କି ଆପଣ ଏହି ନୋଟ୍ ପ୍ରକାର ବିଲୋପ କରିବାକୁ ଚାହୁଁଛନ୍ତି କି?</string>
     <string name="field_delete_warning">ଆପଣ ନିଶ୍ଚିତ କି ଆପଣ ଏହି କ୍ଷେତ୍ର ବିଲୋପ କରିବାକୁ ଚାହୁଁଛନ୍ତି?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">ଯୋଡ଼ନ୍ତୁ: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">ପ୍ରତିଲିପି ତିଆରି କରନ୍ତୁ: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">ଆପଣଙ୍କ ପତ୍ର ପ୍ରଦର୍ଶନ କରିବା ପାଇଁ ପତ୍ର ବ୍ରାଉଜର୍ ବ୍ୟବହାର କରୁଥିବା ଟେମ୍ପଲେଟ୍ ପ୍ରବେଶ କରନ୍ତୁ। ଅଧିକ ସଂକ୍ଷିପ୍ତ ଉତ୍ତର ପ୍ରଦର୍ଶନ କରିବା ପାଇଁ ଏହାକୁ ବ୍ୟବହାର କରନ୍ତୁ।\n\nଏକ ସାମ୍ନା ଟେମ୍ପଲେଟ୍\n“{{Country}} ର ରାଜଧାନୀ ହେଉଛି:”\nକୁ ପତ୍ର ବ୍ରାଉଜର୍‌ରେ \n“ରାଜଧାନୀ: {{Country}}” କୁ ସଙ୍କୋଚନ କରାଯାଇପାରିବ</string>
     <string name="card_template_browser_appearance_question_format">ପ୍ରଶ୍ନ ଶୈଳୀ</string>
diff --git a/AnkiDroid/src/main/res/values-pa/02-strings.xml b/AnkiDroid/src/main/res/values-pa/02-strings.xml
index a62e834dbf7a..6bbe93d971c5 100644
--- a/AnkiDroid/src/main/res/values-pa/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-pa/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">ਚਿੱਤਰ ਬਹੁਤ ਵੱਡਾ ਹੈ, ਕਿਰਪਾ ਕਰਕੇ ਚਿੱਤਰ ਨੂੰ ਹੱਥੀਂ ਪਾਓ</string>
     <string name="note_editor_video_too_large">ਵੀਡੀਓ ਫਾਈਲ ਬਹੁਤ ਵੱਡੀ ਹੈ, ਕਿਰਪਾ ਕਰਕੇ ਹੱਥੀਂ ਵੀਡੀਓ ਪਾਓ</string>
     <string name="note_editor_audio_too_large">ਆਡੀਓ ਫ਼ਾਈਲ ਬਹੁਤ ਵੱਡੀ ਹੈ, ਕਿਰਪਾ ਕਰਕੇ ਆਡੀਓ ਨੂੰ ਹੱਥੀਂ ਪਾਓ</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android ਬੈਕਅੱਪ ਜਾਰੀ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">ਤੁਹਾਨੂੰ AnkiDroid ਨੂੰ ਸ਼ਾਰਟਕੱਟ ਜੋੜਨ ਦੀ ਇਜਾਜ਼ਤ ਦੇਣ ਲਈ iManager ਦੀ ਵਰਤੋਂ ਕਰਨ ਦੀ ਲੋੜ ਹੋ ਸਕਦੀ ਹੈ</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">ਤੁਹਾਡੀ ਹੋਮ ਸਕ੍ਰੀਨ AnkiDroid ਨੂੰ ਸ਼ਾਰਟਕੱਟ ਜੋੜਨ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਦਿੰਦੀ</string>
     <string name="create_shortcut_error">ਸ਼ਾਰਟਕੱਟ ਜੋੜਨ ਵਿੱਚ ਤਰੁੱਟੀ: %s</string>
@@ -305,14 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">ਰਿਕਾਰਡਿੰਗ ਸੁਰੱਖਿਅਤ ਕੀਤੀ ਗਈ</string>
     <string name="deleting_selected_notes">ਚੁਣੇ ਗਏ ਨੋਟਸ ਮਿਟਾਓ</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">ਸੁਣਨ ਲਈ ਇੱਕ ਅਵਾਜ਼ \'ਤੇ ਟੈਪ ਕਰੋ</string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">ਅਵਾਜ਼ ਵਰਤਣ ਤੋਂ ਪਹਿਲਾਂ ਇੰਸਟਾਲ ਹੋਣੀ ਚਾਹੀਦੀ ਹੈ</string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">ਕਿਸੇ ਵੀ ਤਰ੍ਹਾਂ ਵਰਤੋ</string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">ਟੈਕਸਟ ਤੋਂ ਸਪੀਚ ਗਲਤੀ (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">ਇੰਟਰਨੇਟ</string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">ਇੰਸਟਾਲ ਕਰੋ</string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">ਟੈਕਸਟ ਟੂ ਸਪੀਚ ਸੈਟਿੰਗਾਂ ਨੂੰ ਖੋਲ੍ਹਣ ਵਿੱਚ ਅਸਫਲ</string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">ਕਿਰਪਾ ਕਰਕੇ ਹੋਰ ਡੇਕ ਡਾਊਨਲੋਡ ਕਰਨ ਲਈ ਲੌਗ ਇਨ ਕਰੋ</string>
     <string name="deck_description_field_hint">ਵਰਣਨ</string>
     <string name="failed_to_copy">ਕਾਪੀ ਕਰਨਾ ਅਸਫਲ ਰਿਹਾ</string>
diff --git a/AnkiDroid/src/main/res/values-pa/03-dialogs.xml b/AnkiDroid/src/main/res/values-pa/03-dialogs.xml
index 1c3d7a2428fb..aeb30db21efa 100644
--- a/AnkiDroid/src/main/res/values-pa/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-pa/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">ਡਾਟਾਬੇਸ ਗਲਤੀ</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">ਇੱਕ ਬੱਗ ਦੀ ਰਿਪੋਰਟ ਕਰੋ</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">ਸ਼੍ਰੇਣੀ \"ਡਿਫਾਲਟ\" ਖਾਲੀ ਹੈ</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">ਬਾਅਦ ਵਿੱਚ</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">ਦੁਬਾਰਾ ਨਾ ਦਿਖਾਓ</string>
     <string name="dismiss_backup_warning_title">ਡਾਟਾ ਖਰਾਬ ਹੋਣ ਦੀ ਚੇਤਾਵਨੀ</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">ਡੇਕ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ</string>
     <string name="empty_deck_name">ਡੈੱਕ ਦਾ ਨਾਮ ਖਾਲੀ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ</string>
     <string name="create_deck_numeric_hint">ਜੇਕਰ ਤੁਹਾਡੇ ਕੋਲ ਡੈੱਕ ਆਰਡਰਿੰਗ ਸਮੱਸਿਆਵਾਂ ਹਨ (ਜਿਵੇਂ ਕਿ \'10\' \'2\' ਤੋਂ ਪਹਿਲਾਂ ਦਿਖਾਈ ਦਿੰਦਾ ਹੈ), \'2\' ਨੂੰ \'02\' ਨਾਲ ਬਦਲੋ</string>
diff --git a/AnkiDroid/src/main/res/values-pa/10-preferences.xml b/AnkiDroid/src/main/res/values-pa/10-preferences.xml
index d8c8c8817758..cf5e71071f84 100644
--- a/AnkiDroid/src/main/res/values-pa/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-pa/10-preferences.xml
@@ -296,7 +296,7 @@
     <string name="pref_cat_dev_options" maxLength="41">ਵਿਕਾਸਕਾਰ ਵਿਕਲਪ</string>
     <string name="dev_options_enabled_pref" maxLength="41">ਵਿਕਾਸਕਾਰ ਵਿਕਲਪਾਂ ਨੂੰ ਸਮਰੱਥ ਬਣਾਓ</string>
     <string name="disable_dev_options">ਵਿਕਾਸ ਕਾਰਖਾਨੇ ਬਣਾਉਣ ਨੂੰ ਬਣਾਉਣਾ</string>
-    <string name="dev_options_warning">ਕਿਰਪਾ ਕਰਕੇ ਵਿਕਾਸਕਾਰ ਵਿਕਲਪਾਂ ਨੂੰ ਸਮਰੱਥ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਯਕੀਨੀ ਬਣਾਓ। ਇਹ ਵਿਕਲਪ ਖ਼ਤਰਨਾਕ ਹਨ ਅਤੇ ਐਪ ਨੂੰ ਤੋੜ ਸਕਦੇ ਹਨ ਜਾਂ ਤੁਹਾਡੇ ਸੰਗ੍ਰਹਿ ਨੂੰ ਖਰਾਬ ਕਰ ਸਕਦੇ ਹਨ।\n\nਨੋਟ ਕਰੋ ਕਿ ਇਹ ਵਿਕਲਪ ਜ਼ਿਆਦਾਤਰ ਉਪਭੋਗਤਾਵਾਂ ਲਈ ਢੁਕਵੇਂ ਨਹੀਂ ਹਨ ਅਤੇ ਇਸਲਈ ਅਨੁਵਾਦ ਨਹੀਂ ਕੀਤੇ ਗਏ ਹਨ, ਇਸਲਈ ਇਹ ਅੰਗਰੇਜ਼ੀ ਵਿੱਚ ਹਨ।</string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-pa/17-model-manager.xml b/AnkiDroid/src/main/res/values-pa/17-model-manager.xml
index ba70eebf9de0..9e8e7cbcff71 100644
--- a/AnkiDroid/src/main/res/values-pa/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-pa/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">ਕੀ ਤੁਸੀਂ ਯਕੀਨੀ ਤੌਰ \'ਤੇ ਇਸ ਨੋਟ ਕਿਸਮ ਨੂੰ ਮਿਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?</string>
     <string name="field_delete_warning">ਕੀ ਤੁਸੀਂ ਯਕੀਨੀ ਤੌਰ \'ਤੇ ਇਸ ਖੇਤਰ ਨੂੰ ਮਿਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">ਸ਼ਾਮਲ ਕਰੋ: %1$s</string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">ਕਲੋਨ: %1$s</string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">ਉਹ ਟੈਂਪਲੇਟ ਦਾਖਲ ਕਰੋ ਜਿਸਦੀ ਵਰਤੋਂ ਕਾਰਡ ਬ੍ਰਾਊਜ਼ਰ ਤੁਹਾਡੇ ਕਾਰਡਾਂ ਨੂੰ ਪ੍ਰਦਰਸ਼ਿਤ ਕਰਨ ਲਈ ਕਰੇਗਾ। ਹੋਰ ਸੰਖੇਪ ਜਵਾਬ ਦਿਖਾਉਣ ਲਈ ਇਸਦੀ ਵਰਤੋਂ ਕਰੋ।\n\n“{{Country}} ਦੀ ਰਾਜਧਾਨੀ ਹੈ:”\n\n“ਰਾਜਧਾਨੀ: {{Country}}” ਵਿੱਚ ਸਮੇਟਿਆ ਜਾ ਸਕਦਾ ਹੈ।</string>
     <string name="card_template_browser_appearance_question_format">ਪ੍ਰਸ਼ਨ ਫਾਰਮੈਟ</string>
diff --git a/AnkiDroid/src/main/res/values-pl/02-strings.xml b/AnkiDroid/src/main/res/values-pl/02-strings.xml
index 9c6e6faa536a..d286aa22e0c6 100644
--- a/AnkiDroid/src/main/res/values-pl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-pl/02-strings.xml
@@ -241,7 +241,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Kopia zapasowa Android w toku. Spróbuj ponownie</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">Może być konieczne użycie iManager, by umożliwić AnkiDroid dodawanie skrótów</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Twój launcher nie pozwala AnkiDroid dodawać skrótów</string>
     <string name="create_shortcut_error">Błąd dodawania skrótu: %s</string>
@@ -315,20 +315,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Nagranie zostało zapisane</string>
     <string name="deleting_selected_notes">Usuwanie zaznaczonych notatek</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Dotknij głosu, aby słuchać
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Głos powinien być zainstalowany przed użyciem
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Użyj mimo to
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Błąd przekształcania tekstu na mowę (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Zainstaluj
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Nie udało się otworzyć ustawień przekształcania tekstu do mowy
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Zaloguj się, aby pobrać więcej talii</string>
     <string name="deck_description_field_hint">Opis</string>
     <string name="failed_to_copy">Kopiowanie nieudane</string>
diff --git a/AnkiDroid/src/main/res/values-pl/03-dialogs.xml b/AnkiDroid/src/main/res/values-pl/03-dialogs.xml
index e960fc4ec44f..eb514411715f 100644
--- a/AnkiDroid/src/main/res/values-pl/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-pl/03-dialogs.xml
@@ -68,7 +68,7 @@
     <string name="answering_error_title">Błąd bazy danych</string>
     <string name="answering_error_message">Wystąpił błąd podczas zapisywania do kolekcji. Powodem może być uszkodzenie bazy danych albo niewystarczająca ilość miejsca na dysku.\n\nJeśli błąd ten występuje często, spróbuj użyć opcji \"sprawdź bazę danych\" oraz naprawić kolekcję lub przywróć ją z kopii zapasowej (by tego dokonać kliknij „opcje”).\n\nRównie dobrze może to być też błąd AnkiDroid; zgłoś go abyśmy mogli to sprawdzić.</string>
     <string name="answering_error_report">Zgłoś błąd</string>
-    <string name="storage_full_message">Nie ma wystarczającej ilości wolnego miejsca, aby otworzyć AnkiDroid. Zwolnij trochę miejsca, aby kontynuować. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Czy na pewno chcesz próbować naprawić bazę danych? \n\nPrzed próbą naprawy zostanie utworzona kopia w katalogu \'%s\'.</string>
     <string name="intent_aedict_empty">Kategoria \'Domyślne\' jest pusta</string>
     <string name="intent_aedict_category">Aby dodać karty AnkiDroid usuń wszystkie kategorie Notatnika lub dodaj jedną o nazwie \'default\'</string>
@@ -220,10 +220,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Później</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Nie pokazuj ponownie</string>
     <string name="dismiss_backup_warning_title">Ostrzeżenie o utracie danych</string>
-    <string name="dismiss_backup_warning_new_user">        Ze względu na zmiany prywatności w systemie Android Twoje dane i automatyczne kopie zapasowe zostaną usunięte z telefonu, jeśli aplikacja zostanie odinstalowana
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Ze względu na zmiany prywatności w systemie Android Twoje dane i automatyczne kopie zapasowe będą niedostępne, jeśli aplikacja zostanie odinstalowana
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Taka talia już istnieje</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">W przypadku wystąpienia problemów związanych z kolejnością talii (np. „10” pojawia się przed „2”), „2” należy zastąpić „02”.</string>
diff --git a/AnkiDroid/src/main/res/values-pl/10-preferences.xml b/AnkiDroid/src/main/res/values-pl/10-preferences.xml
index bb1697e1b5f8..a600c190a198 100644
--- a/AnkiDroid/src/main/res/values-pl/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-pl/10-preferences.xml
@@ -300,8 +300,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Ustawienia programisty</string>
     <string name="dev_options_enabled_pref" maxLength="41">Włącz opcje dla programistów</string>
     <string name="disable_dev_options">Wyłącz opcje dla programistów </string>
-    <string name="dev_options_warning">        Przed włączeniem opcji deweloperskich upewnij się, że wiesz co robisz. Te opcje są niebezpieczne i mogą zniszczyć aplikację lub uszkodzić kolekcję.\n\nZauważ, że te opcje nie są odpowiednie dla większości użytkowników i dlatego nie są przetłumaczone, więc są w języku angielskim.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-pl/17-model-manager.xml b/AnkiDroid/src/main/res/values-pl/17-model-manager.xml
index 824a8d3020b8..d061da19d934 100644
--- a/AnkiDroid/src/main/res/values-pl/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-pl/17-model-manager.xml
@@ -68,9 +68,9 @@
     <string name="model_delete_warning">Czy na pewno chcesz usunąć ten typ notatki?</string>
     <string name="field_delete_warning">Czy na pewno chcesz usunąć to pole?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Dodaj: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Sklonuj: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Wprowadź szablon, który przeglądarka kart będzie używała do wyświetlania twoich kart. Możesz użyć tego by wyświetlać bardziej zwięzłe odpowiedzi.\n\nSzablon \n\"Stolicą kraju {{Country}} jest:\"\nmoże być skrócony w przeglądarce kart do\n\"Stolica: {{Country}}\"</string>
     <string name="card_template_browser_appearance_question_format">Format pytania</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml b/AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml
index d057cb94269f..3c2117a1fbd5 100644
--- a/AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">A imagem é muito grande, por favor insira a imagem manualmente</string>
     <string name="note_editor_video_too_large">O arquivo de vídeo é muito grande, por favor insira o vídeo manualmente</string>
     <string name="note_editor_audio_too_large">O arquivo de áudio é muito grande, por favor insira o áudio manualmente</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Backup do Android em andamento. Por favor, tente novamente</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">Por favor use o iManager para que AnkiDroid possa adicionar atalhos</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Sua tela de início não permite que AnkiDroid adicione atalhos</string>
     <string name="create_shortcut_error">Erro ao adicionar atalho: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Opções do navegador</string>
     <string name="audio_saved">Gravação salva</string>
     <string name="deleting_selected_notes">Excluindo notas selecionadas</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Toque numa voz para ouvir
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voz deve ser instalada antes de usar
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Usar mesmo assim
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Erro de texto em fala (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Instalar
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Falha ao abrir configurações de texto para fala
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Faça login para baixar mais baralhos</string>
     <string name="deck_description_field_hint">Descrição</string>
     <string name="failed_to_copy">Falha ao copiar</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rBR/03-dialogs.xml b/AnkiDroid/src/main/res/values-pt-rBR/03-dialogs.xml
index 9642f607ec86..c19cd630f9e3 100644
--- a/AnkiDroid/src/main/res/values-pt-rBR/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-pt-rBR/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Erro de banco de dados</string>
     <string name="answering_error_message">Ocorreu um erro ao gravar na coleção. Isso pode estar relacionado a um banco de dados corrompido ou espaço insuficiente no disco.\n\nSe isso ocorrer frequentemente, tente verificar o banco de dados, reparar a coleção ou restaurá-la de um backup. Clique em \'Opções\' para isso.\n\nEm todo caso, isso pode ser um bug do AnkiDroid; relate o erro para que possamos verificar o problema.</string>
     <string name="answering_error_report">Reportar erro</string>
-    <string name="storage_full_message">Não há espaço suficiente livre para abrir o AnkiDroid. Libere espaço para continuar.</string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Você realmente deseja tentar reparar o banco de dados?\n\nAntes de iniciar a tentativa, uma cópia será criada na subpasta \"%s\".</string>
     <string name="intent_aedict_empty">Categoria \'padrão\' está vazia</string>
     <string name="intent_aedict_category">Para adicionar cartões ao AnkiDroid, remova todas as categorias das notas ou adicione uma com o nome \'default\'</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Mais tarde</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Não mostrar novamente</string>
     <string name="dismiss_backup_warning_title">Aviso de perda de dados</string>
-    <string name="dismiss_backup_warning_new_user">        Devido às alterações de privacidade do Android, seus dados e cópias automáticas serão excluídos do seu telefone se o aplicativo for desinstalado.
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Devido às alterações de privacidade do Android, seus dados e cópias automáticas serão inacessíveis se o aplicativo for desinstalado.
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Baralho já existe</string>
     <string name="empty_deck_name">O nome do deck não pode estar vazio</string>
     <string name="create_deck_numeric_hint">Se você tem problemas com a ordem dos baralhos (ex: ‘10’ aparecendo antes de ‘2’), troque o ‘2’ por ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rBR/10-preferences.xml b/AnkiDroid/src/main/res/values-pt-rBR/10-preferences.xml
index 232b194f22ba..a006180a68f7 100644
--- a/AnkiDroid/src/main/res/values-pt-rBR/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-pt-rBR/10-preferences.xml
@@ -296,8 +296,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Opções do desenvolvedor</string>
     <string name="dev_options_enabled_pref" maxLength="41">Ativar opções do desenvolvedor</string>
     <string name="disable_dev_options">Desativar opções do desenvolvedor</string>
-    <string name="dev_options_warning">        Por favor, certifique-se antes de ativar as opções do desenvolvedor. Estas opções são perigosas e podem quebrar o aplicativo ou corromper sua coleção.\n\nNote que essas opções não são adequadas para a maioria dos usuários, portanto, não são traduzidas, elas permanecerão em inglês.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-pt-rBR/17-model-manager.xml b/AnkiDroid/src/main/res/values-pt-rBR/17-model-manager.xml
index b82f3ae2cb6f..5108e4435626 100644
--- a/AnkiDroid/src/main/res/values-pt-rBR/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-pt-rBR/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Tem certeza de que deseja excluir esse modelo de notas?</string>
     <string name="field_delete_warning">Tem certeza que deseja excluir este campo?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Adicionar: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clonar: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Digite o modelo que o navegador de cards usará para exibir seus cards. Use isto para exibir uma resposta mais concisa.\n\nUm modelo frontal de\n\"A capital do {{Country}} é:\"\npode ser comprimido para\n\"Capital: {{Country}}\"</string>
     <string name="card_template_browser_appearance_question_format">Formato da questão</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml b/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml
index 6201d9b14079..2d3abf2ba9f5 100644
--- a/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Fundo</string>
     <string name="choose_an_image" maxLength="41">Selecionar imagem</string>
-    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Remover imagem de fundo</string>
     <string name="remove_background_image">Remover imagem de fundo?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restaurar predefinições</string>
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">A imagem é demasiado grande, por favor insira-a manualmente.</string>
     <string name="note_editor_video_too_large">O vídeo é demasiado grande, por favor insira-o manualmente.</string>
     <string name="note_editor_audio_too_large">O ficheiro de áudio é demasiado grande, por favor insira-o manualmente.</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Cópia de segurança do Android em progresso. Por favor, tente de novo.</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">Pode precisar de utilizar o iManager para permitir que o AnkiDroid adicione atalhos.</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">O seu ecrã de início não permite que o AnkiDroid adicione atalhos.</string>
     <string name="create_shortcut_error">Erro ao adicionar atalho: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Opções de Explorador</string>
     <string name="audio_saved">Gravação guardada</string>
     <string name="deleting_selected_notes">Apagar as notas selecionadas</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Toque numa voz para a ouvir
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Deve instalar esta \"Voz\", antes de a utilizar
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Utilizar mesmo assim
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Erro na conversão de texto para voz (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Instalar
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Falha na abertura das definições da conversão de texto para voz
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Por favor, inicie sessão para transferir mais baralhos</string>
     <string name="deck_description_field_hint">Descrição</string>
     <string name="failed_to_copy">Falha ao copiar</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rPT/03-dialogs.xml b/AnkiDroid/src/main/res/values-pt-rPT/03-dialogs.xml
index 7f48f7c8d9e8..5d3cc41cfeb7 100644
--- a/AnkiDroid/src/main/res/values-pt-rPT/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-pt-rPT/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Erro na base de dados</string>
     <string name="answering_error_message">Falha ao gravar na colecção. A base de dados pode estar corrompida ou pode não haver espaço suficiente no disco.\n\nSe isto acontecer frequentemente, tente \"Verificar a Base de Dados\", \"Reparar a Colecção\", ou \"Restaurar uma Cópia de Segurança\". Toque em \"opções\" para realizar uma destas acções.\n\nOu então pode ser um erro no AnkiDroid, reporte-o para que possa ser analisado.</string>
     <string name="answering_error_report">Comunicar erro</string>
-    <string name="storage_full_message">Não há espaço disponível para abrir o AnkiDroid. Liberte algum espaço para continuar.</string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Realmente deseja tentar reparar a base de dados?\n\nAntes de iniciar a tentativa, será criada uma cópia na subpasta \'%s\'.</string>
     <string name="intent_aedict_empty">A categoria \'predefinida\' está vazia</string>
     <string name="intent_aedict_category">Para adicionar fichas na AnkiDroid remova todas as categorias de notas ou adicione uma com o nome \'predefinida\'</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Mais tarde</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Não mostrar novamente</string>
     <string name="dismiss_backup_warning_title">Aviso de Perda de Dados</string>
-    <string name="dismiss_backup_warning_new_user">        Devido a alterações de privacidade do Android, os seus dados e cópias de segurança automáticas serão apagados se a aplicação for desinstalada
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Devido a alterações de privacidade do Android, não poderá aceder aos seus dados e cópias de segurança automáticas se a aplicação for desinstalada
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Este baralho já existe</string>
     <string name="empty_deck_name">O nome do baralho não pode estar vazio</string>
     <string name="create_deck_numeric_hint">Se tem problemas de ordenação com o seu baralho (e.g. o ‘10’ aparece antes do ‘2’), substitua o ‘2’ por ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rPT/10-preferences.xml b/AnkiDroid/src/main/res/values-pt-rPT/10-preferences.xml
index 6e98a71bff39..df2da8be351e 100644
--- a/AnkiDroid/src/main/res/values-pt-rPT/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-pt-rPT/10-preferences.xml
@@ -297,8 +297,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Opções de programador</string>
     <string name="dev_options_enabled_pref" maxLength="41">Ativar as opções de programador</string>
     <string name="disable_dev_options">Desativar opções do desenvolvedor</string>
-    <string name="dev_options_warning">        Antes de activar as opções de programador, assegure-se que é mesmo isso que quer fazer. Estas opções são perigosas e podem estragar a aplicação ou corromper a sua colecção.\n\nEstas opções são destinadas a programadores, daí não terem tradução e estarem em Inglês.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-pt-rPT/17-model-manager.xml b/AnkiDroid/src/main/res/values-pt-rPT/17-model-manager.xml
index 63588ebdf79f..95b99fca8e7f 100644
--- a/AnkiDroid/src/main/res/values-pt-rPT/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-pt-rPT/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Tem a certeza que quer apagar este tipo de nota?</string>
     <string name="field_delete_warning">Tem a certeza que pretende eliminar este campo?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Adicionar: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clonar: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Introduza o modelo que vai ser utilizado para apresentar as suas fichas. Utilize isto para apresentar uma resposta mais concisa.\n\nUm modelo para a frente da ficha\n\"A capital do {{país}} é:\"\npode ser reduzida para\n\"Capital: {{País}}\"</string>
     <string name="card_template_browser_appearance_question_format">Formato de Pergunta</string>
diff --git a/AnkiDroid/src/main/res/values-ro/02-strings.xml b/AnkiDroid/src/main/res/values-ro/02-strings.xml
index 8cf9db49e352..62e019ab1d42 100644
--- a/AnkiDroid/src/main/res/values-ro/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ro/02-strings.xml
@@ -237,7 +237,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -310,20 +310,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-ro/03-dialogs.xml b/AnkiDroid/src/main/res/values-ro/03-dialogs.xml
index ba248204934a..740a43658e6f 100644
--- a/AnkiDroid/src/main/res/values-ro/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ro/03-dialogs.xml
@@ -66,7 +66,7 @@
     <string name="answering_error_title">Eroare a bazei de date</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Raportează eroare</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
@@ -216,10 +216,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Mai târziu</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-ro/10-preferences.xml b/AnkiDroid/src/main/res/values-ro/10-preferences.xml
index 8d04dae2c5d9..fe449472cd22 100644
--- a/AnkiDroid/src/main/res/values-ro/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ro/10-preferences.xml
@@ -299,8 +299,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-ro/17-model-manager.xml b/AnkiDroid/src/main/res/values-ro/17-model-manager.xml
index 41068390377f..9612308a4c60 100644
--- a/AnkiDroid/src/main/res/values-ro/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ro/17-model-manager.xml
@@ -66,9 +66,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Are you sure you wish to delete this field?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>
diff --git a/AnkiDroid/src/main/res/values-ru/02-strings.xml b/AnkiDroid/src/main/res/values-ru/02-strings.xml
index 5c97e93b4988..0a0a57363097 100644
--- a/AnkiDroid/src/main/res/values-ru/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ru/02-strings.xml
@@ -241,7 +241,7 @@
     <string name="note_editor_image_too_large">Изображение слишком большое. Вставьте изображение вручную</string>
     <string name="note_editor_video_too_large">Видео слишком большое. Вставьте видео вручную</string>
     <string name="note_editor_audio_too_large">Аудио слишком большое. Вставьте аудио вручную</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Выполняется резервное копирование Android. Попробуйте еще раз</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">Возможно, вам потребуется iManager, чтобы AnkiDroid мог добавлять ярлыки</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Ваш домашний экран не позволяет AnkiDroid добавлять ярлыки</string>
     <string name="create_shortcut_error">Ошибка при добавлении ярлыка: %s</string>
@@ -315,15 +315,14 @@
     <string name="browser_options_dialog_heading">Параметры списка карточек</string>
     <string name="audio_saved">Запись сохранена </string>
     <string name="deleting_selected_notes">Выбранные записи удаляются</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Нажмите на голосе, чтобы послушать
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Нужно установить голос перед использованием</string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Всё равно использовать </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Ошибка синтеза речи (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Интернет</string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Установить</string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Не удалось открыть настройки синтеза</string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Пожалуйста, войдите, чтобы скачать больше колод</string>
     <string name="deck_description_field_hint">Описание</string>
     <string name="failed_to_copy">Не удалось скопировать</string>
diff --git a/AnkiDroid/src/main/res/values-ru/03-dialogs.xml b/AnkiDroid/src/main/res/values-ru/03-dialogs.xml
index 6868fabf7951..73e021187d09 100644
--- a/AnkiDroid/src/main/res/values-ru/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ru/03-dialogs.xml
@@ -68,7 +68,7 @@
     <string name="answering_error_title">Ошибка в базе данных</string>
     <string name="answering_error_message">Не удалось записать в коллекцию. База данных может быть повреждена, или не хватает места в хранилище.\n\nПопробуйте проверить базу данных или восстановить коллекцию из резервной копии.\nОднако, это может быть ошибкой в AnkiDroid. Пожалуйста, сообщите об этом разработчикам.</string>
     <string name="answering_error_report">Сообщить об ошибке</string>
-    <string name="storage_full_message">Недостаточно свободного места для запуска AnkiDroid. Освободите немного места на устройстве,  чтобы продолжить.</string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Вы действительно хотите починить базу данных?\n\nПеред восстановлением копия базы данных будет помещена в папку «%s».</string>
     <string name="intent_aedict_empty">Категория «default» пуста</string>
     <string name="intent_aedict_category">Чтобы добавить карточки в AnkiDroid, удалите все категории «Notepad» или создайте категорию «default»</string>
@@ -221,10 +221,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Позже</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Больше не показывать</string>
     <string name="dismiss_backup_warning_title">Внимание: потеря данных</string>
-    <string name="dismiss_backup_warning_new_user">        В связи с изменениями конфиденциальности Android, при удалении приложения ваши данные и автоматизированные резервные копии будут удалены с вашего телефона
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        В связи с изменениями конфиденциальности Android, после удалении приложения ваши данные и автоматизированные резервные копии будут недоступны
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Колода уже существует</string>
     <string name="empty_deck_name">Название колоды не может быть пустым</string>
     <string name="create_deck_numeric_hint">Если у вас возникли проблемы с сортировкой колоды (например, \'10\' появляется перед \'2\'), замените \'2\' на \'02\'</string>
diff --git a/AnkiDroid/src/main/res/values-ru/10-preferences.xml b/AnkiDroid/src/main/res/values-ru/10-preferences.xml
index 4be4e744e4bc..8410c29f97af 100644
--- a/AnkiDroid/src/main/res/values-ru/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ru/10-preferences.xml
@@ -299,8 +299,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Настройки разработчика</string>
     <string name="dev_options_enabled_pref" maxLength="41">Включить параметры для разработчиков</string>
     <string name="disable_dev_options">Отключить настройки разработчика</string>
-    <string name="dev_options_warning">        Пожалуйста, убедитесь, что вы знаете что делаете перед включением опций разработчика. Эти параметры являются опасными и могут нарушить приложение или повредить вашу коллекцию.\n\nОбратите внимание, что эти опции не подходят для большинства пользователей и поэтому не переводятся, поэтому они находятся на английском языке.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-ru/17-model-manager.xml b/AnkiDroid/src/main/res/values-ru/17-model-manager.xml
index 89298eb75ada..7a2468e33d6e 100644
--- a/AnkiDroid/src/main/res/values-ru/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ru/17-model-manager.xml
@@ -68,9 +68,9 @@
     <string name="model_delete_warning">Вы уверены, что хотите удалить этот тип записи?</string>
     <string name="field_delete_warning">Удалить это поле?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Добавить: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Дублировать: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Введите шаблон, который будет использоваться в списке карточек. Например, так можно показывать ответ более сжать.\n\nШаблон лица\n«Столицей {{Country}} является:»\n в списке карточке можно ужать до \n«Столица: {{Country}}»</string>
     <string name="card_template_browser_appearance_question_format">Формат вопроса</string>
diff --git a/AnkiDroid/src/main/res/values-sat/02-strings.xml b/AnkiDroid/src/main/res/values-sat/02-strings.xml
index 4c5424779c14..68be718261a7 100644
--- a/AnkiDroid/src/main/res/values-sat/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sat/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">ᱪᱤᱛᱟᱹᱨ ᱫᱚ ᱟᱹᱰᱤ ᱢᱟᱨᱟᱝ ᱠᱟᱱᱟ, ᱫᱟᱭᱟ ᱠᱟᱛᱮ ᱪᱤᱛᱟᱹᱨ ᱥᱮᱞᱮᱫ ᱢᱮ</string>
     <string name="note_editor_video_too_large">ᱵᱷᱤᱰᱤᱭᱳ ᱯᱷᱤᱞᱤᱢ ᱫᱚ ᱟᱹᱰᱤ ᱢᱟᱨᱟᱝ ᱠᱟᱱᱟ, ᱫᱟᱭᱟᱠᱟᱛᱮ ᱵᱷᱤᱰᱤᱭᱳ ᱥᱮᱞᱮᱫᱽ ᱢᱮ</string>
     <string name="note_editor_audio_too_large">ᱚᱰᱤᱭᱚ ᱯᱷᱤᱞ ᱫᱚ ᱟᱹᱰᱤ ᱢᱟᱨᱟᱝ ᱠᱟᱱᱟ, ᱫᱟᱭᱟ ᱠᱟᱛᱮ ᱚᱰᱤᱭᱚ ᱥᱮᱞᱮᱫ ᱢᱮ</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">       ᱮᱱᱰᱨᱚᱭᱮᱰ ᱵᱮᱠᱟᱯ ᱪᱟᱞᱟᱜ ᱠᱟᱱᱟ, ᱫᱟᱭᱟ ᱠᱟᱛᱮᱡᱽ ᱟᱨᱦᱚᱸ ᱨᱤᱠᱟᱹᱭ ᱢᱮ</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">AnkiDroid ᱥᱚᱴᱠᱚᱴ ᱥᱮᱞᱮᱫ ᱪᱷᱚ ᱞᱟᱹᱜᱤᱫ ᱟᱢ iManager ᱵᱮᱵᱷᱟᱨ ᱫᱟᱲᱮᱭᱟᱜᱼᱟᱢ</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">ᱟᱢᱟᱜ ᱚᱲᱟᱜ ᱥᱠᱨᱤᱱ AnkiDroid ᱥᱚᱴᱠᱚᱴ ᱵᱟᱝ ᱥᱮᱞᱮᱫ ᱪᱷᱚᱭᱟᱭ</string>
     <string name="create_shortcut_error">ᱥᱚᱴᱠᱚᱴ ᱥᱮᱞᱮᱫ ᱵᱷᱩᱞ: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">ᱨᱮᱠᱳᱨᱰ ᱟᱠᱟᱱᱟ</string>
     <string name="deleting_selected_notes">ᱵᱟᱪᱷᱟᱣ ᱟᱠᱟᱱ ᱱᱳᱴᱥ ᱵᱚᱫᱚᱞ</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        ᱥᱮᱞᱮᱫᱚᱜ ᱞᱟᱹᱜᱤᱫ ᱢᱤᱫ ᱨᱚᱲ ᱴᱟᱯ ᱢᱮ
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">ᱵᱮᱵᱷᱟᱨ ᱠᱷᱚᱱ ᱢᱟᱲᱟᱝ ᱛᱮ ᱨᱚᱲ ᱥᱮᱞᱮᱫ ᱦᱩᱭᱩᱜ ᱢᱟ
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">ᱮᱱᱦᱚᱸ ᱵᱮᱵᱷᱟᱨ ᱢᱮ
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">ᱚᱞ ᱠᱷᱚᱱ ᱨᱚᱲ ᱪᱮᱛᱟᱱ ᱨᱮ ᱯᱩᱥᱴᱟᱹ (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        ᱤᱱᱴᱟᱨᱱᱮᱴ
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        ᱤᱱᱥᱴᱚᱞ ᱢᱮ
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        ᱚᱞ ᱪᱤᱠᱤ ᱛᱮ ᱨᱚᱲ ᱥᱮᱴᱤᱸᱜᱽᱥ ᱨᱮ ᱩᱫᱩᱜ ᱦᱚᱪᱚ ᱵᱟᱹᱱᱩᱜ ᱟ
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">ᱮᱴᱟᱜ ᱰᱮᱠ ᱠᱚ ᱰᱟᱩᱱᱞᱚᱰ ᱞᱟᱹᱜᱤᱫ ᱞᱚᱜᱤᱱ ᱢᱮ</string>
     <string name="deck_description_field_hint">ᱞᱟᱹᱱᱟᱹᱤ</string>
     <string name="failed_to_copy">ᱠᱚᱯᱤ ᱵᱟᱭ ᱫᱟᱲᱮᱭᱟᱜ ᱠᱟᱱᱟ</string>
diff --git a/AnkiDroid/src/main/res/values-sat/03-dialogs.xml b/AnkiDroid/src/main/res/values-sat/03-dialogs.xml
index 4df5e25aeb76..ce68b82b3ae1 100644
--- a/AnkiDroid/src/main/res/values-sat/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sat/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">ᱥᱟᱹᱠᱷᱭᱟᱛ ᱵᱟᱹᱭᱥᱟᱣ ᱵᱷᱩᱞ ᱦᱩᱭᱮᱱᱟ</string>
     <string name="answering_error_message">ᱴᱩᱢᱟᱹᱞ ᱛᱮ ᱚᱞ ᱵᱷᱩᱞ ᱾ database ᱫᱚ ᱠᱦᱟᱨᱟᱯ ᱜᱮᱭᱟ ᱟᱨ ᱵᱟᱝᱠᱷᱟᱱ ᱰᱤᱥᱠ ᱨᱮ ᱥᱯᱮᱥ ᱵᱟᱱᱩᱜᱟ ᱾ \n\nᱡᱚᱫᱤ ᱵᱟᱨᱚᱢᱵᱟᱨ ᱱᱚᱠᱟ ᱦᱩᱭᱩᱜ ᱠᱟᱱᱟ, ᱮᱱᱰᱮᱠᱷᱟᱱ ᱟᱨ ᱢᱤᱫ ᱡᱮᱠᱷᱟ ᱰᱟᱴᱟᱵᱮᱥ ᱪᱮᱠ ᱯᱮ ᱟᱨ ᱵᱟᱝᱠᱷᱟᱱ backup ᱠᱷᱚᱱ ᱰᱟᱴᱟ restore ᱛᱟᱵᱚᱱ ᱯᱮ ᱾ ᱚᱱᱟ ᱞᱟᱹᱜᱤᱫ \&quot;options\&quot; ᱨᱮ ᱚᱛᱟᱭ ᱯᱮ ᱾\n\ᱟᱨ ᱵᱟᱝᱠᱷᱟᱱ ᱱᱚᱟ ᱫᱚ bug ᱦᱩᱭ ᱫᱟᱲᱮᱭᱟᱜᱟ; ᱫᱚᱭᱟᱠᱟᱛᱮ report ᱯᱮ ᱾ </string>
     <string name="answering_error_report">ᱦᱩᱰᱟᱜ ᱥᱚᱱᱫᱮᱥ</string>
-    <string name="storage_full_message">ᱮᱱᱠᱤᱰᱨᱚᱭᱮᱰ ᱪᱷᱟᱯᱟ ᱞᱟᱹᱜᱤᱫ ᱛᱮ ᱟᱹᱰᱤ ᱵᱟᱹᱲᱤᱡ ᱥᱴᱳᱨᱮᱡᱽ ᱡᱟᱭᱜᱟ ᱵᱟᱹᱱᱩᱜᱼᱟ ᱾ ᱞᱟᱦᱟ ᱛᱮ ᱪᱟᱞᱟᱜ ᱞᱟᱹᱜᱤᱫ ᱡᱟᱭᱜᱟ ᱵᱮᱵᱚᱦᱟᱨ ᱢᱮ ᱾</string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">ᱟᱢ ᱫᱚ ᱱᱚᱶᱟ database ᱥᱟᱡᱟᱣ ᱥᱮᱱᱟᱢ ᱠᱟᱱᱟ ᱥᱮ ? \n\nᱮᱛᱷᱚᱵ ᱢᱟᱲᱟᱝ ᱨᱮ, ᱢᱤᱫᱴᱟᱝ ᱠᱚᱯᱤ \&quot;%s\&quot; ᱥᱚᱵᱼᱯᱷᱚᱞᱰᱟᱨ ᱨᱮ ᱛᱮᱭᱨᱚᱜᱽᱟ ᱱᱟᱦ ᱾</string>
     <string name="intent_aedict_empty">ᱴᱩᱢᱟᱹᱞ \&quot;default\&quot; ᱠᱷᱟᱹᱞᱤ ᱜᱮᱭᱟ</string>
     <string name="intent_aedict_category">AnkiDroid ᱛᱮ ᱠᱟᱰ ᱥᱮᱞᱮᱫ ᱞᱟᱹᱜᱤᱫ Notepad ᱴᱩᱢᱟᱹᱞ ᱵᱷᱮᱜᱟᱨ ᱠᱟᱜ ᱢᱮ ᱟᱨ ᱵᱟᱝᱠᱷᱟᱱ “default” ᱧᱩᱛᱩᱢ ᱠᱟᱜ ᱢᱮ</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">ᱛᱟᱭᱚᱢ ᱛᱮ</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">ᱤᱧ ᱫᱚ ᱵᱟᱧ ᱧᱮᱞᱚᱜᱼᱟ</string>
     <string name="dismiss_backup_warning_title">ᱰᱮᱴᱟ ᱞᱚᱥᱴ ᱟᱣᱟᱨᱰ</string>
-    <string name="dismiss_backup_warning_new_user">        ᱟᱱᱰᱨᱚᱭᱮᱰ ᱯᱨᱟᱭᱵᱷᱮᱴᱤ ᱵᱮᱸᱠᱤᱝ ᱠᱷᱟᱹᱛᱤᱨ ᱟᱢᱟᱜ ᱰᱟᱴᱟ ᱟᱨ ᱚᱴᱚᱢᱮᱴᱤᱠ ᱵᱮᱠᱤᱯ ᱠᱚ ᱟᱢᱟᱜ ᱯᱷᱚᱱ ᱠᱷᱚᱱ ᱰᱤᱞᱤᱴ ᱦᱩᱭᱩᱜ ᱟ ᱡᱩᱫᱤ ᱟᱢ ᱱᱚᱶᱟ ᱮᱯ ᱵᱚᱫᱚᱞ ᱮᱫ ᱟ
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        ᱟᱱᱰᱨᱚᱭᱮᱰ ᱯᱨᱟᱭᱵᱷᱮᱴᱤ ᱪᱮᱱᱡᱟᱨ ᱠᱷᱟᱹᱛᱤᱨ ᱟᱢᱟᱜ ᱰᱮᱴᱟ ᱟᱨ ᱚᱴᱚᱢᱮᱴᱤᱠ ᱵᱮᱠ-ᱟᱯ ᱠᱚ ᱮᱯᱞᱤᱠᱮᱥᱚᱱ ᱵᱚᱫᱚᱞ ᱞᱮᱱ ᱠᱷᱟᱱ ᱵᱟᱝ ᱥᱮᱴᱮᱨᱚᱜ-ᱟ
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">ᱰᱮᱠ ᱱᱤᱛᱚᱜ ᱢᱮᱱᱟᱜᱼᱟ</string>
     <string name="empty_deck_name">ᱰᱮᱠ ᱧᱩᱛᱩᱢ ᱵᱟᱱᱩᱜᱼᱟ</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-sat/10-preferences.xml b/AnkiDroid/src/main/res/values-sat/10-preferences.xml
index 671711b4852a..91ad5bbf9ea3 100644
--- a/AnkiDroid/src/main/res/values-sat/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sat/10-preferences.xml
@@ -296,8 +296,7 @@
     <string name="pref_cat_dev_options" maxLength="41">ᱰᱮᱵᱽᱞᱚᱯᱟᱨ ᱵᱟᱪᱷᱟᱣ</string>
     <string name="dev_options_enabled_pref" maxLength="41">ᱰᱮᱵᱞᱚᱯᱟᱨ ᱵᱟᱪᱷᱟᱣ ᱠᱚ ᱮᱠᱴᱤᱵᱽ ᱢᱮ</string>
     <string name="disable_dev_options">ᱰᱮᱵᱽᱞᱚᱯᱚᱨ ᱚᱯᱥᱚᱱ ᱠᱚ ᱵᱚᱫᱚᱞ ᱢᱮ</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-sat/17-model-manager.xml b/AnkiDroid/src/main/res/values-sat/17-model-manager.xml
index 51d70a993ba7..13bfd8a817bb 100644
--- a/AnkiDroid/src/main/res/values-sat/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-sat/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">ᱥᱭᱚᱨ ᱱᱚᱶᱟ ᱠᱷᱟᱴᱚ ᱵᱤᱪᱟᱹᱨ ᱯᱨᱚᱠᱟᱨ‌ ᱜᱮᱫ ᱜᱤᱲᱤ ᱥᱮᱱᱟᱢ ᱠᱟᱱᱟ?</string>
     <string name="field_delete_warning">ᱥᱭᱚᱨ ᱱᱚᱶᱟ ᱡᱟᱭᱜᱟ ᱜᱮᱫ ᱜᱤᱲᱤ ᱥᱟᱱᱟᱢ ᱠᱟᱱᱟ?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">ᱥᱮᱞᱮᱫᱺ %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">ᱠᱞᱚᱱᱺ%1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">ᱪᱷᱟᱸᱪ ᱠᱚ ᱮᱢᱟᱱ ᱚᱞ ᱢᱮ, ᱠᱟᱰ ᱵᱨᱟᱩᱡᱚᱨ ᱟᱢᱟᱜ ᱠᱟᱰ ᱫᱮᱠᱷᱟᱣ ᱛᱟᱢᱟᱭ ᱾ ᱛᱷᱤᱠ ᱛᱮᱞᱟ ᱫᱮᱠᱷᱟᱣ ᱞᱟᱹᱜᱤᱫ ᱱᱚᱶᱟ ᱵᱮᱵᱷᱟᱨ ᱢᱮ ᱾ \n\n ᱫᱚ \n ᱨᱮᱭᱟᱜ ᱯᱩᱭᱞᱩ ᱪᱷᱟᱸᱪ ᱠᱟᱱᱟ “{{Country}}ᱼᱟᱜ ᱨᱟᱡᱜᱟᱲ ᱫᱚᱺ”\nᱫᱚ ᱠᱟᱰ ᱵᱨᱟᱩᱡᱚᱨ ᱨᱮ ᱠᱷᱟᱴᱚ ᱫᱟᱲᱮᱼᱟᱜ ᱟᱢ \n“ᱫᱤᱥᱚᱢᱺ {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">ᱠᱩᱠᱞᱤ ᱛᱮᱞᱟ ᱠᱩᱞ</string>
diff --git a/AnkiDroid/src/main/res/values-sc/02-strings.xml b/AnkiDroid/src/main/res/values-sc/02-strings.xml
index fefde0e090a0..998638e7a8e6 100644
--- a/AnkiDroid/src/main/res/values-sc/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sc/02-strings.xml
@@ -236,7 +236,7 @@
     <string name="note_editor_image_too_large">S\'immàgine est tropu manna, inserta·la in manera manuale</string>
     <string name="note_editor_video_too_large">Custu documentu vìdeu est tropu mannu, inserta·lu in manera manuale</string>
     <string name="note_editor_audio_too_large">Custu documentu àudio est tropu mannu, inserta·lu in manera manuale</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Còpia de seguresa de Android in cursu. Torra a proare, pro praghere</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">Dias pòdere tènnere bisòngiu de impreare iManager pro permìtere a AnkiDroid de annànghere incurtzadas</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">S\'ischermada printzipale tua non permitet a AnkiDroid de annànghere incurtzadas</string>
     <string name="create_shortcut_error">Errore annanghende s\'incurtzada: %s</string>
@@ -308,19 +308,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Registratzione sarvada</string>
     <string name="deleting_selected_notes">Iscantzellende sas notas seletzionadas</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Toca una boghe pro l\'ascurtare
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Sa boghe diat dèpere èssere installada in antis de s\'impreu
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Imprea su matessi
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Errore de sìntesi de boghe (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Ìnternet</string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Installa
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Abertura de sas impostatziones de sìntesi vocale fallida
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Intra pro iscarrigare prus matzos</string>
     <string name="deck_description_field_hint">Descritzione</string>
     <string name="failed_to_copy">Còpia fallida</string>
diff --git a/AnkiDroid/src/main/res/values-sc/03-dialogs.xml b/AnkiDroid/src/main/res/values-sc/03-dialogs.xml
index 0b8ac32bff10..8b00e12f9b6a 100644
--- a/AnkiDroid/src/main/res/values-sc/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sc/03-dialogs.xml
@@ -67,7 +67,7 @@
                                              Si custu acontesset prus de su sòlitu proa a verificare sa base de datos, ariparare sa colletzione o a la ripristinare dae una còpia de seguresa. Incarca in “optziones” pro lu fàghere.\n
                                              \\O diat pòdere èssere fintzas unu problema de AnkiDroid; pro praghere sinnala s\'errore pro nos permìtere de lu verificare.</string>
     <string name="answering_error_report">Sinnala una faddina</string>
-    <string name="storage_full_message">Non b\'at ispàtziu de memòria bastante pro abèrrere AnkiDroid. Lìbera unu pagu de ispàtziu pro sighire.</string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Cheres a beru proare a riparare sa base de datos?\n
                    \n
                    In antis de incumintzare cun sa proa s\'at a creare una còpia in sa suta-cartella “%s”.</string>
@@ -226,10 +226,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Prus a tardu</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Non lu torres a mustrare</string>
     <string name="dismiss_backup_warning_title">Avisu de pèrdida de datos</string>
-    <string name="dismiss_backup_warning_new_user">        Pro neghe de sas modìficas a sa riservadesa de Android, sos datos tuos e sas còpias de seguresa automàticas tuas s\'ant a iscantzellare dae su telèfonu tuo si as a disinstallare s\'aplicatzione
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Pro neghe de sas modìficas a sa riservadesa de Android, non s\'at a pòdere atzèdere a sos datos tuos e a sas còpias de seguresa automàticas tuas si as a disinstallare s\'aplicatzione
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Su matzu esistit giai</string>
     <string name="empty_deck_name">Su nùmene de su matzu non podet èssere bòidu</string>
     <string name="create_deck_numeric_hint">Si tenes problemas de òrdine de su matzu (a es. ‘10’ aparit in antis de ‘2’), remplasa ‘2’ cun ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-sc/10-preferences.xml b/AnkiDroid/src/main/res/values-sc/10-preferences.xml
index b20799979594..3fe9c90b1acb 100644
--- a/AnkiDroid/src/main/res/values-sc/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sc/10-preferences.xml
@@ -296,8 +296,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Optziones de isvilupu</string>
     <string name="dev_options_enabled_pref" maxLength="41">Abìlita sas optziones de isvilupu</string>
     <string name="disable_dev_options">Disabìlita sas optziones de isvilupu</string>
-    <string name="dev_options_warning">        Assegura·ti de s\'intentu tuo in antis de abilitare sas optziones de isvilupu. Custas optziones sunt perigulosas e diant pòdere segare s\'aplicatzione o corrùmpere sa colletzione tua.\n\nTene in contu chi custas optziones non sunt adatas pro sa parte manna de sos utentes e pro custa resone non sunt traduidas, duncas sunt in inglesu.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-sc/17-model-manager.xml b/AnkiDroid/src/main/res/values-sc/17-model-manager.xml
index 01610bc01a64..7cdbc7a97ef8 100644
--- a/AnkiDroid/src/main/res/values-sc/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-sc/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Ses seguru de chèrrere iscantzellare custa casta de nota?</string>
     <string name="field_delete_warning">Ses seguru de chèrrere iscantzellare custu campu?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Annanghe: %1$s</string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clona: %1$s</string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Inserta su mollu chi su navigadore de cartas at a impreare pro ammustrare sas cartas tuas. Imprea custu pro visualizare una risposta prus cuntzisa.\n
                                              \n
diff --git a/AnkiDroid/src/main/res/values-sk/02-strings.xml b/AnkiDroid/src/main/res/values-sk/02-strings.xml
index 1aa078fa384e..8384227ef25f 100644
--- a/AnkiDroid/src/main/res/values-sk/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sk/02-strings.xml
@@ -241,7 +241,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Prebieha Android záloha. Prosím, skúste znovu</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">Budete musieť použiť iManager, aby umožnil AnkiDroid pridávať zástupcov</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Vaša domovská obrazovka neumožňuje, aby AnkiDroid pridal zástupcov</string>
     <string name="create_shortcut_error">Chyba pri pridávaní odkazu: %s</string>
@@ -315,20 +315,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-sk/03-dialogs.xml b/AnkiDroid/src/main/res/values-sk/03-dialogs.xml
index 13775ea7ea11..3aa9ad11edc8 100644
--- a/AnkiDroid/src/main/res/values-sk/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sk/03-dialogs.xml
@@ -68,7 +68,7 @@
     <string name="answering_error_title">Chyba databázy</string>
     <string name="answering_error_message">Zápis zbierky zlyhal. Databáza môže byť poškodená alebo na úložisku nie je dostatok miesta.\n\nAk sa to stáva častejšie, skontrolujte databázu, opravte zbierku alebo ju obnovte zo zálohy. Ak to chcete urobiť, stlačte  „možnosti” .\n\Môže ísť aj o chybu aplikácie; prosím oznámte túto chybu aby sme to mohli skontrolovať.</string>
     <string name="answering_error_report">Nahlásiť chybu</string>
-    <string name="storage_full_message">Nedostatok voľného miesta. Pre spustenie aplikácie AnkiDroid najprv uvoľnite miesto v pamäti.</string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Naozaj chcete skúsiť opraviť databázu?\n\nPred začatím pokusu o opravenie bude vytvorená kópia v podpriečinku \"%s\".</string>
     <string name="intent_aedict_empty">Kategória \"predvolený\" je prázdna</string>
     <string name="intent_aedict_category">Ak chcete pridať kartičky do AnkiDroid, odstráňte všetky kategórie poznámkového bloku alebo pridajte jednu s názvom \"predvolený\"</string>
@@ -220,8 +220,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Neskôr</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Nabudúce nezobrazovať</string>
     <string name="dismiss_backup_warning_title">Možná strata údajov!</string>
-    <string name="dismiss_backup_warning_new_user">Z dôvodu zmien ochrany súkromia budú vaše údaje a automatické zálohy odstránené z pamäti ak odinštalujete aplikáciu AnkiDroid.</string>
-    <string name="dismiss_backup_warning_upgrade">Z dôvodu zmien ochrany súkromia budú vaše údaje a automatické zálohy neprístupné ak odinštalujete aplikáciu AnkiDroid.</string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Tento balíček už existuje</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">Pri problémoch s poradím balíčkov (napr. „10\" v poradí pred „2\") zmeňte názov z „2\" na „02\".</string>
diff --git a/AnkiDroid/src/main/res/values-sk/10-preferences.xml b/AnkiDroid/src/main/res/values-sk/10-preferences.xml
index d56e290f5483..226cfc4ecf45 100644
--- a/AnkiDroid/src/main/res/values-sk/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sk/10-preferences.xml
@@ -301,8 +301,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-sk/17-model-manager.xml b/AnkiDroid/src/main/res/values-sk/17-model-manager.xml
index 13117b6adcfb..f8d9c1a06a15 100644
--- a/AnkiDroid/src/main/res/values-sk/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-sk/17-model-manager.xml
@@ -68,9 +68,9 @@
     <string name="model_delete_warning">Ste si istý, že si želáte vymazať tento typ poznámok?</string>
     <string name="field_delete_warning">Skutočne si prajete odstrániť toto pole?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Pridať: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Klon: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Vložte šablónu, ktorú prehliadač kartičiek použije na zobrazenie vašich kartičiek. Použite to na zobrazenie stručnejšej odpovede.\n\nPredok šablóny\n“Hlavné mesto {{Country}} je:”\nmôže byť v prehliadači kartičiek skrátené na\n“Hlavné mesto: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Formát otázky</string>
diff --git a/AnkiDroid/src/main/res/values-sl/02-strings.xml b/AnkiDroid/src/main/res/values-sl/02-strings.xml
index 091d763aec2a..98daf148c909 100644
--- a/AnkiDroid/src/main/res/values-sl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sl/02-strings.xml
@@ -241,7 +241,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -315,20 +315,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-sl/03-dialogs.xml b/AnkiDroid/src/main/res/values-sl/03-dialogs.xml
index 99d4f98e7b5c..99249bbec07d 100644
--- a/AnkiDroid/src/main/res/values-sl/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sl/03-dialogs.xml
@@ -68,7 +68,7 @@
     <string name="answering_error_title">Napaka podatkovne zbirke</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Prijavi napako</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Ali res želite popraviti podatkovno zbirko?\n\nPred poizkusom bo v mapi \"%s\" ustvarjena kopija.</string>
     <string name="intent_aedict_empty">Kategorija \"privzeta\" je prazna</string>
     <string name="intent_aedict_category">Za dodajanje kartic v AnkiDroid odstranite vse kategorija beležnice ali dodajte eno z imenom \"privzeta\"</string>
@@ -220,10 +220,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-sl/10-preferences.xml b/AnkiDroid/src/main/res/values-sl/10-preferences.xml
index b089598c87cc..ca1609ee775c 100644
--- a/AnkiDroid/src/main/res/values-sl/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sl/10-preferences.xml
@@ -301,8 +301,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-sl/17-model-manager.xml b/AnkiDroid/src/main/res/values-sl/17-model-manager.xml
index aa11a5c055f3..4016155625e4 100644
--- a/AnkiDroid/src/main/res/values-sl/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-sl/17-model-manager.xml
@@ -68,9 +68,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Ali res želite izbrisati to polje?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Dodaj: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Kloniraj: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>
diff --git a/AnkiDroid/src/main/res/values-sq/02-strings.xml b/AnkiDroid/src/main/res/values-sq/02-strings.xml
index dd0094ef6cd6..097abd4b8461 100644
--- a/AnkiDroid/src/main/res/values-sq/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sq/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-sq/03-dialogs.xml b/AnkiDroid/src/main/res/values-sq/03-dialogs.xml
index 2da1db3d7508..f0c68800573d 100644
--- a/AnkiDroid/src/main/res/values-sq/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sq/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Gabim në bazën e të dhënave</string>
     <string name="answering_error_message">Shkrimi në koleksion dështoi. Baza e të dhënave mund të jetë e dëmtuar ose mund të mos ketë hapësirë ​​boshe të mjaftueshme në disk.\n\nNëse kjo ndodh më shpesh, provo të kontrollosh bazën e të dhënave, të riparosh koleksionin ose ta rivendosësh atë nga një kopje rezervë. Prekni \"opsionet\" për këtë.\n\Ose mund të jetë edhe një gabim i AnkiDroid; ju lutemi raportoni gabimin në mënyrë që ta kontrollojmë këtë.</string>
     <string name="answering_error_report">Raportoni gabimin</string>
-    <string name="storage_full_message">Nuk ka hapësirë ​​të mjaftueshme të ruajtjes së lirë për të hapur AnkiDroid. Liro pak hapësirë ​​për të vazhduar.</string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Dëshiron vërtet të provosh të riparosh bazën e të dhënave?\n\nPara fillimit të përpjekjes, do të krijohet një kopje në nënfolderin \"%s\".</string>
     <string name="intent_aedict_empty">Kategoria \"e parazgjedhur\" është bosh</string>
     <string name="intent_aedict_category">Për të shtuar karta në AnkiDroid, hiqni të gjitha kategoritë e Notepad ose shtoni një të quajtur \"default\"</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-sq/10-preferences.xml b/AnkiDroid/src/main/res/values-sq/10-preferences.xml
index 29e92629b16c..2afb72668806 100644
--- a/AnkiDroid/src/main/res/values-sq/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sq/10-preferences.xml
@@ -297,8 +297,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-sq/17-model-manager.xml b/AnkiDroid/src/main/res/values-sq/17-model-manager.xml
index 6b89a122d404..eff2650b23bb 100644
--- a/AnkiDroid/src/main/res/values-sq/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-sq/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Are you sure you wish to delete this field?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>
diff --git a/AnkiDroid/src/main/res/values-sr/02-strings.xml b/AnkiDroid/src/main/res/values-sr/02-strings.xml
index 50f4e52cb8f0..a94b6227c402 100644
--- a/AnkiDroid/src/main/res/values-sr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sr/02-strings.xml
@@ -237,7 +237,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -310,20 +310,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-sr/03-dialogs.xml b/AnkiDroid/src/main/res/values-sr/03-dialogs.xml
index 97bfdfa7324d..f360acc37502 100644
--- a/AnkiDroid/src/main/res/values-sr/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sr/03-dialogs.xml
@@ -66,7 +66,7 @@
     <string name="answering_error_title">Грешка базе података</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Извести о грешци</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Да ли заиста желите да обновите базу података?\n\nДо почетка обнављања, копија базе података ће бити смештена у фасциклу \'%s\'.</string>
     <string name="intent_aedict_empty">Категорија \'подразумевано\' је празна</string>
     <string name="intent_aedict_category">При додавању карата AnkiDroid уклања све категорије бележница или додаје једну са именом \'default\'</string>
@@ -216,10 +216,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-sr/10-preferences.xml b/AnkiDroid/src/main/res/values-sr/10-preferences.xml
index b9f2d6d8701e..adcced2c1592 100644
--- a/AnkiDroid/src/main/res/values-sr/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sr/10-preferences.xml
@@ -299,8 +299,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-sr/17-model-manager.xml b/AnkiDroid/src/main/res/values-sr/17-model-manager.xml
index 35bcd4533d55..1031dc2ebd8d 100644
--- a/AnkiDroid/src/main/res/values-sr/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-sr/17-model-manager.xml
@@ -66,9 +66,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Да ли заиста желите да избришете овај модел?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Додај: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Клон: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>
diff --git a/AnkiDroid/src/main/res/values-ss/02-strings.xml b/AnkiDroid/src/main/res/values-ss/02-strings.xml
index d3c686c3bb2f..c2a6fe35b154 100644
--- a/AnkiDroid/src/main/res/values-ss/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ss/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-ss/03-dialogs.xml b/AnkiDroid/src/main/res/values-ss/03-dialogs.xml
index a90006f09ce1..5f136efb99fa 100644
--- a/AnkiDroid/src/main/res/values-ss/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ss/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Database error</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Report error</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-ss/10-preferences.xml b/AnkiDroid/src/main/res/values-ss/10-preferences.xml
index 29e92629b16c..2afb72668806 100644
--- a/AnkiDroid/src/main/res/values-ss/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ss/10-preferences.xml
@@ -297,8 +297,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-ss/17-model-manager.xml b/AnkiDroid/src/main/res/values-ss/17-model-manager.xml
index 6b89a122d404..eff2650b23bb 100644
--- a/AnkiDroid/src/main/res/values-ss/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ss/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Are you sure you wish to delete this field?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>
diff --git a/AnkiDroid/src/main/res/values-sv/02-strings.xml b/AnkiDroid/src/main/res/values-sv/02-strings.xml
index e0aca8becd0b..b7d434fe2f1a 100644
--- a/AnkiDroid/src/main/res/values-sv/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sv/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">Bilden är för stor, lägg till bilden manuellt</string>
     <string name="note_editor_video_too_large">Videofilen är för stor, lägg till videon manuellt</string>
     <string name="note_editor_audio_too_large">Ljudfilen är för stor, lägg till ljudet manuellt</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Säkerhetskopiering av Android pågår. Försök igen</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">Du kan behöva använda iManager för att tillåta AnkiDroid att lägga till genvägar</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Din startskärm tillåter inte AnkiDroid att lägga till genvägar</string>
     <string name="create_shortcut_error">Kunde inte lägga till genväg: %s</string>
@@ -306,19 +306,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Inspelning sparad</string>
     <string name="deleting_selected_notes">Raderar markerade noter</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tryck på en röst för att lyssna
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Röst bör installeras innan den används    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Använd ändå
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Fel (%s) text-till-tal</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Installera
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Misslyckades att öppna text-till-tal-inställningar
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Logga in för att ladda ner fler kortlekar</string>
     <string name="deck_description_field_hint">Beskrivning</string>
     <string name="failed_to_copy">Misslyckades att kopiera</string>
diff --git a/AnkiDroid/src/main/res/values-sv/03-dialogs.xml b/AnkiDroid/src/main/res/values-sv/03-dialogs.xml
index 676904a232bc..de401313b886 100644
--- a/AnkiDroid/src/main/res/values-sv/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sv/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Databasfel</string>
     <string name="answering_error_message">Ett fel uppstod när data skrevs till samlingen. Detta kan bero på en korrupt databas eller otillräckligt diskutrymme.\n\nOm detta händer flera gånger, vänligen kontrollera databasen, reparera samlingen eller återställ den från en säkerhetskopia. Klicka på \'alternativ\' för det.\n\nAnnars kan detta också bero på en bug i AnkiDroid; vänligen rapportera felet så vi kan kontrollera detta.</string>
     <string name="answering_error_report">Rapportera fel</string>
-    <string name="storage_full_message">Det finns inte tillräckligt med ledigt lagringsutrymme för att öppna AnkiDroid. Frigör lite utrymme för att fortsätta. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Vill du verkligen försöka reparera databasen?\n\nEn kopia kommer att skapas i mappen \'%s\' innan.</string>
     <string name="intent_aedict_empty">Kategori \'default\' är tom</string>
     <string name="intent_aedict_category">För att lägga till kort till AnkiDroid, ta bort alla Notepadkategorier eller lägg till en som heter \'default\'</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Senare</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Visa inte igen</string>
     <string name="dismiss_backup_warning_title">Varning för dataförlust</string>
-    <string name="dismiss_backup_warning_new_user">        På grund av Androids integritetsförändringar kommer dina data och automatiserade säkerhetskopior att raderas om appen avinstalleras
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        På grund av Androids integritetsförändringar kommer dina data och automatiserade säkerhetskopior att vara oåtkomliga om appen avinstalleras
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Kortlek finns redan</string>
     <string name="empty_deck_name">Kortleksnamn kan inte vara tomt</string>
     <string name="create_deck_numeric_hint">Om du har problem med kortleks ordning (dvs \'10\' kommer före \'2\'), ersätt \'2\' med \'02\'</string>
diff --git a/AnkiDroid/src/main/res/values-sv/10-preferences.xml b/AnkiDroid/src/main/res/values-sv/10-preferences.xml
index 2a88f7e65575..3959d20748a9 100644
--- a/AnkiDroid/src/main/res/values-sv/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sv/10-preferences.xml
@@ -296,8 +296,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Utvecklaralternativ</string>
     <string name="dev_options_enabled_pref" maxLength="41">Aktivera utvecklaralternativ</string>
     <string name="disable_dev_options">Inaktivera utvecklaralternativ</string>
-    <string name="dev_options_warning">        Var säker innan du aktiverar utvecklaralternativ. Dessa alternativ är farliga och kan förstöra appen eller korrumpera din samling.\n\nObservera att dessa alternativ inte passar de flesta användare och därför inte översätts, och alltså är på engelska.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-sv/17-model-manager.xml b/AnkiDroid/src/main/res/values-sv/17-model-manager.xml
index 9b3f99ed6715..f2ca4eb61432 100644
--- a/AnkiDroid/src/main/res/values-sv/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-sv/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Är du säker på att du vill ta bort denna anteckningstyp?</string>
     <string name="field_delete_warning">Är du säker på att du vill ta bort detta fält?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Lägg till: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Klona: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Ange den mall som kortbläddraren kommer att använda för att visa dina kort. Använd detta för att visa ett mer koncist svar.\n\nEn framsidomall \n“Huvudstaden i {{Country}} är:”\nkan i kortbläddraren komprimeras till\n“Huvudstad: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Frågeformat</string>
diff --git a/AnkiDroid/src/main/res/values-sw/02-strings.xml b/AnkiDroid/src/main/res/values-sw/02-strings.xml
index d3c686c3bb2f..c2a6fe35b154 100644
--- a/AnkiDroid/src/main/res/values-sw/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sw/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-sw/03-dialogs.xml b/AnkiDroid/src/main/res/values-sw/03-dialogs.xml
index a90006f09ce1..5f136efb99fa 100644
--- a/AnkiDroid/src/main/res/values-sw/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sw/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Database error</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Report error</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-sw/10-preferences.xml b/AnkiDroid/src/main/res/values-sw/10-preferences.xml
index 29e92629b16c..2afb72668806 100644
--- a/AnkiDroid/src/main/res/values-sw/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sw/10-preferences.xml
@@ -297,8 +297,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-sw/17-model-manager.xml b/AnkiDroid/src/main/res/values-sw/17-model-manager.xml
index 6b89a122d404..eff2650b23bb 100644
--- a/AnkiDroid/src/main/res/values-sw/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-sw/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Are you sure you wish to delete this field?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>
diff --git a/AnkiDroid/src/main/res/values-ta/02-strings.xml b/AnkiDroid/src/main/res/values-ta/02-strings.xml
index 4776c8746632..1104b65d84f5 100644
--- a/AnkiDroid/src/main/res/values-ta/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ta/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">படம் மிகவும் பெரிதாக உள்ளது, படத்தை கைமுறையாக செருகவும்</string>
     <string name="note_editor_video_too_large">வீடியோ கோப்பு மிகவும் பெரியதாக உள்ளது, வீடியோவை கைமுறையாக செருகவும்</string>
     <string name="note_editor_audio_too_large">ஆடியோ கோப்பு மிகவும் பெரியதாக உள்ளது, ஆடியோவை கைமுறையாக செருகவும்</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android காப்புப்பிரதி செயலில் உள்ளது. மீண்டும் முயற்சிக்கவும்</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">குறுக்குவழிகளைச் சேர்க்க AnkiDroid ஐ அனுமதிக்க நீங்கள் iManager ஐப் பயன்படுத்த வேண்டியிருக்கலாம்</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">உங்கள் முகப்புத் திரை AnkiDroid குறுக்குவழிகளைச் சேர்க்க அனுமதிக்காது</string>
     <string name="create_shortcut_error">குறுக்குவழியைச் சேர்ப்பதில் பிழை: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">பதிவு சேமிக்கப்பட்டது</string>
     <string name="deleting_selected_notes">தேர்ந்தெடுக்கப்பட்ட குறிப்புகளை நீக்குகிறது</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        கேட்க ஒரு குரலைத் தட்டவும்
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">பயன்படுத்துவதற்கு முன் குரல் நிறுவப்பட வேண்டும்
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">எப்படியும் பயன்படுத்துங்கள்
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">உரையிலிருந்து பேச்சுப் பிழை (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        இணையம்
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        நிறுவவும்
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        உரையிலிருந்து பேச்சு அமைப்புகளைத் திறக்க முடியவில்லை
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">மேலும் தளங்களைப் பதிவிறக்க உள்நுழையவும்</string>
     <string name="deck_description_field_hint">விளக்கம்</string>
     <string name="failed_to_copy">நகலெடுக்க முடியவில்லை</string>
diff --git a/AnkiDroid/src/main/res/values-ta/03-dialogs.xml b/AnkiDroid/src/main/res/values-ta/03-dialogs.xml
index 0a6bcb030f2d..dde52595beb7 100644
--- a/AnkiDroid/src/main/res/values-ta/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ta/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">தரவுத்தள பிழை</string>
     <string name="answering_error_message">தொகுப்பிற்கு எழுதுவது தோல்வியடைந்தது. தரவுத்தளம் சிதைந்திருக்கலாம் அல்லது வட்டில் போதுமான காலி இடம் இல்லாமல் இருக்கலாம்.\n\nஇது அடிக்கடி நடந்தால், தரவுத்தளத்தைச் சரிபார்த்து, சேகரிப்பைச் சரிசெய்து அல்லது காப்புப்பிரதியிலிருந்து மீட்டமைக்க முயற்சிக்கவும். அதற்கான \"விருப்பங்களை\" தொடவும்.\n\அல்லது அது AnkiDroid பிழையாகவும் இருக்கலாம்; தயவு செய்து பிழையைப் புகாரளிக்கவும், இதன் மூலம் நாங்கள் இதைச் சரிபார்க்க முடியும்.</string>
     <string name="answering_error_report">பிழையைப் புகாரளிக்கவும்</string>
-    <string name="storage_full_message">AnkiDroid ஐ திறக்கப் போதுமான இலவச சேமிப்பிடம் இல்லை. தொடர்வதற்கு சிறிது இடத்தை விடுவிக்கவும்.</string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">நீங்கள் உண்மையில் தரவுத்தளத்தைச் சரிசெய்ய முயற்சிக்க விரும்புகிறீர்களா?\n\nமுயற்சியைத் தொடங்கும் முன், \"%s\" என்ற துணைக் கோப்புறையில் ஒரு நகல் உருவாக்கப்படும்.</string>
     <string name="intent_aedict_empty">\"இயல்புநிலை\" வகை காலியாக உள்ளது</string>
     <string name="intent_aedict_category">AnkiDroid இல் கார்டுகளைச் சேர்க்க அனைத்து நோட்பேட் வகைகளையும் அகற்றவும் அல்லது \"இயல்புநிலை\" என்று பெயரிடப்பட்ட ஒன்றைச் சேர்க்கவும்</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">பின்னர்</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">மீண்டும் காட்டாதே</string>
     <string name="dismiss_backup_warning_title">தரவு இழப்பு எச்சரிக்கை</string>
-    <string name="dismiss_backup_warning_new_user">        ஆண்ட்ராய்டு தனியுரிமை மாற்றங்கள் காரணமாக, ஆப்ஸ் நிறுவல் நீக்கப்பட்டால், உங்கள் டேட்டா மற்றும் தானியங்கு காப்புப் பிரதிகளமொபைலிலிருந்து் இருந்து நீக்கப்படும்
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Android தனியுரிமை மாற்றங்கள் காரணமாக, ஆப்ஸ் நிறுவல் நீக்கப்பட்டால், உங்கள் தரவு மற்றும் தானியங்கு காப்புப்பிரதிகளை அணுக முடியாது
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">டெக் ஏற்கனவே உள்ளது</string>
     <string name="empty_deck_name">டெக்கின் பெயர் காலியாக இருக்கக் கூடாது</string>
     <string name="create_deck_numeric_hint">டெக் ஆர்டர் செய்வதில் சிக்கல்கள் இருந்தால் (எ.கா. ‘10’ ‘2’க்கு முன் தோன்றும்), ‘2’ ஐ ‘02’ ஆக மாற்றவும்</string>
diff --git a/AnkiDroid/src/main/res/values-ta/10-preferences.xml b/AnkiDroid/src/main/res/values-ta/10-preferences.xml
index 4bd7db5c43d9..06b518e1c809 100644
--- a/AnkiDroid/src/main/res/values-ta/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ta/10-preferences.xml
@@ -296,8 +296,7 @@
     <string name="pref_cat_dev_options" maxLength="41">டெவலப்பர் விருப்பங்கள்</string>
     <string name="dev_options_enabled_pref" maxLength="41">டெவலப்பர் விருப்பங்களை இயக்கு</string>
     <string name="disable_dev_options">டெவலப்பர் விருப்பங்களை முடக்கு</string>
-    <string name="dev_options_warning">        டெவலப்பர் விருப்பங்களை இயக்கும் முன் உறுதிசெய்யவும். இந்த விருப்பத்தேர்வுகள் ஆபத்தானவை மற்றும் பயன்பாட்டை உடைக்கலாம் அல்லது உங்கள் சேகரிப்பை சிதைக்கலாம்.\n\nஇந்த விருப்பங்கள் பெரபயனர்களுக்குப் பொருந்தாதுொருந்தாது, எனவே அவை மொழிபெயர்க்கப்படவில்லை, எனவே அவை ஆங்கிலத்தில் உள்ளன.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-ta/17-model-manager.xml b/AnkiDroid/src/main/res/values-ta/17-model-manager.xml
index 846f7c887e31..7e16e54fead5 100644
--- a/AnkiDroid/src/main/res/values-ta/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ta/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">இந்தக் குறிப்பு வகையை நிச்சயமாக நீக்க விரும்புகிறீர்களா?</string>
     <string name="field_delete_warning">இந்தப் புலத்தை நிச்சயமாக நீக்க விரும்புகிறீர்களா?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">சேர்: %1$s</string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">குளோன்: %1$s</string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">கார்டு உலாவி உங்கள் கார்டுகளைக் காண்பிக்கப் பயன்படுத்தும் டெம்ப்ளேட்டை உள்ளிடவும். இன்னும் சுருக்கமான பதிலைக் காண்பிக்க இதைப் பயன்படுத்தவும்.\n\n\n“{{நாட்டின்}} தலைநகரம்:”\nஇன் முன் டெம்ப்ளேட்டை அட்டை உலாவியில்\n“மூலதனம்: {{Country}}” என்று சுருக்கலாம்.</string>
     <string name="card_template_browser_appearance_question_format">கேள்வி வடிவம்</string>
diff --git a/AnkiDroid/src/main/res/values-te/02-strings.xml b/AnkiDroid/src/main/res/values-te/02-strings.xml
index 088e69201bc8..aafbfe70d69e 100644
--- a/AnkiDroid/src/main/res/values-te/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-te/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">చిత్రం చాలా పెద్దది, దయచేసి చిత్రాన్ని మాన్యువల్‌గా చొప్పించండి</string>
     <string name="note_editor_video_too_large">వీడియో ఫైల్ చాలా పెద్దది, దయచేసి వీడియోని మాన్యువల్‌గా చొప్పించండి</string>
     <string name="note_editor_audio_too_large">ఆడియో ఫైల్ చాలా పెద్దది, దయచేసి ఆడియోను మాన్యువల్‌గా చొప్పించండి</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android బ్యాకప్ ప్రోగ్రెస్‌లో ఉంది. దయచేసి మళ్లీ ప్రయత్నించండి</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">సత్వరమార్గాలను జోడించడానికి AnkiDroidని అనుమతించడానికి మీరు iManagerని ఉపయోగించాల్సి రావచ్చు</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">మీ హోమ్ స్క్రీన్‌కి సత్వరమార్గాలను జోడించడానికి AnkiDroid మిమ్మల్ని అనుమతించదు</string>
     <string name="create_shortcut_error">సత్వరమార్గాన్ని జోడించడంలో లోపం: %s</string>
@@ -305,14 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">రికార్డింగ్ సేవ్ చేయబడింది</string>
     <string name="deleting_selected_notes">ఎంచుకున్న గమనికలను తొలగిస్తోంది</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">వినడానికి వాయిస్ నొక్కండి</string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">ఉపయోగించడానికి ముందు వాయిస్ తప్పనిసరిగా ఇన్‌స్టాల్ చేయబడాలి</string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">ఎలాగైనా వాడండి</string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">టెక్స్ట్ టు స్పీచ్ లోపం (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">ఇంటర్నెట్</string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">దీన్ని ఇన్‌స్టాల్ చేయండి</string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">టెక్స్ట్ టు స్పీచ్ సెట్టింగ్‌లను తెరవడంలో విఫలమైంది</string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">దయచేసి మరిన్ని డెక్‌లను డౌన్‌లోడ్ చేయడానికి లాగిన్ చేయండి</string>
     <string name="deck_description_field_hint">వివరణ</string>
     <string name="failed_to_copy">కాపీ చేయడంలో విఫలమైంది</string>
diff --git a/AnkiDroid/src/main/res/values-te/03-dialogs.xml b/AnkiDroid/src/main/res/values-te/03-dialogs.xml
index 884a82b12b2d..c6c162e54727 100644
--- a/AnkiDroid/src/main/res/values-te/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-te/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">డేటాబేస్ లోపం</string>
     <string name="answering_error_message">సేకరణకు వ్రాయడంలో విఫలమైంది. డేటాబేస్ పాడైపోయి ఉండవచ్చు లేదా డిస్క్‌లో తగినంత ఖాళీ స్థలం ఉండకపోవచ్చు.\n\nఇది తరచుగా జరిగితే, డేటాబేస్‌ని తనిఖీ చేయడం, సేకరణను రిపేర్ చేయడం లేదా బ్యాకప్ నుండి పునరుద్ధరించడం వంటివి ప్రయత్నించండి. దాని కోసం \"ఎంపికలు\" తాకండి.\n\లేదా అది AnkiDroid బగ్ కావచ్చు; దయచేసి లోపాన్ని నివేదించండి, తద్వారా మేము దాన్ని తనిఖీ చేయవచ్చు.</string>
     <string name="answering_error_report">నివేదన లోపం</string>
-    <string name="storage_full_message">AnkiDroidని తెరవడానికి తగినంత ఉచిత నిల్వ లేదు. కొనసాగించడానికి కొంత స్థలాన్ని ఖాళీ చేయండి.</string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">మీరు నిజంగా డాటాబేస్ రిపేరు చేయాలనుకుంటున్నారా? \n\n ప్రయత్నం ప్రారంభించటానికి ముందు, \"కాపీ\" ఫోల్డర్ \"%s\" లో సృష్టించబడుతుంది.</string>
     <string name="intent_aedict_empty">\"default\" వర్గం ఖాళీగా ఉంది</string>
     <string name="intent_aedict_category">AnkiDroid కు కార్డులు జోడించడానికి అన్ని నోట్ప్యాడ్లో కేతగిరీలు తొలగించండి లేదా \"default\" కు ఒక పేరును జోడించండి</string>
@@ -212,8 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">తర్వాత</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">దాన్ని మళ్లీ చూపించవద్దు</string>
     <string name="dismiss_backup_warning_title">డేటా నష్టం హెచ్చరిక</string>
-    <string name="dismiss_backup_warning_new_user">Android గోప్యతా మార్పుల కారణంగా, యాప్‌ను అన్‌ఇన్‌స్టాల్ చేయడం వలన మీ ఫోన్ నుండి మీ డేటా మరియు ఆటోమేటెడ్ బ్యాకప్ తొలగించబడుతుంది</string>
-    <string name="dismiss_backup_warning_upgrade">Android గోప్యతా మార్పుల కారణంగా, యాప్ అన్‌ఇన్‌స్టాల్ చేయబడితే మీ డేటా మరియు ఆటోమేటెడ్ బ్యాకప్‌లు యాక్సెస్ చేయబడవు</string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">డెక్ ఇప్పటికే ఉంది</string>
     <string name="empty_deck_name">డెక్ పేరు ఖాళీగా ఉండకూడదు</string>
     <string name="create_deck_numeric_hint">మీకు డెక్ ఆర్డరింగ్ సమస్యలు ఉంటే (ఉదా. \'2\'కి ముందు \'10\' కనిపిస్తుంది), \'2\'ని \'02\'తో భర్తీ చేయండి</string>
diff --git a/AnkiDroid/src/main/res/values-te/10-preferences.xml b/AnkiDroid/src/main/res/values-te/10-preferences.xml
index f7185c45f585..6cf9ad76dca4 100644
--- a/AnkiDroid/src/main/res/values-te/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-te/10-preferences.xml
@@ -295,7 +295,7 @@
     <string name="pref_cat_dev_options" maxLength="41">డెవలపర్ ఎంపికలు</string>
     <string name="dev_options_enabled_pref" maxLength="41">డెవలపర్ ఎంపికలను ప్రారంభించండి</string>
     <string name="disable_dev_options">డెవలపర్ ఎంపికలను నిలిపివేయండి</string>
-    <string name="dev_options_warning">దయచేసి డెవలపర్ ఎంపికలను ప్రారంభించే ముందు నిర్ధారించుకోండి. ఈ ఎంపికలు ప్రమాదకరమైనవి మరియు యాప్‌ను విచ్ఛిన్నం చేయవచ్చు లేదా మీ సేకరణకు హాని కలిగించవచ్చు.\n\nఈ ఎంపికలు చాలా మంది వినియోగదారులకు తగినవి కావు మరియు అందువల్ల అనువదించబడలేదు, కాబట్టి అవి ఆంగ్లంలో ఉన్నాయని దయచేసి గమనించండి.</string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-te/17-model-manager.xml b/AnkiDroid/src/main/res/values-te/17-model-manager.xml
index 1c77d5665f9a..cc8519adeb42 100644
--- a/AnkiDroid/src/main/res/values-te/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-te/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">మీరు ఈ గమనిక రకాన్ని ఖచ్చితంగా తొలగించాలనుకుంటున్నారా?</string>
     <string name="field_delete_warning">మీరు ఖచ్చితంగా ఈ ఫీల్డ్ని తొలగించాలనుకుంటున్నారా?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">చెరచు %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">ఒకే రీతి: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">మీ కార్డ్‌లను ప్రదర్శించడానికి కార్డ్ బ్రౌజర్ ఉపయోగించే టెంప్లేట్‌ను నమోదు చేయండి. మరింత సంక్షిప్త సమాధానాన్ని ప్రదర్శించడానికి దీన్ని ఉపయోగించండి.\n\n\n బ్రౌజర్‌లో “{{Country}} రాజధాని:”\n ముందు ఉన్న టెంప్లేట్ కార్డ్ “క్యాపిటల్: {{Country}}”కి కుదించబడుతుంది.</string>
     <string name="card_template_browser_appearance_question_format">ప్రశ్న ఫార్మాట్</string>
diff --git a/AnkiDroid/src/main/res/values-tg/02-strings.xml b/AnkiDroid/src/main/res/values-tg/02-strings.xml
index d3c686c3bb2f..c2a6fe35b154 100644
--- a/AnkiDroid/src/main/res/values-tg/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tg/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-tg/03-dialogs.xml b/AnkiDroid/src/main/res/values-tg/03-dialogs.xml
index 954422112bc9..238f402bfc38 100644
--- a/AnkiDroid/src/main/res/values-tg/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-tg/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Database error</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Report error</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-tg/10-preferences.xml b/AnkiDroid/src/main/res/values-tg/10-preferences.xml
index 29e92629b16c..2afb72668806 100644
--- a/AnkiDroid/src/main/res/values-tg/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-tg/10-preferences.xml
@@ -297,8 +297,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-tg/17-model-manager.xml b/AnkiDroid/src/main/res/values-tg/17-model-manager.xml
index 6b89a122d404..eff2650b23bb 100644
--- a/AnkiDroid/src/main/res/values-tg/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-tg/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Are you sure you wish to delete this field?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>
diff --git a/AnkiDroid/src/main/res/values-tgl/02-strings.xml b/AnkiDroid/src/main/res/values-tgl/02-strings.xml
index a328c607cd83..62b563d5e627 100644
--- a/AnkiDroid/src/main/res/values-tgl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tgl/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-tgl/03-dialogs.xml b/AnkiDroid/src/main/res/values-tgl/03-dialogs.xml
index f63aa6b35468..b8b67aa3f06e 100644
--- a/AnkiDroid/src/main/res/values-tgl/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-tgl/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Mali sa database</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">I-ulat ang error</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Gusto ma bang subukan ang pag-aayos ng database?\n\nBago simulan ang pagtatangka, isang kopya ang lilikhain sa subfolder na \"%s\".</string>
     <string name="intent_aedict_empty">Walang laman ang kategoryang \"default\"</string>
     <string name="intent_aedict_category">Upang magdagdag ng mga baraha sa AnkiDroid alisin ang lahat ng mga kategorya ng Notepad o magdagdag ng isa na pinangalanang \"default\"</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-tgl/10-preferences.xml b/AnkiDroid/src/main/res/values-tgl/10-preferences.xml
index 0029c1b69a36..c475e20c408f 100644
--- a/AnkiDroid/src/main/res/values-tgl/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-tgl/10-preferences.xml
@@ -297,8 +297,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-tgl/17-model-manager.xml b/AnkiDroid/src/main/res/values-tgl/17-model-manager.xml
index 6b89a122d404..eff2650b23bb 100644
--- a/AnkiDroid/src/main/res/values-tgl/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-tgl/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Are you sure you wish to delete this field?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>
diff --git a/AnkiDroid/src/main/res/values-th/02-strings.xml b/AnkiDroid/src/main/res/values-th/02-strings.xml
index 40d8debee090..102711af4063 100644
--- a/AnkiDroid/src/main/res/values-th/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-th/02-strings.xml
@@ -229,7 +229,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -300,20 +300,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-th/03-dialogs.xml b/AnkiDroid/src/main/res/values-th/03-dialogs.xml
index 4c4d14477486..e649b069ab31 100644
--- a/AnkiDroid/src/main/res/values-th/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-th/03-dialogs.xml
@@ -62,7 +62,7 @@
     <string name="answering_error_title">Database error</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Report error</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
@@ -208,10 +208,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-th/10-preferences.xml b/AnkiDroid/src/main/res/values-th/10-preferences.xml
index 28ba47737894..5437805dcdb3 100644
--- a/AnkiDroid/src/main/res/values-th/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-th/10-preferences.xml
@@ -295,8 +295,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-th/17-model-manager.xml b/AnkiDroid/src/main/res/values-th/17-model-manager.xml
index ebbccce50b08..0e9410d15b90 100644
--- a/AnkiDroid/src/main/res/values-th/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-th/17-model-manager.xml
@@ -62,9 +62,9 @@
     <string name="model_delete_warning">คุณแน่ใจหรือไม่ว่าต้องการลบรูปแบบโน๊ตนี้?</string>
     <string name="field_delete_warning">Are you sure you wish to delete this field?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">เพิ่ม: %1$s</string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">คัดลอก: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>
diff --git a/AnkiDroid/src/main/res/values-ti/02-strings.xml b/AnkiDroid/src/main/res/values-ti/02-strings.xml
index d3c686c3bb2f..c2a6fe35b154 100644
--- a/AnkiDroid/src/main/res/values-ti/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ti/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-ti/03-dialogs.xml b/AnkiDroid/src/main/res/values-ti/03-dialogs.xml
index a90006f09ce1..5f136efb99fa 100644
--- a/AnkiDroid/src/main/res/values-ti/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ti/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Database error</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Report error</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-ti/10-preferences.xml b/AnkiDroid/src/main/res/values-ti/10-preferences.xml
index 29e92629b16c..2afb72668806 100644
--- a/AnkiDroid/src/main/res/values-ti/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ti/10-preferences.xml
@@ -297,8 +297,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-ti/17-model-manager.xml b/AnkiDroid/src/main/res/values-ti/17-model-manager.xml
index 6b89a122d404..eff2650b23bb 100644
--- a/AnkiDroid/src/main/res/values-ti/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ti/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Are you sure you wish to delete this field?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>
diff --git a/AnkiDroid/src/main/res/values-tn/02-strings.xml b/AnkiDroid/src/main/res/values-tn/02-strings.xml
index d3c686c3bb2f..c2a6fe35b154 100644
--- a/AnkiDroid/src/main/res/values-tn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tn/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-tn/03-dialogs.xml b/AnkiDroid/src/main/res/values-tn/03-dialogs.xml
index a90006f09ce1..5f136efb99fa 100644
--- a/AnkiDroid/src/main/res/values-tn/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-tn/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Database error</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Report error</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-tn/10-preferences.xml b/AnkiDroid/src/main/res/values-tn/10-preferences.xml
index 29e92629b16c..2afb72668806 100644
--- a/AnkiDroid/src/main/res/values-tn/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-tn/10-preferences.xml
@@ -297,8 +297,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-tn/17-model-manager.xml b/AnkiDroid/src/main/res/values-tn/17-model-manager.xml
index 6b89a122d404..eff2650b23bb 100644
--- a/AnkiDroid/src/main/res/values-tn/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-tn/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Are you sure you wish to delete this field?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>
diff --git a/AnkiDroid/src/main/res/values-tr/02-strings.xml b/AnkiDroid/src/main/res/values-tr/02-strings.xml
index 040d2dacb724..6de42bf2cb5e 100644
--- a/AnkiDroid/src/main/res/values-tr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tr/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">Bu resim fazla büyük, lütfen resmi elle ekleyin</string>
     <string name="note_editor_video_too_large">Bu video dosyası fazla büyük, lütfen videoyu elle ekleyin</string>
     <string name="note_editor_audio_too_large">Bu ses dosyası fazla büyük, lütfen sesi elle ekleyin</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android yedeklemesi gerçekleştiriliyor. Lütfen tekrar deneyin</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">AnkiDroid\'in kısayol eklemesine izin vermek için iManager kullanmanız gerekebilir</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Ana ekranın, kısayol ekleyebilmesi için AnkiDroid\'e izin vermiyor</string>
     <string name="create_shortcut_error">Kısayolu eklerken hata: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Tarayıcı seçenekleri</string>
     <string name="audio_saved">Alınan kayıtlar kaydedildi. </string>
     <string name="deleting_selected_notes">Seçili notlar siliniyor</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Bir sesi dinlemek için dokunun
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Ses kullanmadan önce yüklenmelidir
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Yine de kullan
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Metin okuma hatası (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        İnternet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Yükle
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Metin okuma ayarları açılamadı
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Daha fazla deste indirmek için lütfen giriş yapın</string>
     <string name="deck_description_field_hint">Açıklama</string>
     <string name="failed_to_copy">Kopyalanamadı</string>
diff --git a/AnkiDroid/src/main/res/values-tr/03-dialogs.xml b/AnkiDroid/src/main/res/values-tr/03-dialogs.xml
index 7d60af4b2ac1..97b3ad91c688 100644
--- a/AnkiDroid/src/main/res/values-tr/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-tr/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Veritabanı hatası</string>
     <string name="answering_error_message">Koleksiyona yazılamadı. Veritabanı bozuk olabilir veya diskte yeterli boş alan olmayabilir.\n\nBu daha sık oluyorsa, veritabanını kontrol etmeyi, koleksiyonu onarmayı veya bir yedekten geri yüklemeyi deneyin. Bunun için \"seçenekler\"e dokunun.\n\Veya bu bir AnkiDroid hatası da olabilir; Bunu kontrol edebilmemiz için lütfen hatayı bildirin.</string>
     <string name="answering_error_report">Hatayı bildir</string>
-    <string name="storage_full_message">AnkiDroid\'i açmaya yetecek boş depolama alanı yok. Devam etmek için biraz alan boşaltın. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Veritabanını onarmayı gerçekten denemek istiyor musunuz?\n\nGirişime başlamadan önce, \"%s\" altklasöründe bir kopya oluşturulacak.</string>
     <string name="intent_aedict_empty">\"Varsayılan\" kategorisi boş</string>
     <string name="intent_aedict_category">AnkiDroid\'e kart eklemek için bütün Not Defteri kategorilerini kaldırın veya \"default\" isminde bir tane ekleyin</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Daha sonra</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Tekrar gösterme</string>
     <string name="dismiss_backup_warning_title">Veri kaybı uyarısı</string>
-    <string name="dismiss_backup_warning_new_user">        Android gizlilik değişikliklerinden dolayı, uygulama kaldırılırsa veriniz ve otomatik yedekleriniz telefonunuzdan silinecek
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Android gizlilik değişikliklerinden dolayı, uygulama kaldırılırsa veriniz ve otomatik yedekleriniz erişilemez hâle gelecek
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deste hâlihazırda var</string>
     <string name="empty_deck_name">Deste adı boş olamaz</string>
     <string name="create_deck_numeric_hint">Deste sıralamanızda sorun olursa (örn. \"10\"un \"2\"den önce gelmesi), \"2\" yerine \"02\" yazın</string>
diff --git a/AnkiDroid/src/main/res/values-tr/10-preferences.xml b/AnkiDroid/src/main/res/values-tr/10-preferences.xml
index 581abb33335e..4fcde1ee114b 100644
--- a/AnkiDroid/src/main/res/values-tr/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-tr/10-preferences.xml
@@ -296,7 +296,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Geliştirici seçenekleri</string>
     <string name="dev_options_enabled_pref" maxLength="41">Geliştirici seçeneklerini aç</string>
     <string name="disable_dev_options">Geliştirici seçeneklerini kapat</string>
-    <string name="dev_options_warning">        Lütfen geliştirici seçeneklerini açmadan önce emin olun. Bu seçenekler tehlikelidir ve uygulamayı ya da koleksiyonunuzu bozabilir.\n\nBu seçenekler çoğu kullanıcı için uygun değildir ve çevrilmezler, bu yüzden İngilizce olduklarını göz önünde bulundurun.</string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-tr/17-model-manager.xml b/AnkiDroid/src/main/res/values-tr/17-model-manager.xml
index 5b5e30f51361..c83fa9dab899 100644
--- a/AnkiDroid/src/main/res/values-tr/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-tr/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Bu not türünü silmek istediğinize emin misiniz?</string>
     <string name="field_delete_warning">Bu alanı silmek istediğinize emin misiniz?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Ekle: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Klonla: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Kartlarınızı görüntülemek için kullanılacak kart tarayıcı şablonunu giriniz. Daha anlaşılır bir yanıt görüntülemek için bunu kullanın.\n\nŞablonun önü\n\"{{Ülkesi}}nin başkenti: \"\nkart tarayıcıda şöyle sıkıştırılabilir\n\"Başkent: {{Ülke}}\"</string>
     <string name="card_template_browser_appearance_question_format">Soru Biçimi</string>
diff --git a/AnkiDroid/src/main/res/values-ts/02-strings.xml b/AnkiDroid/src/main/res/values-ts/02-strings.xml
index d3c686c3bb2f..c2a6fe35b154 100644
--- a/AnkiDroid/src/main/res/values-ts/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ts/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-ts/03-dialogs.xml b/AnkiDroid/src/main/res/values-ts/03-dialogs.xml
index a90006f09ce1..5f136efb99fa 100644
--- a/AnkiDroid/src/main/res/values-ts/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ts/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Database error</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Report error</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-ts/10-preferences.xml b/AnkiDroid/src/main/res/values-ts/10-preferences.xml
index 29e92629b16c..2afb72668806 100644
--- a/AnkiDroid/src/main/res/values-ts/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ts/10-preferences.xml
@@ -297,8 +297,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-ts/17-model-manager.xml b/AnkiDroid/src/main/res/values-ts/17-model-manager.xml
index 6b89a122d404..eff2650b23bb 100644
--- a/AnkiDroid/src/main/res/values-ts/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ts/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Are you sure you wish to delete this field?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>
diff --git a/AnkiDroid/src/main/res/values-tt/02-strings.xml b/AnkiDroid/src/main/res/values-tt/02-strings.xml
index ae2f62332a43..b623434ff751 100644
--- a/AnkiDroid/src/main/res/values-tt/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tt/02-strings.xml
@@ -230,7 +230,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -301,20 +301,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Тасвирлама</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-tt/03-dialogs.xml b/AnkiDroid/src/main/res/values-tt/03-dialogs.xml
index e528468d6b38..02da01f46ef1 100644
--- a/AnkiDroid/src/main/res/values-tt/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-tt/03-dialogs.xml
@@ -62,7 +62,7 @@
     <string name="answering_error_title">Мәгълүмат базасы хатасы</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Хата турында хәбәр итү</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
@@ -208,10 +208,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Соңрак</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-tt/10-preferences.xml b/AnkiDroid/src/main/res/values-tt/10-preferences.xml
index 47ef5504b5b8..77338cbf06a4 100644
--- a/AnkiDroid/src/main/res/values-tt/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-tt/10-preferences.xml
@@ -295,8 +295,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-tt/17-model-manager.xml b/AnkiDroid/src/main/res/values-tt/17-model-manager.xml
index 67ca3da2910a..3100dcec7c1d 100644
--- a/AnkiDroid/src/main/res/values-tt/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-tt/17-model-manager.xml
@@ -62,9 +62,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Are you sure you wish to delete this field?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>
diff --git a/AnkiDroid/src/main/res/values-ug/02-strings.xml b/AnkiDroid/src/main/res/values-ug/02-strings.xml
index 3dfe7f2ee7ab..67e701419e03 100644
--- a/AnkiDroid/src/main/res/values-ug/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ug/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">سۈرەت بەك چوڭ، سۈرەتنى قولدا قىستۇرۇڭ</string>
     <string name="note_editor_video_too_large">سىن ھۆججىتى بەك چوڭ، سىننى قولدا قىستۇرۇڭ</string>
     <string name="note_editor_audio_too_large">ئۈن ھۆججىتى بەك چوڭ، ئۈننى قولدا قىستۇرۇڭ</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android زاپاسلاۋاتىدۇ. قايتا سىناڭ</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">iManager نى ئىشلىتىپ AnkiDroid نىڭ تېزلەتمە قوشۇشىغا يول قويۇڭ</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">باش ئېكرانىڭىز AnkiDroid نىڭ تېزلەتمە قوشۇشىغا يول قويمايدۇ</string>
     <string name="create_shortcut_error">تېزلەتمە قوشۇش خاتالىقى: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">توركۆرگۈ تاللانما</string>
     <string name="audio_saved">خاتىرە ساقلاندى</string>
     <string name="deleting_selected_notes">تاللانغان خاتىرىنى ئۆچۈرۈۋاتىدۇ</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        ئاۋاز چېكىلسە ئاڭلىنىدۇ
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">ئىشلىتىشتىن ئىلگىرى ئاۋاز ئورنىتىلغان بولۇشى كېرەك
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">ئىشلىتىۋەر
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">تېكىستتىن ئاۋازغا خاتالىقى (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        ئىنتېرنېت
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        ئورنات
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        تېكىستتىن ئاۋازغا تەڭشىكىنى ئاچالمىدى
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">تېخىمۇ كۆپ دەستە چۈشۈرۈش ئۈچۈن تىزىمغا كىرىڭ</string>
     <string name="deck_description_field_hint">چۈشەندۈرۈش</string>
     <string name="failed_to_copy">كۆچۈرەلمىدى</string>
diff --git a/AnkiDroid/src/main/res/values-ug/03-dialogs.xml b/AnkiDroid/src/main/res/values-ug/03-dialogs.xml
index 4870473eab98..ab527c511ccb 100644
--- a/AnkiDroid/src/main/res/values-ug/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ug/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">ساندان خاتالىقى</string>
     <string name="answering_error_message">توپلامغا يازالمىدى. ساندان بۇزۇلغان بولۇشى ياكى دىسكىدا يېتەرلىك بوشلۇق بولماسلىقى مۇمكىن.\n\nئەگەر بۇ خىل ئەھۋال دائىم يۈز بەرسە، سانداننى تەكشۈرۈڭ، توپلامنى ئوڭشاڭ ياكى زاپاستىن ئەسلىگە كەلتۈرۈڭ. بۇنىڭ ئۈچۈن «تاللانما» نى چېكىڭ.\n\ياكى AnkiDroid كەمتۈكى بولۇشى مۇمكىن؛ خاتالىقنى مەلۇم قىلسىڭىز بىز ئۇنى تەكشۈرەلەيمىز.</string>
     <string name="answering_error_report">خاتالىق مەلۇم قىل</string>
-    <string name="storage_full_message">AnkiDroid نى ئېچىشقا يېتەرلىك دىسكا بوشلۇقى يوق. داۋاملاشتۇرۇش ئۈچۈن ئارزاق بوشلۇق بوشىتىڭ. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">سانداننى ھەقىقەتەن ئوڭشامسىز؟\n\nباشلاشتىن ئىلگىرى، بىر نۇسخا كۆچۈرۈلمىسى «%s» تارماق قىسقۇچقا قۇرۇلىدۇ.</string>
     <string name="intent_aedict_empty">سەھىپە «كۆڭۈلدىكى» بوش</string>
     <string name="intent_aedict_category">AnkiDroid قا كارتا قوشۇشتا بارلىق خاتىرە دەپتەر سەھىپىنى چىقىرىۋېتىدۇ ياكى «كۆڭۈلدىكى» ئاتىدا بىرنى قوشىدۇ</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">كېيىن</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">قايتا كۆرسەتمە</string>
     <string name="dismiss_backup_warning_title">سانلىق-مەلۇمات يوقۇلۇش ئاگاھلاندۇرۇشى</string>
-    <string name="dismiss_backup_warning_new_user">        Android شەخسىيەت تۈزۈمى ئۆزگەرگەنلىكتىن، ئەگەر ئەپ ئۆچۈرۈلسە، سانلىق مەلۇماتىڭىز ۋە ئۆزلۈكىدىن زاپاسلانغانلار تېلېفونىڭىزدىن ئۆچۈرۈلىدۇ
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Android شەخسىيەت تۈزۈمى ئۆزگەرگەنلىكتىن، ئەگەر ئەپ ئۆچۈرۈلسە، سانلىق مەلۇماتىڭىز ۋە ئۆزلۈكىدىن زاپاسلانغانلارنى زىيارەت قىلغىلى بولمايدۇ
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">دەستە مەۋجۇت</string>
     <string name="empty_deck_name">دەستە ئىسمى بوش قالمايدۇ</string>
     <string name="create_deck_numeric_hint">ئەگەر دەستە تەرتىپ مەسىلىسى بولسا (مەسىلەن، «10»«2»)دىن ئىلگىرى كۆرۈنسە، «2» نى «02» گە ئالماشتۇرۇڭ)</string>
diff --git a/AnkiDroid/src/main/res/values-ug/10-preferences.xml b/AnkiDroid/src/main/res/values-ug/10-preferences.xml
index fef78f8c2568..8eeef4798a35 100644
--- a/AnkiDroid/src/main/res/values-ug/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ug/10-preferences.xml
@@ -297,8 +297,7 @@
     <string name="pref_cat_dev_options" maxLength="41">ئىجادكارلار تاللانمىسى</string>
     <string name="dev_options_enabled_pref" maxLength="41">ئىجادكارلار تاللانمىسىنى قوزغىتىدۇ</string>
     <string name="disable_dev_options">ئىجادكارلار تاللانمىسىنى چەكلەيدۇ</string>
-    <string name="dev_options_warning">        ئىجادكارلار تاللانمىسىنىڭ قوزغىتىلغانلىقىغا كاپالەتلىك قىلىڭ. بۇ تاللانما خەتەرلىك ئەپ ياكى توپلامنى بۇزۇشى مۇمكىن.\n\nئەسكەرتىش بۇ تاللانما كۆپىنچە ئىشلەتكۈچىگە ماس كەلمەيدۇ، ئۇنىڭ ئۈستىگە تەرجىمە قىلىنمىغان شۇڭا ئىنگلىزچە.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-ug/17-model-manager.xml b/AnkiDroid/src/main/res/values-ug/17-model-manager.xml
index 2dcf9196b77e..31f361f6aecb 100644
--- a/AnkiDroid/src/main/res/values-ug/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ug/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">راستلا بۇ بۆلەك تۈرىنى ئۆچۈرەمسىز؟</string>
     <string name="field_delete_warning">بۇ بۆلەكنى راستتىنلا ئۆچۈرەمسىز؟</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">قوش: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">نۇسخىلا: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">كارتا كۆرگۈچ كارتىڭىزنى كۆرسىتىشكە ئىشلىتىدىغان قېلىپنى كىرگۈزۈڭ. بۇنى ئىشلىتىپ تېخىمۇ كۆپ قىسقا جاۋابنى كۆرسىتىدۇ.\n\nقېلىپتىكى «The capital of {{Country}} is:» كارتا كۆرگۈچتە «Capital: {{Country}}» غا قىسقارتىلىشى مۇمكىن</string>
     <string name="card_template_browser_appearance_question_format">سوئال پىچىمى</string>
diff --git a/AnkiDroid/src/main/res/values-uk/02-strings.xml b/AnkiDroid/src/main/res/values-uk/02-strings.xml
index 6752b4c88215..11ae400144aa 100644
--- a/AnkiDroid/src/main/res/values-uk/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-uk/02-strings.xml
@@ -241,7 +241,7 @@
     <string name="note_editor_image_too_large">Зображення завелике, будь ласка, вставте зображення вручну</string>
     <string name="note_editor_video_too_large">Відеофайл завеликий, будь ласка, вставте відео вручну</string>
     <string name="note_editor_audio_too_large">Аудіофайл завеликий, будь ласка, вставте аудіо вручну</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Виконується резервне копіювання. Будь ласка, спробуйте ще раз</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">Використовуйте iManager, щоб дозволити AnkiDroid додавати ярлики</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Ваш головний екран не дозволяє AnkiDroid додати ярлики</string>
     <string name="create_shortcut_error">Помилка при створенні ярлика: %s</string>
@@ -315,19 +315,14 @@
     <string name="browser_options_dialog_heading">Параметри переглядача карток</string>
     <string name="audio_saved">Запис аудіо збережено</string>
     <string name="deleting_selected_notes">Видалення вибраних записів</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Натисніть на голос, щоб прослухати
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Перед використанням слід встановити голос</string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Все одно використати
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Помилка синтезу мовлення (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Інтернет
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Встановити
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Не вдалося відкрити налаштування синтезу мовлення
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Ввійдіть, будь ласка, до акаунту, щоб завантажити більше колод</string>
     <string name="deck_description_field_hint">Опис</string>
     <string name="failed_to_copy">Не вдалося скопіювати</string>
diff --git a/AnkiDroid/src/main/res/values-uk/03-dialogs.xml b/AnkiDroid/src/main/res/values-uk/03-dialogs.xml
index 806200a82e72..068428166e1d 100644
--- a/AnkiDroid/src/main/res/values-uk/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-uk/03-dialogs.xml
@@ -68,7 +68,7 @@
     <string name="answering_error_title">Помилка бази даних</string>
     <string name="answering_error_message">Під час запису в колекцію сталася помилка. Причиною може бути пошкоджена база даних або відсутність місця на диску.\n\nЯкщо це трапляється частіше, будь ласка, спробуйте перевірити базу даних, полагодити колекцію, або відновити її з резервної копії. Для цього натисніть на «налаштування».\n\nОднак, це також може бути недолік AnkiDroid; будь ласка, надішліть звіт для перевірки цього.</string>
     <string name="answering_error_report">Повідомити про помилку</string>
-    <string name="storage_full_message">Недостатньо вільного місця, щоб відкрити AnkiDroid. Звільніть трохи пам\'яті, аби продовжити. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Ви дійсно бажаєте спробувати відновити базу даних?\n\nПеред початком спроби в підкаталозі \'%s\' буде створена копія.</string>
     <string name="intent_aedict_empty">Категорія  \"стандартна\"  порожня</string>
     <string name="intent_aedict_category">Щоб додати картки до AnkiDroid, видаліть всі категорії Notepad або додайте категорію \'default\'</string>
@@ -220,10 +220,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Пізніше</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Більше не показувати</string>
     <string name="dismiss_backup_warning_title">Ризик втрати даних</string>
-    <string name="dismiss_backup_warning_new_user">        У зв\'язку зі зміною політики конфіденційності Android, ваші дані та автоматизовані резервні копії будуть видалені з вашого пристрою, якщо додаток буде видалено
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        У зв\'язку зі зміною політики конфіденційності Android, ваші дані та автоматизовані резервні копії стануть недоступними, якщо додаток буде видалено
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Колода вже існує</string>
     <string name="empty_deck_name">Назва колоди не може бути порожньою</string>
     <string name="create_deck_numeric_hint">Якщо у вас є проблеми з порядком колод (наприклад, \'10\' стоїть перед \'2\') - замініть \'2\' на \'02\'</string>
diff --git a/AnkiDroid/src/main/res/values-uk/10-preferences.xml b/AnkiDroid/src/main/res/values-uk/10-preferences.xml
index 72f536fdbbec..d15f04dfb6a2 100644
--- a/AnkiDroid/src/main/res/values-uk/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-uk/10-preferences.xml
@@ -301,8 +301,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Параметри розробника</string>
     <string name="dev_options_enabled_pref" maxLength="41">Увімкнути параметри розробника</string>
     <string name="disable_dev_options">Вимкнути параметри розробника</string>
-    <string name="dev_options_warning">        Будь ласка, переконайтесь, що дійсно бажаєте ввімкнути параметрів розробника. Ці параметри небезпечні й можуть зламати програму або зіпсувати вашу колекцію.\n\nЗверніть увагу, що ці опції не підходять для більшості користувачів, тому не перекладені, так що текст в них англійською мовою.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-uk/17-model-manager.xml b/AnkiDroid/src/main/res/values-uk/17-model-manager.xml
index 412671fc9dd8..e0de7a9154e1 100644
--- a/AnkiDroid/src/main/res/values-uk/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-uk/17-model-manager.xml
@@ -68,9 +68,9 @@
     <string name="model_delete_warning">Ви впевнені, що хочете видалити цей тип запису?</string>
     <string name="field_delete_warning">Ви впевнені, що хочете видалити це поле?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Додати: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Клонувати: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Введіть шаблон, який використовуватиме переглядач карток для відображення ваших карток. Використовуйте це для відображення стислішої відповіді.\n\nШаблон передньої сторони\n\"Столицею {{Країна}} є:\"\nможна стиснути в переглядачі карток до\n\"Столиця:{{Країна}}\"</string>
     <string name="card_template_browser_appearance_question_format">Формат запитання</string>
diff --git a/AnkiDroid/src/main/res/values-ur/02-strings.xml b/AnkiDroid/src/main/res/values-ur/02-strings.xml
index c1b78ab38d19..6e983fa898b4 100644
--- a/AnkiDroid/src/main/res/values-ur/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ur/02-strings.xml
@@ -234,7 +234,7 @@
     <string name="note_editor_image_too_large">تصویر بہت بڑی ہے، براہ کرم دستی طور پر تصویر داخل کریں۔</string>
     <string name="note_editor_video_too_large">ویڈیو فائل بہت بڑی ہے، براہ کرم ویڈیو کو دستی طور پر داخل کریں۔</string>
     <string name="note_editor_audio_too_large">آڈیو فائل بہت بڑی ہے، براہ کرم آڈیو کو دستی طور پر داخل کریں۔</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android بیک اپ جاری ہے۔ دوبارہ کوشش کریں</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">AnkiDroid کو شارٹ کٹ شامل کرنے کی اجازت دینے کے لیے آپ کو iManager استعمال کرنے کی ضرورت پڑ سکتی ہے۔</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">آپ کی ہوم اسکرین AnkiDroid کو شارٹ کٹ شامل کرنے کی اجازت نہیں دیتی ہے۔</string>
     <string name="create_shortcut_error">شارٹ کٹ شامل کرنے میں خرابی: %s</string>
@@ -306,20 +306,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">ریکارڈنگ محفوظ ہو گئی</string>
     <string name="deleting_selected_notes">منتخب نوٹوں کو حذف کیا جا رہا ہے</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        سننے کے لیے آواز کو تھپتھپائیں
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">آواز کو استعمال کرنے سے پہلے انسٹال کرنا چاہیے
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">بہرحال استعمال کریں
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">ٹیکسٹ ٹو اسپیچ کی خرابی (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        انٹرنیٹ
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        انسٹال کریں
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        متن سے اسپیچ کی ترتیبات کو کھولنے میں ناکام
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">مزید ڈیک ڈاؤن لوڈ کرنے کے لیے براہ کرم لاگ ان کریں</string>
     <string name="deck_description_field_hint">تفصیل</string>
     <string name="failed_to_copy">کاپی کرنے میں ناکام</string>
diff --git a/AnkiDroid/src/main/res/values-ur/03-dialogs.xml b/AnkiDroid/src/main/res/values-ur/03-dialogs.xml
index ae062e68e385..e1cf53dea546 100644
--- a/AnkiDroid/src/main/res/values-ur/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ur/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">ڈیٹا بیس کی خرابی۔</string>
     <string name="answering_error_message">مجموعہ پر لکھنا ناکام ہو گیا۔ ڈیٹا بیس کرپٹ ہو سکتا ہے یا ڈسک پر کافی جگہ خالی نہیں ہو سکتی۔\n\nاگر ایسا زیادہ ہوتا ہے تو ڈیٹا بیس کو چیک کرنے، جمع کو ٹھیک کرنے یا اسے بیک اپ سے بحال کرنے کی کوشش کریں۔ اس کے لیے \"اختیارات\" کو ٹچ کریں۔\n\یا یہ AnkiDroid بگ بھی ہو سکتا ہے۔ براہ کرم غلطی کی اطلاع دیں تاکہ ہم اسے چیک کر سکیں۔</string>
     <string name="answering_error_report">غلطی کی اطلاع دیں۔</string>
-    <string name="storage_full_message">AnkiDroid کھولنے کے لیے کافی خالی جگہ نہیں ہے۔ جاری رکھنے کے لیے کچھ جگہ خالی کریں۔</string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">کیا آپ واقعی ڈیٹا بیس کو ٹھیک کرنے کی کوشش کرنا چاہتے ہیں؟\n\nکوشش شروع کرنے سے پہلے، ذیلی فولڈر \"%s\" میں ایک کاپی بنائی جائے گی۔</string>
     <string name="intent_aedict_empty">زمرہ \"ڈیفالٹ\" خالی ہے۔</string>
     <string name="intent_aedict_category">AnkiDroid میں کارڈز شامل کرنے کے لیے تمام نوٹ پیڈ کیٹیگریز کو ہٹا دیں یا \"ڈیفالٹ\" کے نام سے ایک شامل کریں۔</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">بعد میں</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">دوبارہ نہ دکھائیں</string>
     <string name="dismiss_backup_warning_title">ڈیٹا ضائع ہونے کی وارننگ</string>
-    <string name="dismiss_backup_warning_new_user">       Android پرائیویسی کی تبدیلیوں کی وجہ سے، آپ کا ڈیٹا اور خودکار بیک اپ حذف ہو جائیں گے۔اگر ایپ ان انسٹال ہے تو آپ کے فون سے
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        اینڈرائیڈ پرائیویسی تبدیلیوں کی وجہ سے، آپ کا ڈیٹا اور خودکار بیک اپ ہوں گے اگر ایپ ان انسٹال ہے تو ناقابل رسائی
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">ڈیک پہلے سے موجود ہے</string>
     <string name="empty_deck_name">ڈیک کا نام خالی نہیں ہو سکتا</string>
     <string name="create_deck_numeric_hint">اگر آپ کو ڈیک آرڈر کرنے کے مسائل ہیں (جیسے \'10\' \'2\' سے پہلے ظاہر ہوتا ہے)، \'2\' کو \'02\' سے بدل دیں</string>
diff --git a/AnkiDroid/src/main/res/values-ur/10-preferences.xml b/AnkiDroid/src/main/res/values-ur/10-preferences.xml
index 76cd17eb7f99..3711d4dfe0b0 100644
--- a/AnkiDroid/src/main/res/values-ur/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ur/10-preferences.xml
@@ -297,8 +297,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-ur/17-model-manager.xml b/AnkiDroid/src/main/res/values-ur/17-model-manager.xml
index 4cd47e53b961..aa8d7d56f0f0 100644
--- a/AnkiDroid/src/main/res/values-ur/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ur/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">کیا آپ واقعی اس نوٹ کی قسم کو حذف کرنا چاہتے ہیں؟</string>
     <string name="field_delete_warning">کیا آپ واقعی اس فیلڈ کو حذف کرنا چاہتے ہیں؟</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">شامل کریں: %1$s</string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">کلون: %1$s</string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">سوال کی شکل</string>
diff --git a/AnkiDroid/src/main/res/values-uz/02-strings.xml b/AnkiDroid/src/main/res/values-uz/02-strings.xml
index 6ea623471c1b..23dfdbdf156c 100644
--- a/AnkiDroid/src/main/res/values-uz/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-uz/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-uz/03-dialogs.xml b/AnkiDroid/src/main/res/values-uz/03-dialogs.xml
index 568506b57755..5a33c3b31f6c 100644
--- a/AnkiDroid/src/main/res/values-uz/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-uz/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Database error</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Report error</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-uz/10-preferences.xml b/AnkiDroid/src/main/res/values-uz/10-preferences.xml
index 29e92629b16c..2afb72668806 100644
--- a/AnkiDroid/src/main/res/values-uz/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-uz/10-preferences.xml
@@ -297,8 +297,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-uz/17-model-manager.xml b/AnkiDroid/src/main/res/values-uz/17-model-manager.xml
index 6b89a122d404..eff2650b23bb 100644
--- a/AnkiDroid/src/main/res/values-uz/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-uz/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Are you sure you wish to delete this field?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>
diff --git a/AnkiDroid/src/main/res/values-ve/02-strings.xml b/AnkiDroid/src/main/res/values-ve/02-strings.xml
index d3c686c3bb2f..c2a6fe35b154 100644
--- a/AnkiDroid/src/main/res/values-ve/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ve/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-ve/03-dialogs.xml b/AnkiDroid/src/main/res/values-ve/03-dialogs.xml
index a90006f09ce1..5f136efb99fa 100644
--- a/AnkiDroid/src/main/res/values-ve/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ve/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Database error</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Report error</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-ve/10-preferences.xml b/AnkiDroid/src/main/res/values-ve/10-preferences.xml
index 29e92629b16c..2afb72668806 100644
--- a/AnkiDroid/src/main/res/values-ve/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ve/10-preferences.xml
@@ -297,8 +297,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-ve/17-model-manager.xml b/AnkiDroid/src/main/res/values-ve/17-model-manager.xml
index 6b89a122d404..eff2650b23bb 100644
--- a/AnkiDroid/src/main/res/values-ve/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ve/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Are you sure you wish to delete this field?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>
diff --git a/AnkiDroid/src/main/res/values-vi/02-strings.xml b/AnkiDroid/src/main/res/values-vi/02-strings.xml
index 1d830b746831..8cf810a5f5d4 100644
--- a/AnkiDroid/src/main/res/values-vi/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-vi/02-strings.xml
@@ -229,7 +229,7 @@
     <string name="note_editor_image_too_large">Hình ảnh quá lớn, vui lòng chèn hình ảnh theo cách thủ công</string>
     <string name="note_editor_video_too_large">Tập tin video quá lớn, vui lòng chèn video theo cách thủ công</string>
     <string name="note_editor_audio_too_large">Tệp âm thanh quá lớn, vui lòng chèn âm thanh thủ công</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android đang sao lưu. Hãy thử lại sau</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">Bạn có thể cần sử dụng iManager để cho phép AnkiDroid thêm phím tắt</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Màn hình chính của bạn không cho phép AnkiDroid thêm phím tắt</string>
     <string name="create_shortcut_error">Không thể thêm shortcut: %s</string>
@@ -300,20 +300,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Đã lưu bản ghi âm</string>
     <string name="deleting_selected_notes">Xoá ghi chú đã chọn</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Nhấn vào một giọng nói để nghe
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Nên cài đặt giọng nói trước khi sử dụng
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Vẫn sử dụng
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Lỗi chuyển văn bản thành giọng nói (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Cài đặt
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Không mở được cài đặt chuyển văn bản sang giọng nói
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Vui lòng đăng nhập để tải thêm các bộ thẻ</string>
     <string name="deck_description_field_hint">Mô tả</string>
     <string name="failed_to_copy">Không sao chép được</string>
diff --git a/AnkiDroid/src/main/res/values-vi/03-dialogs.xml b/AnkiDroid/src/main/res/values-vi/03-dialogs.xml
index 10f8a11749c4..d559fa3ae4e5 100644
--- a/AnkiDroid/src/main/res/values-vi/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-vi/03-dialogs.xml
@@ -62,7 +62,7 @@
     <string name="answering_error_title">Lỗi cơ sở dữ liệu</string>
     <string name="answering_error_message">Ghi vào bộ sưu tập không thành công. Cơ sở dữ liệu có thể bị hỏng hoặc có thể không có đủ dung lượng trống.\n\nNếu điều này xảy ra thường xuyên hơn, hãy thử kiểm tra cơ sở dữ liệu, sửa chữa bộ sưu tập hoặc khôi phục nó từ bản sao lưu. Chạm vào “tùy chọn” cho điều đó. \n\Hoặc nó cũng có thể là lỗi AnkiDroid; vui lòng thông báo lỗi để chúng tôi có thể kiểm tra điều này.</string>
     <string name="answering_error_report">Báo cáo lỗi</string>
-    <string name="storage_full_message">Không đủ không gian lưu trữ miễn phí để mở AnkiDroid. Giải phóng một số không gian để tiếp tục. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Bạn có thực sự muốn sửa chữa cơ sở dữ liệu? \n\nTrước khi bắt đầu, một bản sao sẽ được tạo trong thư mục con \"%s\".</string>
     <string name="intent_aedict_empty">Danh mục \"mặc định\" rỗng</string>
     <string name="intent_aedict_category">Để thêm thẻ vào AnkiDroid, hãy xoá toàn bộ danh mục Notepad hoặc thêm danh mục tên \"mặc định\"</string>
@@ -208,10 +208,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Để sau</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Không hiển thị lại</string>
     <string name="dismiss_backup_warning_title">Cảnh báo mất dữ liệu</string>
-    <string name="dismiss_backup_warning_new_user">        Do những thay đổi về quyền riêng tư của Android, dữ liệu và các bản sao lưu tự động của bạn sẽ bị xoá khỏi điện thoại nếu ứng dụng bị gỡ cài đặt
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Do những thay đổi về quyền riêng tư của Android, dữ liệu và các bản sao lưu tự động của bạn sẽ không thể truy cập được nếu ứng dụng bị gỡ cài đặt
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Bộ thẻ đã tồn tại</string>
     <string name="empty_deck_name">Tên bộ thẻ không được để trống</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-vi/10-preferences.xml b/AnkiDroid/src/main/res/values-vi/10-preferences.xml
index 31351f63b732..87abb76e2cfc 100644
--- a/AnkiDroid/src/main/res/values-vi/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-vi/10-preferences.xml
@@ -293,8 +293,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Tùy chọn nhà phát triển</string>
     <string name="dev_options_enabled_pref" maxLength="41">Bật tùy chọn nhà phát triển</string>
     <string name="disable_dev_options">Tắt tùy chọn nhà phát triển</string>
-    <string name="dev_options_warning">        Hãy chắc chắn trước khi bật tùy chọn nhà phát triển. Các tùy chọn này rất nguy hiểm và có thể làm hỏng ứng dụng hoặc làm hỏng bộ sưu tập của bạn.\n\nXin lưu ý rằng các tùy chọn này không phù hợp với hầu hết người dùng và do đó không được dịch, vì vậy chúng bằng tiếng Anh.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-vi/17-model-manager.xml b/AnkiDroid/src/main/res/values-vi/17-model-manager.xml
index 56d485ff02ae..322d3a75fa8f 100644
--- a/AnkiDroid/src/main/res/values-vi/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-vi/17-model-manager.xml
@@ -62,9 +62,9 @@
     <string name="model_delete_warning">Bạn có chắc chắn muốn xóa loại ghi chú này không?</string>
     <string name="field_delete_warning">Bạn có chắc chắn muốn xóa trường này không?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Thêm: %1$s</string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Nhân bản: %1$s</string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Nhập mẫu mà trình duyệt thẻ sẽ sử dụng để hiển thị thẻ của bạn. Sử dụng tùy chọn này để hiển thị câu trả lời ngắn gọn hơn.\n\nMẫu trước của thẻ\n“Thủ đô của {{Country}} là:” \ncó thể được nén trong trình duyệt thẻ thành\n“Thủ đô: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Định dạng câu hỏi</string>
diff --git a/AnkiDroid/src/main/res/values-wo/01-core.xml b/AnkiDroid/src/main/res/values-wo/01-core.xml
index 7b4eb66c61bc..9ef7be03d79f 100644
--- a/AnkiDroid/src/main/res/values-wo/01-core.xml
+++ b/AnkiDroid/src/main/res/values-wo/01-core.xml
@@ -45,8 +45,8 @@
 -->
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Navigation drawer items-->
-    <string name="decks" maxLength="28">Élève </string>
-    <string name="card_browser" maxLength="28" comment="The usage of card browser inside the app (note the casing)">Porte</string>
+    <string name="decks" maxLength="28">Decks</string>
+    <string name="card_browser" maxLength="28" comment="The usage of card browser inside the app (note the casing)">Card browser</string>
     <string name="statistics" maxLength="28">Statistics</string>
     <string name="settings" maxLength="28">Settings</string>
     <string name="help" maxLength="28">Help</string>
diff --git a/AnkiDroid/src/main/res/values-wo/02-strings.xml b/AnkiDroid/src/main/res/values-wo/02-strings.xml
index 2d506f269e4d..9d6c7482d644 100644
--- a/AnkiDroid/src/main/res/values-wo/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-wo/02-strings.xml
@@ -229,7 +229,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -300,20 +300,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-wo/03-dialogs.xml b/AnkiDroid/src/main/res/values-wo/03-dialogs.xml
index 4c4d14477486..e649b069ab31 100644
--- a/AnkiDroid/src/main/res/values-wo/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-wo/03-dialogs.xml
@@ -62,7 +62,7 @@
     <string name="answering_error_title">Database error</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Report error</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
@@ -208,10 +208,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-wo/10-preferences.xml b/AnkiDroid/src/main/res/values-wo/10-preferences.xml
index 0b680887a4dd..0f0b55cad9c9 100644
--- a/AnkiDroid/src/main/res/values-wo/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-wo/10-preferences.xml
@@ -295,8 +295,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-wo/17-model-manager.xml b/AnkiDroid/src/main/res/values-wo/17-model-manager.xml
index 5fa571a5e4a9..c92fe77e4302 100644
--- a/AnkiDroid/src/main/res/values-wo/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-wo/17-model-manager.xml
@@ -62,9 +62,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Are you sure you wish to delete this field?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>
diff --git a/AnkiDroid/src/main/res/values-xh/02-strings.xml b/AnkiDroid/src/main/res/values-xh/02-strings.xml
index d3c686c3bb2f..c2a6fe35b154 100644
--- a/AnkiDroid/src/main/res/values-xh/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-xh/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-xh/03-dialogs.xml b/AnkiDroid/src/main/res/values-xh/03-dialogs.xml
index a90006f09ce1..5f136efb99fa 100644
--- a/AnkiDroid/src/main/res/values-xh/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-xh/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Database error</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Report error</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-xh/10-preferences.xml b/AnkiDroid/src/main/res/values-xh/10-preferences.xml
index 29e92629b16c..2afb72668806 100644
--- a/AnkiDroid/src/main/res/values-xh/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-xh/10-preferences.xml
@@ -297,8 +297,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-xh/17-model-manager.xml b/AnkiDroid/src/main/res/values-xh/17-model-manager.xml
index 6b89a122d404..eff2650b23bb 100644
--- a/AnkiDroid/src/main/res/values-xh/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-xh/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Are you sure you wish to delete this field?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>
diff --git a/AnkiDroid/src/main/res/values-yue/02-strings.xml b/AnkiDroid/src/main/res/values-yue/02-strings.xml
index 951be4a7045b..34c98ec442be 100644
--- a/AnkiDroid/src/main/res/values-yue/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-yue/02-strings.xml
@@ -229,7 +229,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -300,20 +300,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-yue/03-dialogs.xml b/AnkiDroid/src/main/res/values-yue/03-dialogs.xml
index 75dccb971b0a..1cf7ad7baedc 100644
--- a/AnkiDroid/src/main/res/values-yue/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-yue/03-dialogs.xml
@@ -62,7 +62,7 @@
     <string name="answering_error_title">Database error</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Report error</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
@@ -208,10 +208,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-yue/10-preferences.xml b/AnkiDroid/src/main/res/values-yue/10-preferences.xml
index 0b680887a4dd..0f0b55cad9c9 100644
--- a/AnkiDroid/src/main/res/values-yue/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-yue/10-preferences.xml
@@ -295,8 +295,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-yue/17-model-manager.xml b/AnkiDroid/src/main/res/values-yue/17-model-manager.xml
index 5fa571a5e4a9..c92fe77e4302 100644
--- a/AnkiDroid/src/main/res/values-yue/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-yue/17-model-manager.xml
@@ -62,9 +62,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Are you sure you wish to delete this field?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>
diff --git a/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml b/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml
index 868b87ea7cf5..d7c8d646a7f6 100644
--- a/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml
@@ -183,7 +183,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">背景</string>
     <string name="choose_an_image" maxLength="41">选择图片</string>
-    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">删除背景</string>
     <string name="remove_background_image">去除背景</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">恢复初始设置</string>
@@ -229,7 +229,7 @@
     <string name="note_editor_image_too_large">图片过大，请手动插入图像</string>
     <string name="note_editor_video_too_large">视频文件太大，请手动插入视频</string>
     <string name="note_editor_audio_too_large">音频文件太大，请手动插入音频</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        正在进行 Android 备份。请重试</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">请使用 iManager 来允许 AnkiDroid 添加快捷方式</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">您的主屏幕不允许 AnkiDroid 添加快捷方式</string>
     <string name="create_shortcut_error">添加快捷方式时出错：%s</string>
@@ -300,20 +300,14 @@
     <string name="browser_options_dialog_heading">浏览器选项</string>
     <string name="audio_saved">录音已保存</string>
     <string name="deleting_selected_notes">删除选定笔记</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        轻按声音来聆听
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">使用声音前应先安装声音
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">仍要使用
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">文本到语音错误(%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        互联网
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        安装
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        打开文本转语音设置失败
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">请登录以下载更多牌组</string>
     <string name="deck_description_field_hint">描述</string>
     <string name="failed_to_copy">复制失败</string>
diff --git a/AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml b/AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml
index c67726c1bf01..9b1b9875e5e5 100644
--- a/AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml
@@ -62,7 +62,7 @@
     <string name="answering_error_title">数据库错误</string>
     <string name="answering_error_message">写入集合时出错。可能是数据库损坏，或者磁盘空间不足。\n\n如果频繁发生此错误，请检查数据库，修复集合或从备份中恢复。点击\"选项\"按钮以执行上述操作。\n\n当然，也可能只是 AnkiDroid 的 bug，请报告这个错误，我们会尽力解决。</string>
     <string name="answering_error_report">报告错误</string>
-    <string name="storage_full_message">没有足够的可用存储空间来打开AnkiDroid。释放一些空间以继续。 </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">确实要尝试修复数据库吗？\n\n在开始前，副本将保存在子目录“%s”里。</string>
     <string name="intent_aedict_empty">类别“默认”为空</string>
     <string name="intent_aedict_category">向AnkiDroid中添加卡牌，需要删除所有NotePad类别，或者添加“默认(default)”类别。</string>
@@ -208,10 +208,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">稍后</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">不再显示</string>
     <string name="dismiss_backup_warning_title">数据丢失警告</string>
-    <string name="dismiss_backup_warning_new_user">        由于 Android 隐私发生变化，如果应用被卸载，您的数据和自动备份将从您的手机中删除
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        由于Android 隐私发生变化，如果应用被卸载，您的数据和自动备份将无法访问
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">牌组已存在</string>
     <string name="empty_deck_name">牌组名称不能为空</string>
     <string name="create_deck_numeric_hint">如果您有牌组排序问题 (例如“10”出现在“2”之前)，用“02”替换“2”</string>
diff --git a/AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml b/AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml
index c787cfd8d38d..0472f05b7c7a 100644
--- a/AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml
@@ -294,8 +294,7 @@
     <string name="pref_cat_dev_options" maxLength="41">开发者选项</string>
     <string name="dev_options_enabled_pref" maxLength="41">启用开发者选项</string>
     <string name="disable_dev_options">禁用开发者选项</string>
-    <string name="dev_options_warning">        启用开发者选项之前，您需要知晓这些选项很危险，可能会破坏应用程序或损坏您的牌组。\n\n注意这些选项不适合大多数用户，因而没有翻译，所以它们仍以英语显示。
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-zh-rCN/17-model-manager.xml b/AnkiDroid/src/main/res/values-zh-rCN/17-model-manager.xml
index ffbcc241d21a..f992c15b5c2c 100644
--- a/AnkiDroid/src/main/res/values-zh-rCN/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-zh-rCN/17-model-manager.xml
@@ -62,9 +62,9 @@
     <string name="model_delete_warning">您确定要删除此卡牌记录类型吗？</string>
     <string name="field_delete_warning">是否确定删除此字段？</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">添加：%1$s</string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">克隆：%1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">请输入卡牌浏览器用于显示您卡牌的模板。用此来显示更简洁的答案。\n\n一个前置模板\n“{{Country}} 的首都是：”\n可以被卡牌浏览器压缩为\n“首都：{{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">问题格式</string>
diff --git a/AnkiDroid/src/main/res/values-zh-rTW/02-strings.xml b/AnkiDroid/src/main/res/values-zh-rTW/02-strings.xml
index bad91e9755fb..9b2bf8d97327 100644
--- a/AnkiDroid/src/main/res/values-zh-rTW/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-zh-rTW/02-strings.xml
@@ -229,7 +229,7 @@
     <string name="note_editor_image_too_large">此圖像太大，無法貼上，請手動插入</string>
     <string name="note_editor_video_too_large">影片太大，無法貼上，請手動插入</string>
     <string name="note_editor_audio_too_large">此音訊檔太大，無法貼上，請手動插入</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android 備份進行中。請再試一次</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">你可能需要使用 iManager 以允許 Ankidroid 新增捷徑</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">您的主畫面不允許 AnkiDroid 新增捷徑</string>
     <string name="create_shortcut_error">新增捷徑時發生錯誤：%s</string>
@@ -300,19 +300,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">錄音已儲存</string>
     <string name="deleting_selected_notes">刪除選取的筆記</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">使用前應先安裝語音</string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">無論如何都要使用
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">文字轉語音錯誤 (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        網際網路
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        安裝
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        無法開啟文字轉語音設定
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">請登錄以下載更多卡組</string>
     <string name="deck_description_field_hint">描述</string>
     <string name="failed_to_copy">複製失敗</string>
diff --git a/AnkiDroid/src/main/res/values-zh-rTW/03-dialogs.xml b/AnkiDroid/src/main/res/values-zh-rTW/03-dialogs.xml
index f5c57449752b..c63b24beeeb0 100644
--- a/AnkiDroid/src/main/res/values-zh-rTW/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-zh-rTW/03-dialogs.xml
@@ -62,7 +62,7 @@
     <string name="answering_error_title">資料庫錯誤</string>
     <string name="answering_error_message">寫入資料庫時發生錯誤。可能是資料庫毀損或是記憶卡空間不足。\n\n如果這經常發生的話，請嘗試檢查資料庫，修復你的集合或從備份中還原。\n當然這也可能是 AnkiDroid 的程式錯誤，請回報錯誤讓我們知道。</string>
     <string name="answering_error_report">回報錯誤</string>
-    <string name="storage_full_message">無足夠空閒儲存空間用於開啟 AnkiDroid。請清理儲存空間後繼續。 </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">你真的想要修復資料庫嗎？\n\n在開始修復之前，會先複製一份備份檔案放置於資料夾\'%s\'中。</string>
     <string name="intent_aedict_empty">\'default\'類別是空的</string>
     <string name="intent_aedict_category">若要增加新卡片至 AnkiDroid，刪除所有的記事本類別或新增一個 \'default\' 牌組</string>
@@ -208,10 +208,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">稍後</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">不再顯示</string>
     <string name="dismiss_backup_warning_title">資料遺失警告</string>
-    <string name="dismiss_backup_warning_new_user">        由於 Android 隱私變更，你的資料和自動備份將在應用程式解除安裝時被刪除
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        由於 Android 隱私變更，你的資料和自動備份將在應用程式解除安裝時不再可存取
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">牌組已存在</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">如果你有牌組排序問題（例如“10”出現在“2”之前），用“02”替換“2”。</string>
diff --git a/AnkiDroid/src/main/res/values-zh-rTW/10-preferences.xml b/AnkiDroid/src/main/res/values-zh-rTW/10-preferences.xml
index f8eb7698c2d6..a838eb0574a1 100644
--- a/AnkiDroid/src/main/res/values-zh-rTW/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-zh-rTW/10-preferences.xml
@@ -294,8 +294,7 @@
     <string name="pref_cat_dev_options" maxLength="41">開發人員選項</string>
     <string name="dev_options_enabled_pref" maxLength="41">啟用開發人員選項</string>
     <string name="disable_dev_options">禁用開發人員選項</string>
-    <string name="dev_options_warning">        啟用開發者選項之前，您需要知曉這些選項很危險，可能會破壞應用程序或損壞您的牌組。 \n\n注意這些選項不適合大多數用戶，因而沒有翻譯，所以它們仍以英語顯示。
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-zh-rTW/17-model-manager.xml b/AnkiDroid/src/main/res/values-zh-rTW/17-model-manager.xml
index 90ea54eef6b2..8daea20fde67 100644
--- a/AnkiDroid/src/main/res/values-zh-rTW/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-zh-rTW/17-model-manager.xml
@@ -62,9 +62,9 @@
     <string name="model_delete_warning">是否希望刪除此筆記類型？</string>
     <string name="field_delete_warning">你確定要刪除此欄位嗎？</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">新增：%1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">複製：%1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">輸入卡片瀏覽器將用於展示你的卡片的模板。以此顯示更簡潔的答案。\n\n一種正面模板\n“{{國家}}的首都是：”\n會被卡片瀏覽器壓縮為\n“首都：{{國家}}”</string>
     <string name="card_template_browser_appearance_question_format">問題格式</string>
diff --git a/AnkiDroid/src/main/res/values-zu/02-strings.xml b/AnkiDroid/src/main/res/values-zu/02-strings.xml
index d3c686c3bb2f..c2a6fe35b154 100644
--- a/AnkiDroid/src/main/res/values-zu/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-zu/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
     <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
     <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">        Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
@@ -305,20 +305,14 @@
     <string name="browser_options_dialog_heading">Browser options</string>
     <string name="audio_saved">Recording saved</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">        Tap a voice to listen
-    </string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use
-    </string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway
-    </string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">        Internet
-    </string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">        Install
-    </string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">        Failed to open text to speech settings
-    </string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
     <string name="shared_decks_login_required">Please log in to download more decks</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="failed_to_copy">Failed to copy</string>
diff --git a/AnkiDroid/src/main/res/values-zu/03-dialogs.xml b/AnkiDroid/src/main/res/values-zu/03-dialogs.xml
index a90006f09ce1..5f136efb99fa 100644
--- a/AnkiDroid/src/main/res/values-zu/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-zu/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Database error</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
     <string name="answering_error_report">Report error</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue. </string>
+    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
@@ -212,10 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
-    <string name="dismiss_backup_warning_new_user">        Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled
-    </string>
-    <string name="dismiss_backup_warning_upgrade">        Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled
-    </string>
+    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Deck already exists</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">If you have deck ordering issues (e.g. ‘10’ appears before ‘2’), replace ‘2’ with ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-zu/10-preferences.xml b/AnkiDroid/src/main/res/values-zu/10-preferences.xml
index 29e92629b16c..2afb72668806 100644
--- a/AnkiDroid/src/main/res/values-zu/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-zu/10-preferences.xml
@@ -297,8 +297,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Developer options</string>
     <string name="dev_options_enabled_pref" maxLength="41">Enable developer options</string>
     <string name="disable_dev_options">Disable developer options</string>
-    <string name="dev_options_warning">        Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.
-    </string>
+    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-zu/17-model-manager.xml b/AnkiDroid/src/main/res/values-zu/17-model-manager.xml
index 6b89a122d404..eff2650b23bb 100644
--- a/AnkiDroid/src/main/res/values-zu/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-zu/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Are you sure you wish to delete this note type?</string>
     <string name="field_delete_warning">Are you sure you wish to delete this field?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s </string>
+    <string name="model_browser_add_add">Add: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s </string>
+    <string name="model_browser_add_clone">Clone: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enter the template that the card browser will use to display your cards. Use this to display a more concise answer.\n\nA front template of\n“The capital of {{Country}} is:”\ncould be compressed in the card browser to\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Question Format</string>

From cf684c5153f4827adf64af8c0c881979fa6311c7 Mon Sep 17 00:00:00 2001
From: Arthur Milchior <arthur@milchior.fr>
Date: Thu, 6 Mar 2025 06:06:14 +0100
Subject: [PATCH 112/200] NF: Introduce `isPrefererenceViewSplit`

While reviewing a PR, I found unclear why we checked whether the
window is compact. Admittedly, figuring out it means that the view is
split in two was not hard, still, I believe it's best to put it behind
a more descriptive value. This also ensure that if we decide to change
the criteria we use to decide whether to split or not, we will have to
change a single place.
---
 .../java/com/ichi2/anki/preferences/HeaderFragment.kt  | 10 +++++++++-
 .../java/com/ichi2/anki/preferences/Preferences.kt     |  7 +++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/HeaderFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/HeaderFragment.kt
index e9a7b0584050..26b8c36cd4a1 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/HeaderFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/HeaderFragment.kt
@@ -66,7 +66,7 @@ class HeaderFragment :
             requirePreference<SearchPreference>(R.string.search_preference_key).searchConfiguration,
         )
 
-        if (!resources.isWindowCompact()) {
+        if (settingsIsSplit) {
             parentFragmentManager.findFragmentById(R.id.settings_container)?.let {
                 val key = getHeaderKeyForFragment(it) ?: return@let
                 highlightPreference(key)
@@ -192,3 +192,11 @@ class HeaderFragment :
             }
     }
 }
+
+/**
+ * Whether the Settings view is split in two.
+ * If so, the left side contains the list of all preference categories, and the right side contains the category currently opened.
+ * Otherwise, the same view is used to show the list of categories first, and then one specific category.
+ */
+val Fragment.settingsIsSplit
+    get() = !resources.isWindowCompact()
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/Preferences.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/Preferences.kt
index 258ff3e2cc06..bac505d93862 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/Preferences.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/Preferences.kt
@@ -40,7 +40,6 @@ import com.google.android.material.appbar.MaterialToolbar
 import com.ichi2.anki.R
 import com.ichi2.anki.SingleFragmentActivity
 import com.ichi2.anki.utils.ext.sharedPrefs
-import com.ichi2.anki.utils.isWindowCompact
 import com.ichi2.utils.FragmentFactoryUtils
 import timber.log.Timber
 import kotlin.reflect.KClass
@@ -53,7 +52,7 @@ class PreferencesFragment :
     private val onBackPressedCallback =
         object : OnBackPressedCallback(true) {
             override fun handleOnBackPressed() {
-                if (resources.isWindowCompact() && childFragmentManager.backStackEntryCount > 0) {
+                if (!settingsIsSplit && childFragmentManager.backStackEntryCount > 0) {
                     childFragmentManager.popBackStack()
                 } else {
                     requireActivity().finish()
@@ -156,13 +155,13 @@ class PreferencesFragment :
         val fragmentClassName = arguments?.getString(INITIAL_FRAGMENT_EXTRA)
         val initialFragment =
             if (fragmentClassName == null) {
-                if (resources.isWindowCompact()) HeaderFragment() else GeneralSettingsFragment()
+                if (!settingsIsSplit) HeaderFragment() else GeneralSettingsFragment()
             } else {
                 FragmentFactoryUtils.instantiate<Fragment>(requireActivity(), fragmentClassName)
             }
         childFragmentManager.commit {
             // In big screens, show the headers fragment at the lateral navigation container
-            if (!resources.isWindowCompact()) {
+            if (settingsIsSplit) {
                 replace(R.id.lateral_nav_container, HeaderFragment())
             }
             replace(R.id.settings_container, initialFragment, initialFragment::class.java.name)

From 5707cfcc9f40c92977fb89ff1b582d18db4a2a69 Mon Sep 17 00:00:00 2001
From: Spencer Poisseroux <spoisseroux@me.com>
Date: Sat, 15 Mar 2025 00:40:29 -0400
Subject: [PATCH 113/200] test(preferences): add unit tests for getOrSetLong
 logic

- Verify existing Long preference retrieval
- Test new Long value persistence
- Handle negative/zero edge cases
---
 .../preferences/PreferenceExtensionsTest.kt   | 44 ++++++++++++++++++-
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/AnkiDroid/src/test/java/com/ichi2/preferences/PreferenceExtensionsTest.kt b/AnkiDroid/src/test/java/com/ichi2/preferences/PreferenceExtensionsTest.kt
index 1028e2cf85dd..810dea1170f8 100644
--- a/AnkiDroid/src/test/java/com/ichi2/preferences/PreferenceExtensionsTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/preferences/PreferenceExtensionsTest.kt
@@ -40,6 +40,13 @@ class PreferenceExtensionsTest {
         supplier: Supplier<String>,
     ): String = mockPreferences.getOrSetString(key, supplier)
 
+    private fun getOrSetLong(
+        key: String,
+        supplier: Supplier<Long>,
+    ): Long = mockPreferences.getOrSetLong(key, supplier)
+
+    // String Tests
+
     @Test
     fun existingKeyReturnsMappedValue() {
         val ret = getOrSetString(VALID_KEY, UNUSED_SUPPLIER)
@@ -69,16 +76,49 @@ class PreferenceExtensionsTest {
         getOrSetString(MISSING_KEY, EXCEPTION_SUPPLIER)
     }
 
+    // Long Tests
+
+    @Test
+    fun existingLongKeyReturnsStoredValue() {
+        mockPreferences.edit { putLong(LONG_VALID_KEY, LONG_VALID_VALUE) }
+        val result = getOrSetLong(LONG_VALID_KEY, LONG_UNUSED_SUPPLIER)
+        assertEquals(LONG_VALID_VALUE, result)
+    }
+
+    @Test
+    fun missingLongKeyPersistsValue() {
+        getOrSetLong(LONG_MISSING_KEY) { LONG_LAMBDA_VALUE }
+        assertEquals(LONG_LAMBDA_VALUE, mockPreferences.getLong(LONG_MISSING_KEY, -1))
+    }
+
+    @Test
+    fun handlesNegativeLongValue() {
+        getOrSetLong(NEGATIVE_TEST_KEY) { LONG_NEGATIVE_VALUE }
+        assertEquals(LONG_NEGATIVE_VALUE, mockPreferences.getLong(NEGATIVE_TEST_KEY, 0))
+    }
+
     private class ExpectedException : RuntimeException()
 
     private class UnexpectedException : RuntimeException()
 
     companion object {
-        private val UNUSED_SUPPLIER = Supplier<String> { throw UnexpectedException() }
-        private val EXCEPTION_SUPPLIER = Supplier<String> { throw ExpectedException() }
+        // String constants
         private const val VALID_KEY = "VALID"
         private const val VALID_RESULT = "WAS VALID KEY"
         private const val MISSING_KEY = "INVALID"
         private const val LAMBDA_RETURN = "LAMBDA"
+
+        // Long constants
+        private const val LONG_VALID_KEY = "LONG_VALID"
+        private const val LONG_VALID_VALUE = 42L
+        private const val LONG_MISSING_KEY = "LONG_INVALID"
+        private const val LONG_LAMBDA_VALUE = 100L
+        private const val LONG_NEGATIVE_VALUE = -500L
+        private const val NEGATIVE_TEST_KEY = "negative_test"
+
+        // Suppliers
+        private val UNUSED_SUPPLIER = Supplier<String> { throw UnexpectedException() }
+        private val EXCEPTION_SUPPLIER = Supplier<String> { throw ExpectedException() }
+        private val LONG_UNUSED_SUPPLIER = Supplier<Long> { throw UnexpectedException() }
     }
 }

From 6e94f812a66299ecaf6add3224444213aa45ab4e Mon Sep 17 00:00:00 2001
From: Akshit517 <akshitmandial517@gmail.com>
Date: Tue, 25 Feb 2025 05:21:59 +0530
Subject: [PATCH 114/200] fix(pre-commit-hook): update pre-commit hook to
 correctly unstaged file

---
 pre-commit | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pre-commit b/pre-commit
index 42d8e7221246..dda1358c407a 100755
--- a/pre-commit
+++ b/pre-commit
@@ -43,11 +43,13 @@ runKtlint () {
     if [ -s $diff_path ]; then
         git apply --ignore-whitespace $diff_path
         apply_exit_code=$?
-        if [apply_exit_code -ne 0]; then
+        if [ $apply_exit_code -ne 0 ]; then
             echo "`git apply` failed. You can find a patch of the version of the code before your `git commit` in $diff_path"
         else
             rm $diff_path
         fi
+    else
+      rm $diff_path
     fi
     unset diff_path
 

From b8066dca32da0fc6c3de98d39bd115e92fddf4ce Mon Sep 17 00:00:00 2001
From: Arthur Milchior <arthur@milchior.fr>
Date: Sun, 16 Mar 2025 16:11:13 +0100
Subject: [PATCH 115/200] NF: rename `modelId` key to `noteTypeId`

As this key is used inside the app and not to save any data, it's safe
to change it
---
 .../java/com/ichi2/anki/CardTemplateEditor.kt |  8 ++++----
 .../main/java/com/ichi2/anki/NoteEditor.kt    |  4 ++--
 .../ichi2/anki/notetype/ManageNotetypes.kt    |  2 +-
 .../com/ichi2/anki/CardTemplateEditorTest.kt  | 20 +++++++++----------
 .../java/com/ichi2/testutils/ActivityList.kt  |  2 +-
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateEditor.kt b/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateEditor.kt
index 6aa835bceb84..a8f52ef2f896 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateEditor.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateEditor.kt
@@ -170,7 +170,7 @@ open class CardTemplateEditor :
         // Load the args either from the intent or savedInstanceState bundle
         if (savedInstanceState == null) {
             // get model id
-            modelId = intent.getLongExtra(EDITOR_MODEL_ID, NOT_FOUND_NOTE_TYPE)
+            modelId = intent.getLongExtra(EDITOR_NOTE_TYPE_ID, NOT_FOUND_NOTE_TYPE)
             if (modelId == NOT_FOUND_NOTE_TYPE) {
                 Timber.e("CardTemplateEditor :: no model ID was provided")
                 finish()
@@ -183,7 +183,7 @@ open class CardTemplateEditor :
             tabToCursorPosition[0] = 0
             tabToViewId[0] = R.id.front_edit
         } else {
-            modelId = savedInstanceState.getLong(EDITOR_MODEL_ID)
+            modelId = savedInstanceState.getLong(EDITOR_NOTE_TYPE_ID)
             noteId = savedInstanceState.getLong(EDITOR_NOTE_ID)
             startingOrdId = savedInstanceState.getInt(EDITOR_START_ORD_ID)
             tabToCursorPosition = savedInstanceState.getSerializableCompat<HashMap<Int, Int?>>(TAB_TO_CURSOR_POSITION_KEY)!!
@@ -244,7 +244,7 @@ open class CardTemplateEditor :
     public override fun onSaveInstanceState(outState: Bundle) {
         with(outState) {
             tempModel?.let { putAll(it.toBundle()) }
-            putLong(EDITOR_MODEL_ID, modelId)
+            putLong(EDITOR_NOTE_TYPE_ID, modelId)
             putLong(EDITOR_NOTE_ID, noteId)
             putInt(EDITOR_START_ORD_ID, startingOrdId)
             putSerializable(TAB_TO_VIEW_ID, tabToViewId)
@@ -1394,7 +1394,7 @@ open class CardTemplateEditor :
         private const val TAB_TO_CURSOR_POSITION_KEY = "tabToCursorPosition"
         private const val EDITOR_VIEW_ID_KEY = "editorViewId"
         private const val TAB_TO_VIEW_ID = "tabToViewId"
-        private const val EDITOR_MODEL_ID = "modelId"
+        private const val EDITOR_NOTE_TYPE_ID = "noteTypeId"
         private const val EDITOR_NOTE_ID = "noteId"
         private const val EDITOR_START_ORD_ID = "ordId"
         private const val CARD_INDEX = "card_ord"
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt b/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt
index c5c1aedde86a..28eec339fc11 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt
@@ -1638,10 +1638,10 @@ class NoteEditor :
     private fun showCardTemplateEditor() {
         val intent = Intent(requireContext(), CardTemplateEditor::class.java)
         // Pass the model ID
-        intent.putExtra("modelId", currentlySelectedNotetype!!.id)
+        intent.putExtra("noteTypeId", currentlySelectedNotetype!!.id)
         Timber.d(
             "showCardTemplateEditor() for model %s",
-            intent.getLongExtra("modelId", NOT_FOUND_NOTE_TYPE),
+            intent.getLongExtra("noteTypeId", NOT_FOUND_NOTE_TYPE),
         )
         // Also pass the note id and ord if not adding new note
         if (!addNote && currentEditedCard != null) {
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/notetype/ManageNotetypes.kt b/AnkiDroid/src/main/java/com/ichi2/anki/notetype/ManageNotetypes.kt
index 0ae59b3dd810..7565e7399ea6 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/notetype/ManageNotetypes.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/notetype/ManageNotetypes.kt
@@ -73,7 +73,7 @@ class ManageNotetypes : AnkiActivity() {
                     ),
                 )
             },
-            onEditCards = { launchForChanges<CardTemplateEditor>(mapOf("modelId" to it.id)) },
+            onEditCards = { launchForChanges<CardTemplateEditor>(mapOf("noteTypeId" to it.id)) },
             onRename = ::renameNotetype,
             onDelete = ::deleteNotetype,
         )
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/CardTemplateEditorTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/CardTemplateEditorTest.kt
index 6f0d920993e8..c07a01ed24ae 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/CardTemplateEditorTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/CardTemplateEditorTest.kt
@@ -54,7 +54,7 @@ class CardTemplateEditorTest : RobolectricTest() {
         // Start the CardTemplateEditor with a specific model, and make sure the model starts unchanged
         val collectionBasicModelOriginal = getCurrentDatabaseModelCopy(modelName)
         val intent = Intent(Intent.ACTION_VIEW)
-        intent.putExtra("modelId", collectionBasicModelOriginal.getLong("id"))
+        intent.putExtra("noteTypeId", collectionBasicModelOriginal.getLong("id"))
         var templateEditorController =
             Robolectric
                 .buildActivity(CardTemplateEditor::class.java, intent)
@@ -174,7 +174,7 @@ class CardTemplateEditorTest : RobolectricTest() {
         // Start the CardTemplateEditor with a specific model, and make sure the model starts unchanged
         val collectionBasicModelOriginal = getCurrentDatabaseModelCopy(modelName)
         val intent = Intent(Intent.ACTION_VIEW)
-        intent.putExtra("modelId", collectionBasicModelOriginal.getLong("id"))
+        intent.putExtra("noteTypeId", collectionBasicModelOriginal.getLong("id"))
         val templateEditorController =
             Robolectric
                 .buildActivity(CardTemplateEditor::class.java, intent)
@@ -235,7 +235,7 @@ class CardTemplateEditorTest : RobolectricTest() {
         val modelName = "Basic"
         val collectionBasicModelOriginal = getCurrentDatabaseModelCopy(modelName)
         val intent = Intent(Intent.ACTION_VIEW)
-        intent.putExtra("modelId", collectionBasicModelOriginal.getLong("id"))
+        intent.putExtra("noteTypeId", collectionBasicModelOriginal.getLong("id"))
         val templateEditorController =
             Robolectric
                 .buildActivity(CardTemplateEditor::class.java, intent)
@@ -313,7 +313,7 @@ class CardTemplateEditorTest : RobolectricTest() {
 
             // Start the CardTemplateEditor with a specific model, and make sure the model starts unchanged
             val intent = Intent(Intent.ACTION_VIEW)
-            intent.putExtra("modelId", collectionBasicModelOriginal.getLong("id"))
+            intent.putExtra("noteTypeId", collectionBasicModelOriginal.getLong("id"))
             val templateEditorController =
                 Robolectric
                     .buildActivity(
@@ -413,7 +413,7 @@ class CardTemplateEditorTest : RobolectricTest() {
 
             // Start the CardTemplateEditor with a specific model, and make sure the model starts unchanged
             var intent = Intent(Intent.ACTION_VIEW)
-            intent.putExtra("modelId", collectionBasicModelOriginal.getLong("id"))
+            intent.putExtra("noteTypeId", collectionBasicModelOriginal.getLong("id"))
             var templateEditorController =
                 Robolectric
                     .buildActivity(
@@ -480,7 +480,7 @@ class CardTemplateEditorTest : RobolectricTest() {
 
             // Start the CardTemplateEditor back up after saving (which closes the thing...)
             intent = Intent(Intent.ACTION_VIEW)
-            intent.putExtra("modelId", collectionBasicModelOriginal.id)
+            intent.putExtra("noteTypeId", collectionBasicModelOriginal.id)
             templateEditorController =
                 Robolectric
                     .buildActivity(CardTemplateEditor::class.java, intent)
@@ -596,7 +596,7 @@ class CardTemplateEditorTest : RobolectricTest() {
 
             // Start the CardTemplateEditor with a specific model, and make sure the model starts unchanged
             val intent = Intent(Intent.ACTION_VIEW)
-            intent.putExtra("modelId", collectionBasicModelOriginal.id)
+            intent.putExtra("noteTypeId", collectionBasicModelOriginal.id)
             val templateEditorController =
                 Robolectric
                     .buildActivity(
@@ -694,7 +694,7 @@ class CardTemplateEditorTest : RobolectricTest() {
         val modelName = "Basic (optional reversed card)"
         val model = getCurrentDatabaseModelCopy(modelName)
         val intent = Intent(Intent.ACTION_VIEW)
-        intent.putExtra("modelId", model.id)
+        intent.putExtra("noteTypeId", model.id)
         val editor = super.startActivityNormallyOpenCollectionWithIntent(CardTemplateEditor::class.java, intent)
         val template = editor.tempModel?.getTemplate(0)
         MatcherAssert.assertThat("Deck ID element should exist", template?.jsonObject?.has("did"), Matchers.equalTo(true))
@@ -713,7 +713,7 @@ class CardTemplateEditorTest : RobolectricTest() {
         // Start the CardTemplateEditor with a specific model, and make sure the model starts unchanged
         val collectionBasicModelOriginal = getCurrentDatabaseModelCopy(modelName)
         val intent = Intent(Intent.ACTION_VIEW)
-        intent.putExtra("modelId", collectionBasicModelOriginal.getLong("id"))
+        intent.putExtra("noteTypeId", collectionBasicModelOriginal.getLong("id"))
         val templateEditorController =
             Robolectric
                 .buildActivity(CardTemplateEditor::class.java, intent)
@@ -752,7 +752,7 @@ class CardTemplateEditorTest : RobolectricTest() {
         // Start the CardTemplateEditor with a specific model, and make sure the model starts unchanged
         val collectionBasicModelOriginal = getCurrentDatabaseModelCopy(modelName)
         val intent = Intent(Intent.ACTION_VIEW)
-        intent.putExtra("modelId", collectionBasicModelOriginal.id)
+        intent.putExtra("noteTypeId", collectionBasicModelOriginal.id)
         val templateEditorController =
             Robolectric
                 .buildActivity(CardTemplateEditor::class.java, intent)
diff --git a/AnkiDroid/src/test/java/com/ichi2/testutils/ActivityList.kt b/AnkiDroid/src/test/java/com/ichi2/testutils/ActivityList.kt
index 710522c07a70..41b27315c4fc 100644
--- a/AnkiDroid/src/test/java/com/ichi2/testutils/ActivityList.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/testutils/ActivityList.kt
@@ -103,7 +103,7 @@ object ActivityList {
         }
     }
 
-    private fun intentForCardTemplateEditor(): Intent = Intent().apply { putExtra("modelId", 1L) }
+    private fun intentForCardTemplateEditor(): Intent = Intent().apply { putExtra("noteTypeId", 1L) }
 
     class ActivityLaunchParam(
         var activity: Class<out Activity>,

From 1a0e346040805b90399c5b845565a277dcfb0ac8 Mon Sep 17 00:00:00 2001
From: Pankajkumar2608 <tarachandji104@gmail.com>
Date: Sun, 9 Mar 2025 15:45:19 +0530
Subject: [PATCH 116/200] Settings search contains the external context menu
 keys

They were not found by the search feature because it only index the
title and summaries set in the XML document.
---
 .../ichi2/anki/preferences/HeaderFragment.kt  | 22 +++++++++++++++++++
 .../src/main/res/values/10-preferences.xml    |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/HeaderFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/HeaderFragment.kt
index 26b8c36cd4a1..2afb0869d8bc 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/HeaderFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/HeaderFragment.kt
@@ -135,6 +135,28 @@ class HeaderFragment :
                     .withResId(R.xml.preferences_controls)
                     .addBreadcrumb(activity.getString(R.string.pref_cat_controls))
                     .addBreadcrumb(setDuePreferenceTitle)
+                // Some strings can't be indexed from the XML document as they are loaded from the back-end. We add them manually.
+                indexItem()
+                    .withKey(activity.getString(R.string.anki_card_external_context_menu_key))
+                    .withTitle(
+                        activity.getString(
+                            R.string.card_browser_enable_external_context_menu,
+                            activity.getString(R.string.context_menu_anki_card_label),
+                        ),
+                    ).withResId(R.xml.preferences_general)
+                    .addBreadcrumb(activity.getString(R.string.pref_cat_general))
+                    .addBreadcrumb(activity.getString(R.string.pref_cat_system_wide))
+
+                indexItem()
+                    .withKey(activity.getString(R.string.card_browser_external_context_menu_key))
+                    .withTitle(
+                        activity.getString(
+                            R.string.card_browser_enable_external_context_menu,
+                            activity.getString(R.string.card_browser_context_menu),
+                        ),
+                    ).withResId(R.xml.preferences_general)
+                    .addBreadcrumb(activity.getString(R.string.pref_cat_general))
+                    .addBreadcrumb(activity.getString(R.string.pref_cat_system_wide))
             }
 
             // Some preferences and categories are only shown conditionally,
diff --git a/AnkiDroid/src/main/res/values/10-preferences.xml b/AnkiDroid/src/main/res/values/10-preferences.xml
index 06296acd16ca..6631a7677d09 100644
--- a/AnkiDroid/src/main/res/values/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values/10-preferences.xml
@@ -94,7 +94,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Double scrolling</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>

From 8aefbc3fc6689dfb05d5ac979a55cfc195388461 Mon Sep 17 00:00:00 2001
From: AnkiDroid Translations <ankidroid@ankidroid.org>
Date: Sun, 16 Mar 2025 19:01:55 +0000
Subject: [PATCH 117/200] Updated strings from Crowdin

---
 .../src/main/res/values-cs/02-strings.xml     |  4 ++--
 .../src/main/res/values-cs/06-statistics.xml  |  2 +-
 AnkiDroid/src/main/res/values-da/01-core.xml  |  4 ++--
 AnkiDroid/src/main/res/values-de/01-core.xml  |  2 +-
 .../src/main/res/values-de/02-strings.xml     |  2 +-
 AnkiDroid/src/main/res/values-fa/01-core.xml  |  2 +-
 AnkiDroid/src/main/res/values-ga/01-core.xml  |  6 ++---
 .../src/main/res/values-ga/03-dialogs.xml     |  4 ++--
 AnkiDroid/src/main/res/values-gu/01-core.xml  |  4 ++--
 AnkiDroid/src/main/res/values-hi/01-core.xml  |  2 +-
 .../src/main/res/values-hu/02-strings.xml     |  2 +-
 AnkiDroid/src/main/res/values-ka/01-core.xml  |  2 +-
 AnkiDroid/src/main/res/values-kn/01-core.xml  | 24 +++++++++----------
 AnkiDroid/src/main/res/values-ml/01-core.xml  |  2 +-
 AnkiDroid/src/main/res/values-mr/01-core.xml  |  2 +-
 .../src/main/res/values-or/02-strings.xml     |  2 +-
 .../src/main/res/values-pt-rPT/02-strings.xml | 12 +++++-----
 .../src/main/res/values-pt-rPT/03-dialogs.xml |  6 ++---
 .../main/res/values-pt-rPT/10-preferences.xml |  2 +-
 .../res/values-pt-rPT/17-model-manager.xml    |  4 ++--
 AnkiDroid/src/main/res/values-sat/01-core.xml |  4 ++--
 .../src/main/res/values-sat/02-strings.xml    |  4 ++--
 AnkiDroid/src/main/res/values-ta/01-core.xml  |  2 +-
 AnkiDroid/src/main/res/values-te/01-core.xml  |  4 ++--
 AnkiDroid/src/main/res/values-tg/01-core.xml  |  2 +-
 .../src/main/res/values-tr/02-strings.xml     |  2 +-
 .../src/main/res/values-tr/03-dialogs.xml     |  2 +-
 AnkiDroid/src/main/res/values-tt/01-core.xml  |  2 +-
 AnkiDroid/src/main/res/values-ur/01-core.xml  |  2 +-
 .../src/main/res/values-zh-rCN/02-strings.xml | 14 +++++------
 .../src/main/res/values-zh-rCN/03-dialogs.xml |  6 ++---
 .../main/res/values-zh-rCN/10-preferences.xml |  2 +-
 .../res/values-zh-rCN/17-model-manager.xml    |  4 ++--
 .../src/main/res/values-zh-rTW/01-core.xml    |  4 ++--
 34 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/AnkiDroid/src/main/res/values-cs/02-strings.xml b/AnkiDroid/src/main/res/values-cs/02-strings.xml
index 6528744fb89c..e2d8992cf4da 100644
--- a/AnkiDroid/src/main/res/values-cs/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-cs/02-strings.xml
@@ -89,8 +89,8 @@
         <item quantity="many">+%d přeskočené</item>
         <item quantity="other">+%d přeskočených</item>
     </plurals>
-    <string name="studyoptions_total_new_label">Total new cards</string>
-    <string name="studyoptions_total_label">Total cards</string>
+    <string name="studyoptions_total_new_label">Všechny nové kartičky</string>
+    <string name="studyoptions_total_label">Všechny karty</string>
     <!-- Card editor -->
     <string name="cardeditor_title_edit_card" maxLength="28">Upravit poznámku</string>
     <string name="discard">Zahodit</string>
diff --git a/AnkiDroid/src/main/res/values-cs/06-statistics.xml b/AnkiDroid/src/main/res/values-cs/06-statistics.xml
index a50118f626c8..a92f88bf7059 100644
--- a/AnkiDroid/src/main/res/values-cs/06-statistics.xml
+++ b/AnkiDroid/src/main/res/values-cs/06-statistics.xml
@@ -44,5 +44,5 @@
 ~ this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <resources>
-    <string name="open_statistics" comment="Description of the shortcut that opens the statistics page">Open statistics</string>
+    <string name="open_statistics" comment="Description of the shortcut that opens the statistics page">Otevřít statistiku</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-da/01-core.xml b/AnkiDroid/src/main/res/values-da/01-core.xml
index ae6c67b35a54..c9df8b8d760a 100644
--- a/AnkiDroid/src/main/res/values-da/01-core.xml
+++ b/AnkiDroid/src/main/res/values-da/01-core.xml
@@ -134,10 +134,10 @@
     <string name="studyoptions_no_cards_due">Ingen kort i kø</string>
     <string name="sd_card_not_mounted">Enhedslagring er ikke tilkoblet</string>
     <string name="button_sync" comment="Text of the sync button" maxLength="28">Synkroniser</string>
-    <string name="cancel_sync_confirm" tools:ignore="UnusedResources">Vil du annullere synkroniseringen? </string>
+    <string name="cancel_sync_confirm" tools:ignore="UnusedResources">Vil du annullere synkroniseringen?</string>
     <string name="continue_sync" tools:ignore="UnusedResources">Fortsæt synkronisering</string>
     <string name="sync_cancelled" tools:ignore="UnusedResources">Synkronisering annulleret</string>
-    <string name="sync_cancel_message" tools:ignore="UnusedResources">Annullerer&#8230;\nDette kan tage et stykke tid. </string>
+    <string name="sync_cancel_message" tools:ignore="UnusedResources">Annullerer&#8230;\nDette kan tage et stykke tid.</string>
     <string name="syncing_media">Synkroniserer medier</string>
     <string name="export_deck" maxLength="28">Eksportér stak</string>
     <string name="export_collection">Eksportér samling</string>
diff --git a/AnkiDroid/src/main/res/values-de/01-core.xml b/AnkiDroid/src/main/res/values-de/01-core.xml
index 3977f2a32a60..60ad9fb73335 100644
--- a/AnkiDroid/src/main/res/values-de/01-core.xml
+++ b/AnkiDroid/src/main/res/values-de/01-core.xml
@@ -137,7 +137,7 @@
     <string name="cancel_sync_confirm" tools:ignore="UnusedResources">Wollen Sie die Synchronisation abbrechen?</string>
     <string name="continue_sync" tools:ignore="UnusedResources">Synchronisierung fortsetzen</string>
     <string name="sync_cancelled" tools:ignore="UnusedResources">Synchronisation abgebrochen</string>
-    <string name="sync_cancel_message" tools:ignore="UnusedResources">Breche ab&#8230;\nDies kann einige Zeit dauern.</string>
+    <string name="sync_cancel_message" tools:ignore="UnusedResources">Breche ab &#8230;\nDies kann einige Zeit dauern.</string>
     <string name="syncing_media">Synchronisiere Medien</string>
     <string name="export_deck" maxLength="28">Stapel exportieren</string>
     <string name="export_collection">Sammlung exportieren</string>
diff --git a/AnkiDroid/src/main/res/values-de/02-strings.xml b/AnkiDroid/src/main/res/values-de/02-strings.xml
index 722c6b00b582..9a5086c241c2 100644
--- a/AnkiDroid/src/main/res/values-de/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-de/02-strings.xml
@@ -274,7 +274,7 @@
     <string name="search_card_js_api_no_results">Suche lieferte keine Ergebnisse</string>
     <!--  JS Addons  -->
     <string name="not_valid_js_addon_package">%s ist kein gültiges JavaScript-Erweiterungspaket.</string>
-    <string name="could_not_create_dir">Verzeichnis %s konnte nicht erstellt werden </string>
+    <string name="could_not_create_dir">Verzeichnis %s konnte nicht erstellt werden</string>
     <string name="malicious_archive_entry_outside">Schädliches Archiv. Enthält Eintrag außerhalb des Zielverzeichnisses: %s</string>
     <string name="malicious_archive_exceeds_limit">Schädliches Archiv. Größe überschreitet %1$s oder enthält mehr als %2$d Dateien</string>
     <string name="file_extract_exceeds_storage_space">Datei-Extrahierung überschreitet Speicherplatz</string>
diff --git a/AnkiDroid/src/main/res/values-fa/01-core.xml b/AnkiDroid/src/main/res/values-fa/01-core.xml
index fdf4db46560f..70f9fdd7abd3 100644
--- a/AnkiDroid/src/main/res/values-fa/01-core.xml
+++ b/AnkiDroid/src/main/res/values-fa/01-core.xml
@@ -125,7 +125,7 @@
     <string name="empty_filtered_deck">درحال تخلیه دسته‌ی کارت فیلتر شده&#8230;</string>
     <string name="custom_study_deck_name">جلسه مطالعه سفارشی</string>
     <string name="custom_study_deck_exists">لطفا ابتدا دسته مطالعه سفارشی موجود را مجددا نام گذاری کنید.</string>
-    <string name="search_deck" comment="Deck search for selecting it">جستجوی دسته‌ها </string>
+    <string name="search_deck" comment="Deck search for selecting it">جستجوی دسته‌ها</string>
     <string name="empty_deck">این دسته خالی است</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">جستجوی دسته‌ها </string>
     <string name="invalid_deck_name">نام دسته نامعتبر است</string>
diff --git a/AnkiDroid/src/main/res/values-ga/01-core.xml b/AnkiDroid/src/main/res/values-ga/01-core.xml
index 8fb858336fc2..604d5d4449c9 100644
--- a/AnkiDroid/src/main/res/values-ga/01-core.xml
+++ b/AnkiDroid/src/main/res/values-ga/01-core.xml
@@ -81,9 +81,9 @@
     <string name="no_cards_placeholder_description">Start adding cards\nusing the + icon.</string>
     <!-- The deck picker via AnkiStatsTaskHandler.java -->
     <!-- flashcard_portrait.xml -->
-    <string name="type_answer_hint">Clóscríobh freagra </string>
+    <string name="type_answer_hint">Clóscríobh freagra</string>
     <string name="show_answer" maxLength="41">Taispeáin freagra</string>
-    <string name="hide_answer">Cuir freagra i bhfolach </string>
+    <string name="hide_answer">Cuir freagra i bhfolach</string>
     <string name="ease_button_again" maxLength="41">Arís</string>
     <string name="ease_button_hard" maxLength="41">Deacair</string>
     <string name="ease_button_good" maxLength="41">Maith</string>
@@ -128,7 +128,7 @@
     of the permissions/app info screen will differ between devices. -->
     <string name="startup_no_storage_permission">Please grant AnkiDroid the ‘Storage’ permission to continue</string>
     <string name="rebuild_filtered_deck">Rebuilding filtered deck&#8230;</string>
-    <string name="rebuild_cram_label" maxLength="28">Tóg arís </string>
+    <string name="rebuild_cram_label" maxLength="28">Tóg arís</string>
     <string name="empty_cram_label" maxLength="28">Folamh</string>
     <string name="create_subdeck">Create subdeck</string>
     <string name="empty_filtered_deck">Emptying filtered deck&#8230;</string>
diff --git a/AnkiDroid/src/main/res/values-ga/03-dialogs.xml b/AnkiDroid/src/main/res/values-ga/03-dialogs.xml
index 047f51bc6ad6..02a1db1c03ab 100644
--- a/AnkiDroid/src/main/res/values-ga/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ga/03-dialogs.xml
@@ -56,10 +56,10 @@
         <item quantity="other">Delete all cards in %1$s? It contains %2$d cards</item>
     </plurals>
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
-    <string name="no_tts_available_message">Níl TTS ar fáil sa teanga seo </string>
+    <string name="no_tts_available_message">Níl TTS ar fáil sa teanga seo</string>
     <string name="tts_no_tts">Teanga ar bith</string>
     <string name="reposition_card_not_new_error">Ní féidir ach cártaí nua a athlonnú </string>
-    <string name="reset_card_dialog_title">Glan stair an chárta maidir le do dhul ar aghaidh? </string>
+    <string name="reset_card_dialog_title">Glan stair an chárta maidir le do dhul ar aghaidh?</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d card reset</item>
         <item quantity="two">%d cards reset</item>
diff --git a/AnkiDroid/src/main/res/values-gu/01-core.xml b/AnkiDroid/src/main/res/values-gu/01-core.xml
index 6c175e4f450d..ca2faeedd0a5 100644
--- a/AnkiDroid/src/main/res/values-gu/01-core.xml
+++ b/AnkiDroid/src/main/res/values-gu/01-core.xml
@@ -85,7 +85,7 @@
     <string name="undo_action_whiteboard_last_stroke" comment="One of the display patterns of \'Undo\' item on the action menu in Reviewer. It is shown as the title of the item when the whiteboard (handwriting) feature is enabled and visible and has any strokes (handwritten lines)" maxLength="28">સ્ટ્રોક પૂર્વવત્ કરો</string>
     <string name="move_all_to_deck">બધી થપ્પી ખસેડી</string>
     <string name="unbury" maxLength="28">પાછું લાવો</string>
-    <string name="rename_deck" maxLength="28">થપ્પીનું નામ બદલો </string>
+    <string name="rename_deck" maxLength="28">થપ્પીનું નામ બદલો</string>
     <string name="create_shortcut">ટૂંકો રસ્તો બનાવો</string>
     <string name="browse_cards">કાર્ડસ જોવો</string>
     <string name="edit_deck_description" comment="edit the deck description">વર્ણન સંપાદિત કરો</string>
@@ -103,7 +103,7 @@
     <string name="menu_flag" maxLength="41">ધ્વજ</string>
     <string name="rename_flag">ફ્લેગોનું નામ બદલો</string>
     <string name="menu_flag_card" maxLength="28">કાર્ડને ચિહ્નિત કરો</string>
-    <string name="menu_edit_tags" maxLength="28">ચિહ્નો બદલો </string>
+    <string name="menu_edit_tags" maxLength="28">ચિહ્નો બદલો</string>
     <string name="delete_note_message">આ નોંધ અને તેના તમામ કાડઁ ખરેખર કાઢી નાખીએ ?\n%s</string>
     <string name="menu_search" maxLength="28">%1$s માં જુઓ </string>
     <string name="menu_mark_note" maxLength="28">નોંધ ચિહ્નિત કરો</string>
diff --git a/AnkiDroid/src/main/res/values-hi/01-core.xml b/AnkiDroid/src/main/res/values-hi/01-core.xml
index 47ac4ce7ff09..53ea6267643e 100644
--- a/AnkiDroid/src/main/res/values-hi/01-core.xml
+++ b/AnkiDroid/src/main/res/values-hi/01-core.xml
@@ -86,7 +86,7 @@
     <string name="move_all_to_deck">सभी को डेक में ले जाएं</string>
     <string name="unbury" maxLength="28">वापस लौंटे</string>
     <string name="rename_deck" maxLength="28">डेक का नाम बदलें</string>
-    <string name="create_shortcut">क्षुद्र मार्ग बनाएँ </string>
+    <string name="create_shortcut">क्षुद्र मार्ग बनाएँ</string>
     <string name="browse_cards">कार्ड ढुंढे</string>
     <string name="edit_deck_description" comment="edit the deck description">संपादित करें] वर्णन</string>
     <string name="menu_add" comment="A generic add button. Please inform us if you need more specific strings" maxLength="28">जोड़ें</string>
diff --git a/AnkiDroid/src/main/res/values-hu/02-strings.xml b/AnkiDroid/src/main/res/values-hu/02-strings.xml
index 38c27b9cfe7f..2a2db7ee8081 100644
--- a/AnkiDroid/src/main/res/values-hu/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-hu/02-strings.xml
@@ -286,7 +286,7 @@
     <string name="cd_manage_notetypes_add">Add a new note type</string>
     <!-- App Intro -->
     <string name="intro_ankidroid_tagline_one">Tanulj kevesebbet</string>
-    <string name="intro_ankidroid_tagline_two">Jegyezz meg többet </string>
+    <string name="intro_ankidroid_tagline_two">Jegyezz meg többet</string>
     <string name="intro_short_ankidroid_explanation">Az Anki kártyatervező időt spórol: megerősíti a leggyengébb emlékeidet, és megőrzi a legerősebbeket.</string>
     <string name="intro_get_started" comment="Action to start AnkiDroid for the first time without syncing from AnkiWeb">Kezdj hozzá</string>
     <string name="intro_sync_from_ankiweb">Szinkronizálás AnkiWebről</string>
diff --git a/AnkiDroid/src/main/res/values-ka/01-core.xml b/AnkiDroid/src/main/res/values-ka/01-core.xml
index d550be56a871..1fd9f5019ed5 100644
--- a/AnkiDroid/src/main/res/values-ka/01-core.xml
+++ b/AnkiDroid/src/main/res/values-ka/01-core.xml
@@ -177,7 +177,7 @@
     <string name="sync_conflict_keep_local_new" comment="Select AnkiDroid files to keep while syncing">AnkiDroid</string>
     <string name="sync_conflict_keep_remote_new" comment="Select AnkiWeb files to keep while syncing">Ankiweb</string>
     <string name="sync_conflict_remote_confirm_new">ჩავანაცვლოთ თქვენი კოლექცია Ankidroid-ზე თქვენი AnkiWeb-ის კოლექციით? </string>
-    <string name="sync_conflict_local_confirm_new">ჩანაცვლდეს თქვენი კოლექცია AnkiWeb-ზე თქვენი AnkiDroid-ის კოლექციით? </string>
+    <string name="sync_conflict_local_confirm_new">ჩანაცვლდეს თქვენი კოლექცია AnkiWeb-ზე თქვენი AnkiDroid-ის კოლექციით?</string>
     <string name="sync_conflict_title_new">აირჩიეთ კოლექცია რომ დარჩეს</string>
     <string name="sync_conflict_replace_title">კოლექციის ჩანაცვლება</string>
     <!-- Generic errors -->
diff --git a/AnkiDroid/src/main/res/values-kn/01-core.xml b/AnkiDroid/src/main/res/values-kn/01-core.xml
index 03e6aaee1a8c..15135556085f 100644
--- a/AnkiDroid/src/main/res/values-kn/01-core.xml
+++ b/AnkiDroid/src/main/res/values-kn/01-core.xml
@@ -46,15 +46,15 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Navigation drawer items-->
     <string name="decks" maxLength="28">ಡೆಕ್ಸ್</string>
-    <string name="card_browser" maxLength="28" comment="The usage of card browser inside the app (note the casing)">ಕಾರ್ಡ್ ಬ್ರೌಸರ್  </string>
-    <string name="statistics" maxLength="28">ಅಂಕಿಅಂಶಗಳು </string>
+    <string name="card_browser" maxLength="28" comment="The usage of card browser inside the app (note the casing)">ಕಾರ್ಡ್ ಬ್ರೌಸರ್</string>
+    <string name="statistics" maxLength="28">ಅಂಕಿಅಂಶಗಳು</string>
     <string name="settings" maxLength="28">ಸೆಟ್ಟಿಂಗ್‍ಗಳು</string>
-    <string name="help" maxLength="28">ಸಹಾಯ </string>
+    <string name="help" maxLength="28">ಸಹಾಯ</string>
     <string name="drawing">ಚಿತ್ರ</string>
-    <string name="send_feedback">ಪ್ರತಿಕ್ರಿಯೆ ಕಳುಹಿಸಿ </string>
-    <string name="studyoptions_start">ಅಧ್ಯಯನ </string>
+    <string name="send_feedback">ಪ್ರತಿಕ್ರಿಯೆ ಕಳುಹಿಸಿ</string>
+    <string name="studyoptions_start">ಅಧ್ಯಯನ</string>
     <!-- DeckPicker.kt -->
-    <string name="expand">ವಿಸ್ತರಿಸಿ </string>
+    <string name="expand">ವಿಸ್ತರಿಸಿ</string>
     <string name="collapse">ಬೀಳಿಸಿ</string>
     <plurals name="reviewer_window_title">
         <item quantity="one">%d ನಿಮಿಷಗಳು ಉಳಿದಿವೆ</item>
@@ -68,17 +68,17 @@
         <item quantity="one">%1$d day %2$dh left</item>
         <item quantity="other">%1$d days %2$dh left</item>
     </plurals>
-    <string name="no_cards_placeholder_title">ಸಂಗ್ರಹ ಖಾಲಿಯಾಗಿದೆ </string>
+    <string name="no_cards_placeholder_title">ಸಂಗ್ರಹ ಖಾಲಿಯಾಗಿದೆ</string>
     <string name="no_cards_placeholder_description">ಕಾರ್ಡ್‌ಗಳನ್ನು ಸೇರಿಸಲು ಪ್ರಾರಂಭಿಸಿ \n  + ಐಕಾನ್ ಬಳಸಿ</string>
     <!-- The deck picker via AnkiStatsTaskHandler.java -->
     <!-- flashcard_portrait.xml -->
     <string name="type_answer_hint">ಉತ್ತರವನ್ನು ಟೈಪ್ ಮಾಡಿ</string>
-    <string name="show_answer" maxLength="41">ಉತ್ತರ ತೋರಿಸು </string>
-    <string name="hide_answer">ಉತ್ತರವನ್ನು ಮರೆಮಾಡಿ </string>
-    <string name="ease_button_again" maxLength="41">ಮತ್ತೆ </string>
+    <string name="show_answer" maxLength="41">ಉತ್ತರ ತೋರಿಸು</string>
+    <string name="hide_answer">ಉತ್ತರವನ್ನು ಮರೆಮಾಡಿ</string>
+    <string name="ease_button_again" maxLength="41">ಮತ್ತೆ</string>
     <string name="ease_button_hard" maxLength="41">ಕಠಿಣ </string>
-    <string name="ease_button_good" maxLength="41">ಒಳ್ಳೆಯದು </string>
-    <string name="ease_button_easy">ಸುಲಭ </string>
+    <string name="ease_button_good" maxLength="41">ಒಳ್ಳೆಯದು</string>
+    <string name="ease_button_easy">ಸುಲಭ</string>
     <string name="menu_import" maxLength="28">ಇಂಪೋರ್ಟ್</string>
     <string name="undo" maxLength="28" comment="When tapping on this text, the last action is undone.">ರದ್ದು</string>
     <string name="redo" maxLength="28">ಮತ್ತೆ ಮಾಡು</string>
diff --git a/AnkiDroid/src/main/res/values-ml/01-core.xml b/AnkiDroid/src/main/res/values-ml/01-core.xml
index 01f9178fb802..d9e9cb1424ca 100644
--- a/AnkiDroid/src/main/res/values-ml/01-core.xml
+++ b/AnkiDroid/src/main/res/values-ml/01-core.xml
@@ -84,7 +84,7 @@
     <string name="redo" maxLength="28">വീണ്ടും ചെയ്യുക</string>
     <string name="undo_action_whiteboard_last_stroke" comment="One of the display patterns of \'Undo\' item on the action menu in Reviewer. It is shown as the title of the item when the whiteboard (handwriting) feature is enabled and visible and has any strokes (handwritten lines)" maxLength="28">സ്ട്രോക്ക് പഴയപടിയാക്കുക</string>
     <string name="move_all_to_deck">എല്ലാം ഡെക്കിലേക്ക് നീക്കുക</string>
-    <string name="unbury" maxLength="28"> അൺബറി</string>
+    <string name="unbury" maxLength="28">അൺബറി</string>
     <string name="rename_deck" maxLength="28">ഡെക്കിന്റെ പേരുമാറ്റുക</string>
     <string name="create_shortcut">കുറുക്കുവഴി സൃഷ്ടിക്കുക</string>
     <string name="browse_cards">കാർഡുകൾ ബ്രൗസ് ചെയ്യുക</string>
diff --git a/AnkiDroid/src/main/res/values-mr/01-core.xml b/AnkiDroid/src/main/res/values-mr/01-core.xml
index 64a7d524cf3b..b122001dc9ba 100644
--- a/AnkiDroid/src/main/res/values-mr/01-core.xml
+++ b/AnkiDroid/src/main/res/values-mr/01-core.xml
@@ -178,7 +178,7 @@
     <string name="sync_conflict_keep_remote_new" comment="Select AnkiWeb files to keep while syncing">एन्कीवेब</string>
     <string name="sync_conflict_remote_confirm_new">तुमचा एंकिवेब  वरील संग्रह पुर्नस्तीत करा एंकिड्रॉइड वर.</string>
     <string name="sync_conflict_local_confirm_new">AnkiWeb वरील तुमचा संग्रह AnkiDroid वरील तुमच्या संग्रहाने बदलायचा?</string>
-    <string name="sync_conflict_title_new">संग्रहाला  निवडा ठेवण्यासाठी </string>
+    <string name="sync_conflict_title_new">संग्रहाला  निवडा ठेवण्यासाठी</string>
     <string name="sync_conflict_replace_title">संग्रह पून्हास्तित करा</string>
     <!-- Generic errors -->
     <string name="error__etc__cannot_write_to_or_create_file">फाइलवर लिहू किंवा तयार करू शकत नाही %s</string>
diff --git a/AnkiDroid/src/main/res/values-or/02-strings.xml b/AnkiDroid/src/main/res/values-or/02-strings.xml
index 497361a608e1..b46d46cb6e01 100644
--- a/AnkiDroid/src/main/res/values-or/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-or/02-strings.xml
@@ -168,7 +168,7 @@
     <string name="dyn_deck_desc">ସାଧାରଣ କାର୍ଯ୍ୟସୂଚୀ ବାହାରେ ଅଧ୍ୟୟନ ପାଇଁ ଏହା ଏକ ସ୍ୱତନ୍ତ୍ର ତାସଖଣ୍ଡ। ଆପଣ ସମୀକ୍ଷା କରିବା ପରେ ପତ୍ରଗୁଡ଼ିକ ଆପେ ସେଗୁଡ଼ିକର ମୂଳ ତାସଖଣ୍ଡକୁ ଫେରି ଆସିବେ। ତାସଖଣ୍ଡ  ତାଲିକାରୁ ଏହି ତାସଖଣ୍ଡ ବିଲୋପ କରିବା ସମସ୍ତ ଅବଶିଷ୍ଟ ପତ୍ରଗୁଡ଼ିକୁ ସେମାନଙ୍କର ମୂଳ ତାସଖଣ୍ଡକୁ ଫେରାଇବ।</string>
     <string name="steps_error">ପାହୁଣ୍ଡଟି ୦ ଠାରୁ ବଡ଼ ସଂଖ୍ୟା ହେବା ଜରୁରୀ</string>
     <string name="steps_min_error">ଅତି କମରେ ୧ଟିଏ ପାହୁଣ୍ଡ ଆଵଶ୍ୟକ</string>
-    <string name="tag_editor_add_feedback"> “%1$s” କୁ ଯୋଡ଼ିବା ପାଇଁ “%2$s” ଦବାନ୍ତୁ</string>
+    <string name="tag_editor_add_feedback">“%1$s” କୁ ଯୋଡ଼ିବା ପାଇଁ “%2$s” ଦବାନ୍ତୁ</string>
     <string name="tag_editor_add_feedback_existing">ଵିଦ୍ୟମାନ ଟ୍ୟାଗ୍ “%1$s” ଚୟନ କରାଯାଇଛି</string>
     <!-- Time spans -->
     <string name="reminder_title">ଆଜି ଅଧ୍ୟୟନ କରିବାକୁ ଭୁଲନ୍ତୁ ନାହିଁ!</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml b/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml
index 2d3abf2ba9f5..6147e005271f 100644
--- a/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">A imagem é demasiado grande, por favor insira-a manualmente.</string>
     <string name="note_editor_video_too_large">O vídeo é demasiado grande, por favor insira-o manualmente.</string>
     <string name="note_editor_audio_too_large">O ficheiro de áudio é demasiado grande, por favor insira-o manualmente.</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Cópia de segurança em progresso. Por favor, tente de novo.</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">Pode precisar de utilizar o iManager para permitir que o AnkiDroid adicione atalhos.</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">O seu ecrã de início não permite que o AnkiDroid adicione atalhos.</string>
     <string name="create_shortcut_error">Erro ao adicionar atalho: %s</string>
@@ -305,14 +305,14 @@
     <string name="browser_options_dialog_heading">Opções de Explorador</string>
     <string name="audio_saved">Gravação guardada</string>
     <string name="deleting_selected_notes">Apagar as notas selecionadas</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Toque numa voz para a ouvir.</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Deve instalar uma voz antes de a poder utilizar.</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Utilizar de qualquer forma.</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Erro na conversão de texto para voz (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Instalar</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Não foi possível abrir as definições relativas à conversão de texto para voz.</string>
     <string name="shared_decks_login_required">Por favor, inicie sessão para transferir mais baralhos</string>
     <string name="deck_description_field_hint">Descrição</string>
     <string name="failed_to_copy">Falha ao copiar</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rPT/03-dialogs.xml b/AnkiDroid/src/main/res/values-pt-rPT/03-dialogs.xml
index 5d3cc41cfeb7..8e58972735b6 100644
--- a/AnkiDroid/src/main/res/values-pt-rPT/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-pt-rPT/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Erro na base de dados</string>
     <string name="answering_error_message">Falha ao gravar na colecção. A base de dados pode estar corrompida ou pode não haver espaço suficiente no disco.\n\nSe isto acontecer frequentemente, tente \"Verificar a Base de Dados\", \"Reparar a Colecção\", ou \"Restaurar uma Cópia de Segurança\". Toque em \"opções\" para realizar uma destas acções.\n\nOu então pode ser um erro no AnkiDroid, reporte-o para que possa ser analisado.</string>
     <string name="answering_error_report">Comunicar erro</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
+    <string name="storage_full_message">Não há espaço de armazenamento suficiente para abrir o AnkiDroid. Liberte algum espaço para poder continuar.</string>
     <string name="repair_deck_dialog">Realmente deseja tentar reparar a base de dados?\n\nAntes de iniciar a tentativa, será criada uma cópia na subpasta \'%s\'.</string>
     <string name="intent_aedict_empty">A categoria \'predefinida\' está vazia</string>
     <string name="intent_aedict_category">Para adicionar fichas na AnkiDroid remova todas as categorias de notas ou adicione uma com o nome \'predefinida\'</string>
@@ -212,8 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Mais tarde</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Não mostrar novamente</string>
     <string name="dismiss_backup_warning_title">Aviso de Perda de Dados</string>
-    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
-    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_new_user">Dadas as alterações às definições de privacidade do Android, os seus dados e cópias de segurança serão apagados do seu telemóvel, se desinstalar a aplicação.</string>
+    <string name="dismiss_backup_warning_upgrade">Dadas as alterações às definições de privacidade do Android, os seus dados e cópias de segurança serão inacessíveis se desinstalar a aplicação.</string>
     <string name="deck_already_exists">Este baralho já existe</string>
     <string name="empty_deck_name">O nome do baralho não pode estar vazio</string>
     <string name="create_deck_numeric_hint">Se tem problemas de ordenação com o seu baralho (e.g. o ‘10’ aparece antes do ‘2’), substitua o ‘2’ por ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rPT/10-preferences.xml b/AnkiDroid/src/main/res/values-pt-rPT/10-preferences.xml
index df2da8be351e..55810d8247fe 100644
--- a/AnkiDroid/src/main/res/values-pt-rPT/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-pt-rPT/10-preferences.xml
@@ -297,7 +297,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Opções de programador</string>
     <string name="dev_options_enabled_pref" maxLength="41">Ativar as opções de programador</string>
     <string name="disable_dev_options">Desativar opções do desenvolvedor</string>
-    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
+    <string name="dev_options_warning">Tenha a certeza antes de activar as opções de programador. Estas opções são perigosas e podem impedir o correcto funcionamento da aplicação ou a corrupção da sua colecção.\n\nRepare que estas opções não são adequadas para a maioria dos utilizadores e, por isso, não foram traduzidas do inglês.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-pt-rPT/17-model-manager.xml b/AnkiDroid/src/main/res/values-pt-rPT/17-model-manager.xml
index 95b99fca8e7f..dc80c2404a4b 100644
--- a/AnkiDroid/src/main/res/values-pt-rPT/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-pt-rPT/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Tem a certeza que quer apagar este tipo de nota?</string>
     <string name="field_delete_warning">Tem a certeza que pretende eliminar este campo?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s</string>
+    <string name="model_browser_add_add">Adicionar: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s</string>
+    <string name="model_browser_add_clone">Clonar: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Introduza o modelo que vai ser utilizado para apresentar as suas fichas. Utilize isto para apresentar uma resposta mais concisa.\n\nUm modelo para a frente da ficha\n\"A capital do {{país}} é:\"\npode ser reduzida para\n\"Capital: {{País}}\"</string>
     <string name="card_template_browser_appearance_question_format">Formato de Pergunta</string>
diff --git a/AnkiDroid/src/main/res/values-sat/01-core.xml b/AnkiDroid/src/main/res/values-sat/01-core.xml
index d324fb9d0863..64bd00a34917 100644
--- a/AnkiDroid/src/main/res/values-sat/01-core.xml
+++ b/AnkiDroid/src/main/res/values-sat/01-core.xml
@@ -107,7 +107,7 @@
     <string name="delete_note_message">ᱱᱚᱛᱴ ᱥᱟᱞᱟᱜ ᱛᱮ ᱡᱷᱚᱛᱚ ᱠᱟᱰ ᱨᱮᱭᱟᱜ ᱡᱤᱱᱥᱚ ᱠᱚ ᱜᱮᱫ ᱜᱤᱰᱤᱭᱟ ᱥᱮ?\n%s</string>
     <string name="menu_search" maxLength="28">%1$s ᱨᱮ ᱧᱮᱞ ᱵᱤᱰᱟᱣ ᱢᱮ</string>
     <string name="menu_mark_note" maxLength="28">ᱠᱷᱟᱴᱚ ᱵᱤᱪᱟᱹᱨ ᱪᱤᱱᱦᱟᱹᱭ ᱢᱮ</string>
-    <string name="menu_unmark_note">ᱠᱷᱟᱴᱚ ᱵᱤᱪᱟᱹᱨ ᱚ-ᱪᱤᱱᱦᱟᱹᱭ ᱢᱮ </string>
+    <string name="menu_unmark_note">ᱠᱷᱟᱴᱚ ᱵᱤᱪᱟᱹᱨ ᱚ-ᱪᱤᱱᱦᱟᱹᱭ ᱢᱮ</string>
     <string name="menu_enable_voice_playback" maxLength="28">ᱥᱮᱨᱮᱧ ᱯᱷᱟᱭᱞᱟᱣ ᱮᱱᱮᱡ</string>
     <string name="menu_disable_voice_playback">ᱥᱮᱨᱮᱧ ᱯᱷᱟᱭᱞᱟᱣ ᱵᱚᱫᱚᱞ</string>
     <string name="new_deck">ᱱᱟᱶᱟ ᱰᱮᱠ ᱛᱮᱭᱟᱨ ᱢᱮ</string>
@@ -151,7 +151,7 @@
     <string name="card_template_editor_deck_override" maxLength="28">ᱰᱮᱠ ᱠᱟᱰ ᱢᱮ</string>
     <string name="card_template_editor_insert_field" maxLength="28">ᱡᱟᱭᱜᱟ ᱠᱷᱚᱧᱡᱟᱭ ᱢᱮ</string>
     <string name="card_template_editor_select_field">ᱴᱷᱟᱶ ᱵᱟᱪᱷᱟᱣ ᱢᱮ</string>
-    <string name="card_template_editor_cant_delete">ᱠᱚᱢ ᱥᱮ ᱠᱚᱢ ᱢᱤᱫ ᱯᱨᱚᱠᱟᱨ ᱨᱮᱭᱟᱜ ᱠᱟᱰ ᱫᱚᱨᱠᱟᱨ ᱠᱟᱱᱟ </string>
+    <string name="card_template_editor_cant_delete">ᱠᱚᱢ ᱥᱮ ᱠᱚᱢ ᱢᱤᱫ ᱯᱨᱚᱠᱟᱨ ᱨᱮᱭᱟᱜ ᱠᱟᱰ ᱫᱚᱨᱠᱟᱨ ᱠᱟᱱᱟ</string>
     <plurals name="card_template_editor_confirm_add">
         <item quantity="one">ᱱᱚᱣᱟ %1$dᱜᱚᱴᱟᱝ ᱠᱟᱰ ᱥᱤᱨᱡᱟᱹᱣ ᱟ । ᱞᱟᱦᱟᱜ ᱟᱢ?</item>
         <item quantity="other">ᱱᱚᱣᱟ %1$dᱜᱚᱴᱟᱝ ᱠᱟᱰ ᱥᱤᱨᱡᱟᱹᱣ ᱟ । ᱞᱟᱦᱟᱜ ᱟᱢ?</item>
diff --git a/AnkiDroid/src/main/res/values-sat/02-strings.xml b/AnkiDroid/src/main/res/values-sat/02-strings.xml
index 68be718261a7..3480004b6005 100644
--- a/AnkiDroid/src/main/res/values-sat/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sat/02-strings.xml
@@ -70,7 +70,7 @@
     <string name="hide_whiteboard" maxLength="28">ᱥᱤᱠᱮᱴ ᱩᱠᱩᱭ ᱢᱮ </string>
     <string name="clear_whiteboard" maxLength="28">ᱥᱤᱠᱮᱴ ᱤᱬᱤᱡ ᱢᱮ </string>
     <string name="replay_audio" maxLength="28">Audio replay ᱢᱮ </string>
-    <string name="leech_suspend_notification">ᱠᱟᱰ ᱫᱚ leech ᱟᱨ ᱵᱚᱸᱫ ᱛᱮ ᱢᱟᱨᱠ ᱮᱱᱟ </string>
+    <string name="leech_suspend_notification">ᱠᱟᱰ ᱫᱚ leech ᱟᱨ ᱵᱚᱸᱫ ᱛᱮ ᱢᱟᱨᱠ ᱮᱱᱟ</string>
     <string name="leech_notification">ᱠᱟᱰ ᱫᱚ leech ᱛᱮ ᱢᱟᱨᱠ ᱮᱱᱟ </string>
     <string name="webview_crash_unknown">ᱵᱟᱝᱵᱟᱰᱟᱭᱟᱜ ᱵᱷᱩᱞ </string>
     <string name="webview_crash_unknwon_detailed">ᱱᱚᱶᱟ ᱫᱚ WebView ᱨᱮ ᱵᱷᱤᱛᱨᱤ ᱵᱷᱩᱞ ᱠᱷᱟᱛᱤᱨ ᱛᱮ </string>
@@ -200,7 +200,7 @@
     <!-- JS api -->
     <string name="api_version_developer_contact">ᱱᱚᱶᱟ ᱠᱟᱰ ᱫᱚ ᱵᱟᱝ ᱥᱟᱯᱯᱚᱨᱴ AnkiDroid ᱯᱷᱤᱪᱚᱨ ᱠᱚ ᱵᱮᱵᱷᱟᱨ ᱮᱫ ᱟᱭ ᱾ %1$s ᱰᱮᱵᱷᱞᱚᱯᱟᱹᱨ ᱥᱚᱢᱯᱚᱨᱠ ᱠᱚᱢ, ᱟᱨ ᱵᱟᱝ ᱣᱤᱠᱤ ᱧᱮᱞ ᱢᱮ ᱾ %2$s</string>
     <string name="invalid_json_data">ᱠᱟᱰ ᱵᱷᱩᱞ ᱰᱟᱴᱟ ᱮᱢᱠᱮᱫ ᱟ ᱾ %s</string>
-    <string name="valid_js_api_version"> ‌‌ᱵᱷᱩᱯ AnkiDroid JS API ᱵᱷᱟᱹᱨᱥᱚᱱ ᱾%s ᱰᱮᱵᱷᱞᱚᱯᱟᱹᱨ ᱥᱚᱢᱯᱚᱨᱠ ᱠᱚᱢ, ᱟᱨ ᱵᱟᱝ ᱣᱤᱠᱤ ᱧᱮᱞ ᱢᱮ ᱾</string>
+    <string name="valid_js_api_version">ᱵᱷᱩᱯ AnkiDroid JS API ᱵᱷᱟᱹᱨᱥᱚᱱ ᱾%s ᱰᱮᱵᱷᱞᱚᱯᱟᱹᱨ ᱥᱚᱢᱯᱚᱨᱠ ᱠᱚᱢ, ᱟᱨ ᱵᱟᱝ ᱣᱤᱠᱤ ᱧᱮᱞ ᱢᱮ ᱾</string>
     <string name="update_js_api_version">AnkiDroid JS API ᱟᱹᱯᱰᱮᱴ ᱢᱮᱱᱟᱜᱼᱟ ᱾ %s ᱰᱮᱵᱷᱞᱚᱯᱟᱹᱨ ᱥᱚᱢᱯᱚᱨᱠ ᱠᱚᱢ, ᱟᱨ ᱵᱟᱝ ᱣᱤᱠᱤ ᱧᱮᱞ ᱢᱮ ᱾</string>
     <string name="reviewer_invalid_api_version_visit_documentation">ᱫᱮᱠᱷᱟᱣ</string>
     <string name="anki_js_error_code">(ᱵᱷᱩᱞ ᱠᱳᱰ: %d)</string>
diff --git a/AnkiDroid/src/main/res/values-ta/01-core.xml b/AnkiDroid/src/main/res/values-ta/01-core.xml
index 71db1f8ddb00..6cd20ea59667 100644
--- a/AnkiDroid/src/main/res/values-ta/01-core.xml
+++ b/AnkiDroid/src/main/res/values-ta/01-core.xml
@@ -80,7 +80,7 @@
     <string name="ease_button_good" maxLength="41">நல்ல</string>
     <string name="ease_button_easy">எளிதாக</string>
     <string name="menu_import" maxLength="28">இறக்குமதி</string>
-    <string name="undo" maxLength="28" comment="When tapping on this text, the last action is undone.">செயல்தவிர்ப்பது </string>
+    <string name="undo" maxLength="28" comment="When tapping on this text, the last action is undone.">செயல்தவிர்ப்பது</string>
     <string name="redo" maxLength="28">மீண்டும் செய்</string>
     <string name="undo_action_whiteboard_last_stroke" comment="One of the display patterns of \'Undo\' item on the action menu in Reviewer. It is shown as the title of the item when the whiteboard (handwriting) feature is enabled and visible and has any strokes (handwritten lines)" maxLength="28">பக்கவாதத்தை செயல்தவிர்க்கவும்</string>
     <string name="move_all_to_deck">அனைத்தையும் தளத்திற்கு நகர்த்து</string>
diff --git a/AnkiDroid/src/main/res/values-te/01-core.xml b/AnkiDroid/src/main/res/values-te/01-core.xml
index 242857247683..b0498eb6ad68 100644
--- a/AnkiDroid/src/main/res/values-te/01-core.xml
+++ b/AnkiDroid/src/main/res/values-te/01-core.xml
@@ -50,7 +50,7 @@
     <string name="statistics" maxLength="28">గణాంకాలు</string>
     <string name="settings" maxLength="28">సెట్టింగులు</string>
     <string name="help" maxLength="28">సహాయం</string>
-    <string name="drawing">బొమ్మ </string>
+    <string name="drawing">బొమ్మ</string>
     <string name="send_feedback">స్పందన పంపండి</string>
     <string name="studyoptions_start">స్టడీ</string>
     <!-- DeckPicker.kt -->
@@ -68,7 +68,7 @@
         <item quantity="one">%1$d రోజు %2$dh మిగిలి ఉంది</item>
         <item quantity="other">%1$d రోజులు %2$dh మిగిలి ఉన్నాయి</item>
     </plurals>
-    <string name="no_cards_placeholder_title">సముదాయం ఖాళీ గా ఉంది </string>
+    <string name="no_cards_placeholder_title">సముదాయం ఖాళీ గా ఉంది</string>
     <string name="no_cards_placeholder_description">+ గుర్తు ని నొక్కి చీటీ కూర్చు</string>
     <!-- The deck picker via AnkiStatsTaskHandler.java -->
     <!-- flashcard_portrait.xml -->
diff --git a/AnkiDroid/src/main/res/values-tg/01-core.xml b/AnkiDroid/src/main/res/values-tg/01-core.xml
index f39cd4cf3b08..f40a05931978 100644
--- a/AnkiDroid/src/main/res/values-tg/01-core.xml
+++ b/AnkiDroid/src/main/res/values-tg/01-core.xml
@@ -54,7 +54,7 @@
     <string name="send_feedback">Фикру мулоҳиза фиристодан</string>
     <string name="studyoptions_start">Омӯхтан</string>
     <!-- DeckPicker.kt -->
-    <string name="expand">Васеъ кардан </string>
+    <string name="expand">Васеъ кардан</string>
     <string name="collapse">Фурӯпушоӣ</string>
     <plurals name="reviewer_window_title">
         <item quantity="one">%d minute left</item>
diff --git a/AnkiDroid/src/main/res/values-tr/02-strings.xml b/AnkiDroid/src/main/res/values-tr/02-strings.xml
index 6de42bf2cb5e..2f72abab36a1 100644
--- a/AnkiDroid/src/main/res/values-tr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tr/02-strings.xml
@@ -303,7 +303,7 @@
     <string name="toggle_cards_notes">Kartları/Notları Aç/Kapat</string>
     <string name="truncate_content_help">Tarayıcının her sırasının yüksekliğini içeriğin sadece ilk 3 satırını gösterecek şekilde kırp</string>
     <string name="browser_options_dialog_heading">Tarayıcı seçenekleri</string>
-    <string name="audio_saved">Alınan kayıtlar kaydedildi. </string>
+    <string name="audio_saved">Alınan kayıtlar kaydedildi.</string>
     <string name="deleting_selected_notes">Seçili notlar siliniyor</string>
     <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
     <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
diff --git a/AnkiDroid/src/main/res/values-tr/03-dialogs.xml b/AnkiDroid/src/main/res/values-tr/03-dialogs.xml
index 97b3ad91c688..3988615f0e66 100644
--- a/AnkiDroid/src/main/res/values-tr/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-tr/03-dialogs.xml
@@ -68,7 +68,7 @@
     <string name="repair_deck_dialog">Veritabanını onarmayı gerçekten denemek istiyor musunuz?\n\nGirişime başlamadan önce, \"%s\" altklasöründe bir kopya oluşturulacak.</string>
     <string name="intent_aedict_empty">\"Varsayılan\" kategorisi boş</string>
     <string name="intent_aedict_category">AnkiDroid\'e kart eklemek için bütün Not Defteri kategorilerini kaldırın veya \"default\" isminde bir tane ekleyin</string>
-    <string name="custom_study_new_extend">Bugünün yeni kart sınırını şu kadar arttırın/azaltın (“-3”) </string>
+    <string name="custom_study_new_extend">Bugünün yeni kart sınırını şu kadar arttırın/azaltın (“-3”)</string>
     <string name="custom_study_rev_extend">Bugünün gözden geçirme sınırını şu kadar arttırın/azaltın (“-3”)</string>
     <string name="custom_study_forgotten">Son x gündeki unutulan kartları izle:</string>
     <string name="custom_study_ahead">X günleri önce izle:</string>
diff --git a/AnkiDroid/src/main/res/values-tt/01-core.xml b/AnkiDroid/src/main/res/values-tt/01-core.xml
index 32faf1badb7c..006f65786166 100644
--- a/AnkiDroid/src/main/res/values-tt/01-core.xml
+++ b/AnkiDroid/src/main/res/values-tt/01-core.xml
@@ -138,7 +138,7 @@
     <string name="syncing_media">Syncing media</string>
     <string name="export_deck" maxLength="28">Колоданы экспортлау</string>
     <string name="export_collection">Export collection</string>
-    <string name="nothing">Берни </string>
+    <string name="nothing">Берни</string>
     <!-- Card template editor -->
     <string name="title_activity_template_editor">Кәрт төрләре</string>
     <string name="card_template_editor_front">Алгы шаблон</string>
diff --git a/AnkiDroid/src/main/res/values-ur/01-core.xml b/AnkiDroid/src/main/res/values-ur/01-core.xml
index c677bc76aaf0..b2c38e954bac 100644
--- a/AnkiDroid/src/main/res/values-ur/01-core.xml
+++ b/AnkiDroid/src/main/res/values-ur/01-core.xml
@@ -50,7 +50,7 @@
     <string name="statistics" maxLength="28">اعداد و شمار</string>
     <string name="settings" maxLength="28">ترتیبات</string>
     <string name="help" maxLength="28">مدد</string>
-    <string name="drawing">تصور لگائے </string>
+    <string name="drawing">تصور لگائے</string>
     <string name="send_feedback">فیڈ بیک بھیجیں</string>
     <string name="studyoptions_start">مطالعہ</string>
     <!-- DeckPicker.kt -->
diff --git a/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml b/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml
index d7c8d646a7f6..c5ffeae6e451 100644
--- a/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml
@@ -229,7 +229,7 @@
     <string name="note_editor_image_too_large">图片过大，请手动插入图像</string>
     <string name="note_editor_video_too_large">视频文件太大，请手动插入视频</string>
     <string name="note_editor_audio_too_large">音频文件太大，请手动插入音频</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">正在进行 Android 备份。请重试</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">请使用 iManager 来允许 AnkiDroid 添加快捷方式</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">您的主屏幕不允许 AnkiDroid 添加快捷方式</string>
     <string name="create_shortcut_error">添加快捷方式时出错：%s</string>
@@ -300,14 +300,14 @@
     <string name="browser_options_dialog_heading">浏览器选项</string>
     <string name="audio_saved">录音已保存</string>
     <string name="deleting_selected_notes">删除选定笔记</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">轻按声音来聆听</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">使用声音前应先安装声音</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">仍要使用</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">文本到语音错误(%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">互联网</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">安装</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">打开文本转语音设置失败</string>
     <string name="shared_decks_login_required">请登录以下载更多牌组</string>
     <string name="deck_description_field_hint">描述</string>
     <string name="failed_to_copy">复制失败</string>
diff --git a/AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml b/AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml
index 9b1b9875e5e5..5a0dd352ce84 100644
--- a/AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml
@@ -62,7 +62,7 @@
     <string name="answering_error_title">数据库错误</string>
     <string name="answering_error_message">写入集合时出错。可能是数据库损坏，或者磁盘空间不足。\n\n如果频繁发生此错误，请检查数据库，修复集合或从备份中恢复。点击\"选项\"按钮以执行上述操作。\n\n当然，也可能只是 AnkiDroid 的 bug，请报告这个错误，我们会尽力解决。</string>
     <string name="answering_error_report">报告错误</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
+    <string name="storage_full_message">没有足够的可用存储空间来打开AnkiDroid。释放一些空间以继续。</string>
     <string name="repair_deck_dialog">确实要尝试修复数据库吗？\n\n在开始前，副本将保存在子目录“%s”里。</string>
     <string name="intent_aedict_empty">类别“默认”为空</string>
     <string name="intent_aedict_category">向AnkiDroid中添加卡牌，需要删除所有NotePad类别，或者添加“默认(default)”类别。</string>
@@ -208,8 +208,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">稍后</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">不再显示</string>
     <string name="dismiss_backup_warning_title">数据丢失警告</string>
-    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
-    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_new_user">由于 Android 隐私发生变化，如果应用被卸载，您的数据和自动备份将从您的手机中删除</string>
+    <string name="dismiss_backup_warning_upgrade">由于Android 隐私发生变化，如果应用被卸载，您的数据和自动备份将无法访问</string>
     <string name="deck_already_exists">牌组已存在</string>
     <string name="empty_deck_name">牌组名称不能为空</string>
     <string name="create_deck_numeric_hint">如果您有牌组排序问题 (例如“10”出现在“2”之前)，用“02”替换“2”</string>
diff --git a/AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml b/AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml
index 0472f05b7c7a..b2cf00f97899 100644
--- a/AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml
@@ -294,7 +294,7 @@
     <string name="pref_cat_dev_options" maxLength="41">开发者选项</string>
     <string name="dev_options_enabled_pref" maxLength="41">启用开发者选项</string>
     <string name="disable_dev_options">禁用开发者选项</string>
-    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
+    <string name="dev_options_warning">启用开发者选项之前，您需要知晓这些选项很危险，可能会破坏应用程序或损坏您的牌组。\n\n注意这些选项不适合大多数用户，因而没有被翻译，所以它们仍以英语显示。</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-zh-rCN/17-model-manager.xml b/AnkiDroid/src/main/res/values-zh-rCN/17-model-manager.xml
index f992c15b5c2c..b873ab66285a 100644
--- a/AnkiDroid/src/main/res/values-zh-rCN/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-zh-rCN/17-model-manager.xml
@@ -62,9 +62,9 @@
     <string name="model_delete_warning">您确定要删除此卡牌记录类型吗？</string>
     <string name="field_delete_warning">是否确定删除此字段？</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s</string>
+    <string name="model_browser_add_add">添加：%1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s</string>
+    <string name="model_browser_add_clone">克隆：%1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">请输入卡牌浏览器用于显示您卡牌的模板。用此来显示更简洁的答案。\n\n一个前置模板\n“{{Country}} 的首都是：”\n可以被卡牌浏览器压缩为\n“首都：{{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">问题格式</string>
diff --git a/AnkiDroid/src/main/res/values-zh-rTW/01-core.xml b/AnkiDroid/src/main/res/values-zh-rTW/01-core.xml
index e14e9bdf0bfd..dd23c8657c09 100644
--- a/AnkiDroid/src/main/res/values-zh-rTW/01-core.xml
+++ b/AnkiDroid/src/main/res/values-zh-rTW/01-core.xml
@@ -92,12 +92,12 @@
     <string name="menu_my_account" comment="Label of the window in which the user should enter their account. This text can\'t be found in AnkiDroid directly.">同步帳戶</string>
     <string name="menu_dismiss_note" maxLength="41">隐藏/删除</string>
     <string name="menu_bury_card" maxLength="28">暫時隱藏卡片 </string>
-    <string name="menu_bury_note" maxLength="28">暫時隱藏筆記 </string>
+    <string name="menu_bury_note" maxLength="28">暫時隱藏筆記</string>
     <string name="menu_suspend_card" maxLength="28">暫停卡片 </string>
     <string name="menu_suspend_note" maxLength="28">長久擱置筆記 </string>
     <string name="menu_bury" maxLength="28">埋葬</string>
     <string name="menu_suspend" maxLength="28">擱置</string>
-    <string name="menu_delete_note" maxLength="28">刪除筆記 </string>
+    <string name="menu_delete_note" maxLength="28">刪除筆記</string>
     <string name="menu_flag" maxLength="41">標記</string>
     <string name="rename_flag">重命名標記</string>
     <string name="menu_flag_card" maxLength="28">標記卡片</string>

From 5c0be725baa062cad423ef3769e27619758734a7 Mon Sep 17 00:00:00 2001
From: Arthur Milchior <arthur@milchior.fr>
Date: Mon, 17 Mar 2025 01:09:21 +0100
Subject: [PATCH 118/200] NF: testing changing the string

This will allow to check whether it appears as modified in crowdin
---
 AnkiDroid/src/main/res/values/12-dont-translate.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/AnkiDroid/src/main/res/values/12-dont-translate.xml b/AnkiDroid/src/main/res/values/12-dont-translate.xml
index 2898dfefbe0f..ac5bacf6e717 100644
--- a/AnkiDroid/src/main/res/values/12-dont-translate.xml
+++ b/AnkiDroid/src/main/res/values/12-dont-translate.xml
@@ -18,8 +18,6 @@
 <resources>
   <string
       name="crowdin_test_string_do_not_translate"
-      >
-    In order to ensure this string is not shown as untranslated, translate it the way you want. Probably using a single letter, so that it\'s quick. This string will never appear in ankidroid and is present here only to test crowdin feature.
-  </string>
+      >In order to ensure this string is not shown as untranslated, translate it the way you want. Probably using a single letter, so that it\'s quick. This string will never appear in ankidroid and is present here only to test crowdin feature.</string>
 </resources>
 

From 4beeacac4981152d2c9f4a102a2904bf04dcfeaa Mon Sep 17 00:00:00 2001
From: AnkiDroid Translations <ankidroid@ankidroid.org>
Date: Mon, 17 Mar 2025 00:12:45 +0000
Subject: [PATCH 119/200] Updated strings from Crowdin

---
 .../src/main/res/values-af/10-preferences.xml |  2 +-
 .../src/main/res/values-am/10-preferences.xml |  2 +-
 .../src/main/res/values-ar/02-strings.xml     |  6 +--
 .../src/main/res/values-ar/07-cardbrowser.xml |  6 +--
 .../src/main/res/values-ar/10-preferences.xml |  2 +-
 .../src/main/res/values-az/10-preferences.xml |  2 +-
 .../src/main/res/values-be/02-strings.xml     |  4 +-
 .../src/main/res/values-be/10-preferences.xml |  2 +-
 .../src/main/res/values-bg/10-preferences.xml |  2 +-
 .../src/main/res/values-bn/02-strings.xml     |  6 +--
 .../src/main/res/values-bn/10-preferences.xml | 10 ++--
 .../src/main/res/values-ca/02-strings.xml     |  4 +-
 .../src/main/res/values-ca/05-feedback.xml    |  2 +-
 .../src/main/res/values-ca/10-preferences.xml |  2 +-
 .../src/main/res/values-ckb/02-strings.xml    |  2 +-
 .../main/res/values-ckb/10-preferences.xml    |  2 +-
 .../src/main/res/values-cs/02-strings.xml     |  2 +-
 .../src/main/res/values-cs/10-preferences.xml |  4 +-
 AnkiDroid/src/main/res/values-da/01-core.xml  |  4 +-
 .../src/main/res/values-da/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-de/01-core.xml  |  2 +-
 .../src/main/res/values-de/10-preferences.xml |  2 +-
 .../src/main/res/values-el/02-strings.xml     |  2 +-
 .../src/main/res/values-el/08-widget.xml      |  2 +-
 .../src/main/res/values-el/10-preferences.xml |  4 +-
 .../src/main/res/values-eo/10-preferences.xml |  2 +-
 .../src/main/res/values-es-rAR/04-network.xml |  2 +-
 .../main/res/values-es-rAR/10-preferences.xml |  2 +-
 .../res/values-es-rAR/17-model-manager.xml    |  2 +-
 .../src/main/res/values-es-rES/02-strings.xml |  2 +-
 .../src/main/res/values-es-rES/04-network.xml |  2 +-
 .../main/res/values-es-rES/10-preferences.xml |  2 +-
 .../res/values-es-rES/17-model-manager.xml    |  2 +-
 .../src/main/res/values-et/10-preferences.xml |  2 +-
 .../src/main/res/values-eu/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-fa/01-core.xml  |  4 +-
 .../src/main/res/values-fa/10-preferences.xml |  2 +-
 .../src/main/res/values-fi/10-preferences.xml |  4 +-
 .../main/res/values-fil/10-preferences.xml    |  2 +-
 .../src/main/res/values-fr/10-preferences.xml |  2 +-
 .../src/main/res/values-fy/10-preferences.xml |  2 +-
 .../src/main/res/values-ga/03-dialogs.xml     |  2 +-
 .../src/main/res/values-ga/10-preferences.xml |  2 +-
 .../src/main/res/values-gl/10-preferences.xml |  2 +-
 .../main/res/values-got/10-preferences.xml    |  2 +-
 AnkiDroid/src/main/res/values-gu/01-core.xml  |  6 +--
 .../src/main/res/values-gu/10-preferences.xml |  2 +-
 .../src/main/res/values-heb/02-strings.xml    |  2 +-
 .../src/main/res/values-heb/03-dialogs.xml    |  4 +-
 .../main/res/values-heb/10-preferences.xml    |  2 +-
 .../src/main/res/values-hi/02-strings.xml     |  6 +--
 .../src/main/res/values-hi/04-network.xml     |  2 +-
 .../src/main/res/values-hi/10-preferences.xml | 18 +++----
 .../src/main/res/values-hi/11-arrays.xml      |  2 +-
 .../src/main/res/values-hr/02-strings.xml     |  6 +--
 .../src/main/res/values-hr/10-preferences.xml |  2 +-
 .../src/main/res/values-hu/03-dialogs.xml     |  4 +-
 .../src/main/res/values-hu/10-preferences.xml |  2 +-
 .../src/main/res/values-hy/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-ind/01-core.xml |  2 +-
 .../main/res/values-ind/10-preferences.xml    |  2 +-
 .../src/main/res/values-is/10-preferences.xml |  2 +-
 .../src/main/res/values-it/10-preferences.xml |  2 +-
 .../src/main/res/values-iw/02-strings.xml     |  2 +-
 .../src/main/res/values-iw/03-dialogs.xml     |  4 +-
 .../src/main/res/values-iw/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-ja/01-core.xml  |  2 +-
 .../src/main/res/values-ja/03-dialogs.xml     |  4 +-
 .../src/main/res/values-ja/10-preferences.xml |  2 +-
 .../src/main/res/values-jv/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-ka/01-core.xml  |  2 +-
 .../src/main/res/values-ka/02-strings.xml     |  2 +-
 .../src/main/res/values-ka/09-backup.xml      |  2 +-
 .../src/main/res/values-ka/10-preferences.xml |  2 +-
 .../src/main/res/values-kk/10-preferences.xml |  2 +-
 .../src/main/res/values-km/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-kn/01-core.xml  |  4 +-
 .../src/main/res/values-kn/02-strings.xml     |  2 +-
 .../src/main/res/values-kn/10-preferences.xml |  4 +-
 .../src/main/res/values-ko/10-preferences.xml |  2 +-
 .../main/res/values-ko/17-model-manager.xml   |  2 +-
 .../src/main/res/values-ku/10-preferences.xml |  2 +-
 .../src/main/res/values-ky/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-lt/01-core.xml  |  4 +-
 .../src/main/res/values-lt/10-preferences.xml |  4 +-
 .../src/main/res/values-lv/10-preferences.xml |  2 +-
 .../src/main/res/values-mk/10-preferences.xml |  2 +-
 .../src/main/res/values-ml/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-mn/01-core.xml  |  4 +-
 .../src/main/res/values-mn/02-strings.xml     |  6 +--
 .../src/main/res/values-mn/10-preferences.xml |  2 +-
 .../src/main/res/values-mr/10-preferences.xml |  2 +-
 .../src/main/res/values-ms/10-preferences.xml |  2 +-
 .../src/main/res/values-my/10-preferences.xml |  2 +-
 .../src/main/res/values-nl/02-strings.xml     |  2 +-
 .../src/main/res/values-nl/10-preferences.xml |  2 +-
 .../src/main/res/values-nn/04-network.xml     |  2 +-
 .../src/main/res/values-nn/10-preferences.xml |  2 +-
 .../src/main/res/values-no/04-network.xml     |  2 +-
 .../src/main/res/values-no/10-preferences.xml |  2 +-
 .../src/main/res/values-or/02-strings.xml     |  2 +-
 .../src/main/res/values-or/03-dialogs.xml     |  2 +-
 .../src/main/res/values-or/04-network.xml     |  2 +-
 .../src/main/res/values-or/07-cardbrowser.xml |  4 +-
 .../src/main/res/values-or/10-preferences.xml |  2 +-
 .../src/main/res/values-pa/10-preferences.xml |  2 +-
 .../src/main/res/values-pl/02-strings.xml     |  2 +-
 .../src/main/res/values-pl/10-preferences.xml |  6 +--
 .../main/res/values-pt-rBR/10-preferences.xml |  8 ++--
 .../main/res/values-pt-rPT/10-preferences.xml |  2 +-
 .../values-pt-rPT/16-multimedia-editor.xml    |  2 +-
 AnkiDroid/src/main/res/values-ro/01-core.xml  |  4 +-
 .../src/main/res/values-ro/10-preferences.xml |  2 +-
 .../src/main/res/values-ru/02-strings.xml     |  2 +-
 .../src/main/res/values-ru/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-sat/01-core.xml | 10 ++--
 .../src/main/res/values-sat/02-strings.xml    | 48 +++++++++----------
 .../src/main/res/values-sat/03-dialogs.xml    |  4 +-
 .../src/main/res/values-sat/04-network.xml    | 10 ++--
 .../src/main/res/values-sat/09-backup.xml     |  2 +-
 .../main/res/values-sat/10-preferences.xml    |  8 ++--
 .../src/main/res/values-sat/11-arrays.xml     |  2 +-
 .../res/values-sat/16-multimedia-editor.xml   | 10 ++--
 .../main/res/values-sat/17-model-manager.xml  |  4 +-
 .../src/main/res/values-sc/10-preferences.xml |  4 +-
 .../src/main/res/values-sk/10-preferences.xml |  2 +-
 .../src/main/res/values-sl/10-preferences.xml |  2 +-
 .../src/main/res/values-sq/10-preferences.xml |  2 +-
 .../src/main/res/values-sr/10-preferences.xml |  2 +-
 .../src/main/res/values-ss/10-preferences.xml |  2 +-
 .../src/main/res/values-sv/10-preferences.xml |  2 +-
 .../src/main/res/values-sw/10-preferences.xml |  2 +-
 .../src/main/res/values-ta/10-preferences.xml |  2 +-
 .../src/main/res/values-te/10-preferences.xml |  4 +-
 .../src/main/res/values-tg/10-preferences.xml |  2 +-
 .../main/res/values-tgl/10-preferences.xml    |  2 +-
 .../src/main/res/values-th/10-preferences.xml |  2 +-
 .../src/main/res/values-ti/10-preferences.xml |  2 +-
 .../src/main/res/values-tn/10-preferences.xml |  2 +-
 .../src/main/res/values-tr/03-dialogs.xml     |  2 +-
 .../src/main/res/values-tr/10-preferences.xml |  2 +-
 .../src/main/res/values-ts/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-tt/01-core.xml  |  2 +-
 .../src/main/res/values-tt/02-strings.xml     |  4 +-
 .../src/main/res/values-tt/03-dialogs.xml     |  2 +-
 .../src/main/res/values-tt/10-preferences.xml |  2 +-
 .../src/main/res/values-ug/10-preferences.xml |  2 +-
 .../src/main/res/values-uk/02-strings.xml     |  2 +-
 .../src/main/res/values-uk/10-preferences.xml |  4 +-
 .../main/res/values-uk/17-model-manager.xml   |  2 +-
 .../src/main/res/values-ur/10-preferences.xml |  2 +-
 .../src/main/res/values-uz/10-preferences.xml |  2 +-
 .../src/main/res/values-ve/10-preferences.xml |  2 +-
 .../src/main/res/values-vi/10-preferences.xml |  8 ++--
 .../src/main/res/values-wo/10-preferences.xml |  2 +-
 .../src/main/res/values-xh/10-preferences.xml |  2 +-
 .../main/res/values-yue/10-preferences.xml    |  2 +-
 .../main/res/values-zh-rCN/10-preferences.xml |  4 +-
 .../src/main/res/values-zh-rTW/01-core.xml    |  6 +--
 .../main/res/values-zh-rTW/10-preferences.xml |  2 +-
 .../src/main/res/values-zu/10-preferences.xml |  2 +-
 161 files changed, 260 insertions(+), 260 deletions(-)

diff --git a/AnkiDroid/src/main/res/values-af/10-preferences.xml b/AnkiDroid/src/main/res/values-af/10-preferences.xml
index 16ba5432758d..3b028afe2e39 100644
--- a/AnkiDroid/src/main/res/values-af/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-af/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Double scrolling</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>
diff --git a/AnkiDroid/src/main/res/values-am/10-preferences.xml b/AnkiDroid/src/main/res/values-am/10-preferences.xml
index 419f9b2e9ae4..dbbf55c6e869 100644
--- a/AnkiDroid/src/main/res/values-am/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-am/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Double scrolling</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>
diff --git a/AnkiDroid/src/main/res/values-ar/02-strings.xml b/AnkiDroid/src/main/res/values-ar/02-strings.xml
index 8653036eb563..565293ed09e6 100644
--- a/AnkiDroid/src/main/res/values-ar/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ar/02-strings.xml
@@ -63,7 +63,7 @@
     <!-- Reviewer.kt -->
     <string name="save_whiteboard" maxLength="28">حفظ السبورة</string>
     <string name="enable_stylus" maxLength="28">تمكين وضع Stylus</string>
-    <string name="disable_stylus"> تعطيل وضع Stylus</string>
+    <string name="disable_stylus">تعطيل وضع Stylus</string>
     <string name="enable_whiteboard" maxLength="28">تفعيل السبورة</string>
     <string name="disable_whiteboard">تعطيل السبورة</string>
     <string name="show_whiteboard">إظهار السبورة</string>
@@ -313,8 +313,8 @@
     <string name="app_not_initialized_new">AnkiDroid is not initialized yet. Please open AnkiDroid and try again</string>
     <string name="already_logged_in">تم تسجيل الدخول مسبقًا</string>
     <!-- Deck Creation -->
-    <string name="deck_created">كيفية </string>
-    <string name="deck_renamed">Minato </string>
+    <string name="deck_created">كيفية</string>
+    <string name="deck_renamed">Deck renamed</string>
     <!-- Deck Deletion -->
     <string name="deck_shortcut_doesnt_exist">تم حذف الرزمة. يرجى حذف الاختصار</string>
     <!-- Browser Options Dialog -->
diff --git a/AnkiDroid/src/main/res/values-ar/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-ar/07-cardbrowser.xml
index 71275cffe1b0..a67610e9d191 100644
--- a/AnkiDroid/src/main/res/values-ar/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-ar/07-cardbrowser.xml
@@ -82,7 +82,7 @@
     <string name="card_browser_list_my_searches_new_name">اسم عبارة البحث الحالية</string>
     <string name="card_browser_list_my_searches_new_search_error_empty_name">لا يمكنك حفظ عبارة بحث بدون اسم</string>
     <string name="card_browser_list_my_searches_new_search_error_dup">الاسم موجود</string>
-    <string name="no_note_to_edit">لا يوجد ملحوظات لتعديلها </string>
+    <string name="no_note_to_edit">لا يوجد ملحوظات لتعديلها</string>
     <string name="card_browser_list_my_searches_remove_content">هل تريد حذف “%1$s”؟</string>
     <string name="card_browser_change_display_order" maxLength="28">تغيير ترتيب العرض</string>
     <string name="card_browser_search_hint" comment="Message displayed in the search text field in the card browser.">بحث</string>
@@ -136,10 +136,10 @@
     <string name="edit_tags_dialog" comment="Description of the shortcut that opens the edit tags dialog">Edit tags dialog</string>
     <string name="show_order_dialog" comment="Description of the shortcut that shows the order dialog">إظهار مربع حوار الطلب</string>
     <!-- Manage columns dialog -->
-    <string name="browse_manage_columns_main_heading">أعمدة </string>
+    <string name="browse_manage_columns_main_heading">أعمدة</string>
     <string name="browse_manage_columns">إدارة الأعمدة</string>
     <string name="user_active_columns">فعال</string>
-    <string name="user_potential_columns">متوفر </string>
+    <string name="user_potential_columns">متوفر</string>
     <string name="include_column">إضافة عمود</string>
     <string name="exclude_column">استخراج عمود</string>
     <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
diff --git a/AnkiDroid/src/main/res/values-ar/10-preferences.xml b/AnkiDroid/src/main/res/values-ar/10-preferences.xml
index 849189dd4130..837a265cc0eb 100644
--- a/AnkiDroid/src/main/res/values-ar/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ar/10-preferences.xml
@@ -121,7 +121,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">النقر في أسفل اليسار</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">النقر في أسفل اليمين</string>
     <string name="gestures_shake" maxLength="41">رج الجهاز</string>
-    <string name="card_browser_enable_external_context_menu">قائمة \'%s\'</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">قائمة \'%s\'</string>
     <string name="card_browser_enable_external_context_menu_summary">يفعل قائمة سياق \'%s\' عمومًا</string>
     <string name="double_scrolling_gap" maxLength="41">مضاعفة فجوة التمرير</string>
     <string name="double_scrolling_gap_summ">مضاعفة فجوة التمرير مع القارئ الإلكتروني</string>
diff --git a/AnkiDroid/src/main/res/values-az/10-preferences.xml b/AnkiDroid/src/main/res/values-az/10-preferences.xml
index a04d6d329aae..4cf6b6d03b09 100644
--- a/AnkiDroid/src/main/res/values-az/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-az/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Double scrolling</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>
diff --git a/AnkiDroid/src/main/res/values-be/02-strings.xml b/AnkiDroid/src/main/res/values-be/02-strings.xml
index 3902bf933dcd..c4a4c981429b 100644
--- a/AnkiDroid/src/main/res/values-be/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-be/02-strings.xml
@@ -52,7 +52,7 @@
     <string name="CardEditorModel">Тып:</string>
     <string name="CardEditorTags">Меткі: %1$s</string>
     <string name="CardEditorCards">Карткі: %1$s</string>
-    <string name="edit_occlusions">Рэдагаваць аклюзіі </string>
+    <string name="edit_occlusions">Рэдагаваць аклюзіі</string>
     <string name="tag_name">Назва меткі</string>
     <string name="add_new_filter_tags">Дадаць/фільтраваць меткі</string>
     <string name="add_tag" maxLength="28">Дадаць метку</string>
@@ -75,7 +75,7 @@
     <string name="webview_crash_unknown">Невядомая памылка</string>
     <string name="webview_crash_unknwon_detailed">Выклікана ўнутранай памылкай у WebView</string>
     <string name="webview_crash_oom">Недастаткова памяці</string>
-    <string name="webview_crash_oom_details">WebView завершаны сістэмай. Звычайны гэта здараецца, калі праграме пачынае не хапаць сістэмнай памяці з-за вялікіх шрыфтоў або медыяфайлаў. </string>
+    <string name="webview_crash_oom_details">WebView завершаны сістэмай. Звычайны гэта здараецца, калі праграме пачынае не хапаць сістэмнай памяці з-за вялікіх шрыфтоў або медыяфайлаў.</string>
     <string name="webview_crash_nonfatal">Збой апрацоўшчыка WebView. Прычына: %s</string>
     <string name="webview_crash_fatal">Крытычная памылка: збой апрацоўшчыка WebView. Прычына: %s</string>
     <string name="webview_crash_loop_dialog_title">Памылка апрацоўшчыка сістэмнага WebView</string>
diff --git a/AnkiDroid/src/main/res/values-be/10-preferences.xml b/AnkiDroid/src/main/res/values-be/10-preferences.xml
index 88eace8a4167..2681f93340bf 100644
--- a/AnkiDroid/src/main/res/values-be/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-be/10-preferences.xml
@@ -119,7 +119,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Дотык ніжняга левага вугла</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Дотык ніжняга правага вугла</string>
     <string name="gestures_shake" maxLength="41">Патрасіце прыладу</string>
-    <string name="card_browser_enable_external_context_menu">Меню «%s»</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">Меню «%s»</string>
     <string name="card_browser_enable_external_context_menu_summary">Уключыць кантэкстнае меню «%s» у сістэме</string>
     <string name="double_scrolling_gap" maxLength="41">Падвоеная прагортка</string>
     <string name="double_scrolling_gap_summ">Падвоены разрыў прагорткі ў eReader</string>
diff --git a/AnkiDroid/src/main/res/values-bg/10-preferences.xml b/AnkiDroid/src/main/res/values-bg/10-preferences.xml
index 119b6b45b39d..0c0073676b60 100644
--- a/AnkiDroid/src/main/res/values-bg/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-bg/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Двойно превъртане</string>
     <string name="double_scrolling_gap_summ">Удвояване на разстоянието при превъртането при е-четци</string>
diff --git a/AnkiDroid/src/main/res/values-bn/02-strings.xml b/AnkiDroid/src/main/res/values-bn/02-strings.xml
index 4567f40ffea2..3c5be700e9cd 100644
--- a/AnkiDroid/src/main/res/values-bn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-bn/02-strings.xml
@@ -56,7 +56,7 @@
     <string name="tag_name">ট্যাগের নাম</string>
     <string name="add_new_filter_tags">ট্যাগ যুক্ত/ফিল্টার করুন</string>
     <string name="add_tag" maxLength="28">ট্যাগ যোগ করুন</string>
-    <string name="check_all_tags" maxLength="28">সবগুলো বাছাই/অবাছাই করুন </string>
+    <string name="check_all_tags" maxLength="28">সবগুলো বাছাই/অবাছাই করুন</string>
     <string name="filter_tags" maxLength="28">ট্যাগ ফিল্টার করুন</string>
     <string name="no_tags">আপনি এখনো কোন ট্যাগ যুক্ত করেননি</string>
     <string name="updated_version">%s সংস্করণে আপডেট করা হয়েছে</string>
@@ -138,7 +138,7 @@
     <string name="import_log_no_apkg">এটি কোন বৈধ আনকি প্যাকেজ ফাইল নয়</string>
     <string name="import_title_error" comment="Title of error dialog">ত্রুটি</string>
     <string name="import_error_handle_exception">ফাইল আমদানিতে ব্যর্থ\n\n%s</string>
-    <string name="import_error_not_apkg_extension"> \"%s\" ফাইলে .apkg বা .colpkg এক্সটেনশন নেই</string>
+    <string name="import_error_not_apkg_extension">\"%s\" ফাইলে .apkg বা .colpkg এক্সটেনশন নেই</string>
     <string name="import_error_load_imported_database">Anki ডাটাবেস (.anki2) প্রতিস্থাপন এখনও সমর্থিত নয়। প্রতিস্থাপন নির্দেশাবলীর জন্য ম্যানুয়াল দেখুন।</string>
     <string name="import_error_content_provider">নির্বাচিত ফাইলটি AnkiDroid দ্বারা স্বয়ংক্রিয়ভাবে আমদানি করা যায়নি। আনকি ফাইলটি ম্যানুয়ালি কিভাবে আমদানি করতে হয় তার জন্য অনুগ্রহ করে ব্যবহারকারীর ম্যানুয়ালটি পড়ুন: \n%s</string>
     <string name="import_error_copy_to_cache">ফাইল ক্যাশে করতে ব্যর্থ হয়েছে (সম্ভবত স্টোরেজ স্পেস নেই)</string>
@@ -164,7 +164,7 @@
     <string name="menu__deck_options" maxLength="28">ডেক বিকল্প</string>
     <string name="menu__study_options" comment="Menu item that opens options for a Filtered deck (aka Cram deck, aka Custom study)">অধ্যয়নের বিকল্প</string>
     <string name="select_tts" maxLength="28">TTS ভাষা সেট করুন</string>
-    <string name="custom_study" maxLength="28">কাস্টম অধ্যয়ন </string>
+    <string name="custom_study" maxLength="28">কাস্টম অধ্যয়ন</string>
     <string name="dyn_deck_desc">স্বাভাবিক সময়সূচীর বাইরে অধ্যয়ন করার জন্য এটি একটি বিশেষ ডেক। রিভিউয়ের পর কার্ডসমূহকে স্বয়ংক্রিয়ভাবে তাদের আসল ডেকসমূহে ফিরিয়ে দেয়া হবে। এই ডেকটি মুছে ফেলা হলে বাকি থাকা কার্ডগুলিকে তাদের আসল ডেকে ফিরিয়ে দেয়া হবে।</string>
     <string name="steps_error">ধাপ 0-এর বেশি হতে হবে</string>
     <string name="steps_min_error">অন্তত একটি পদক্ষেপ প্রয়োজন</string>
diff --git a/AnkiDroid/src/main/res/values-bn/10-preferences.xml b/AnkiDroid/src/main/res/values-bn/10-preferences.xml
index 66d5d8ccea2c..ac281c2d774e 100644
--- a/AnkiDroid/src/main/res/values-bn/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-bn/10-preferences.xml
@@ -80,13 +80,13 @@
     <string name="card_zoom" maxLength="41">কার্ড জুম</string>
     <string name="image_zoom" maxLength="41">ছবি জুম</string>
     <string name="button_size" maxLength="41">উত্তর বাটান আকার</string>
-    <string name="card_browser_font_size" maxLength="41">কার্ড ব্রাউজারের ফন্ট আকার </string>
-    <string name="card_browser_hide_media" maxLength="41">ব্রাউজারে ফাইলের নাম দেখান </string>
+    <string name="card_browser_font_size" maxLength="41">কার্ড ব্রাউজারের ফন্ট আকার</string>
+    <string name="card_browser_hide_media" maxLength="41">ব্রাউজারে ফাইলের নাম দেখান</string>
     <string name="card_browser_hide_media_summary">Display media filenames in the card browser question/answer fields</string>
-    <string name="col_path" maxLength="41">AnkiDroid ডিরেক্টরি </string>
+    <string name="col_path" maxLength="41">AnkiDroid ডিরেক্টরি</string>
     <string name="fullscreen_review" maxLength="41">ফুলস্ক্রিন মোড</string>
     <string name="full_screen_off">বন্ধ</string>
-    <string name="full_screen_system">সিস্টেম বার আড়াল করুন </string>
+    <string name="full_screen_system">সিস্টেম বার আড়াল করুন</string>
     <string name="full_screen_complete">সিস্টেম বার এবং উত্তর বোতাম লুকান</string>
     <string name="answer_buttons_position" maxLength="41">উত্তর বোতামের অবস্থান</string>
     <string-array name="answer_buttons_position_labels">
@@ -118,7 +118,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">নীচে বাম দিকে স্পর্শ করুন</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">নীচে ডানদিকে স্পর্শ করুন</string>
     <string name="gestures_shake" maxLength="41">ডিভাইস ঝাঁকান</string>
-    <string name="card_browser_enable_external_context_menu">\'%s\' মেনু</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">\'%s\' মেনু</string>
     <string name="card_browser_enable_external_context_menu_summary">বিশ্বব্যাপী \'%s\' প্রসঙ্গ মেনু সক্রিয় করে</string>
     <string name="double_scrolling_gap" maxLength="41">ডাবল স্ক্রলিং</string>
     <string name="double_scrolling_gap_summ">eReader এর সাথে স্ক্রোল ব্যবধান দ্বিগুণ করুন</string>
diff --git a/AnkiDroid/src/main/res/values-ca/02-strings.xml b/AnkiDroid/src/main/res/values-ca/02-strings.xml
index 2061d5b4293e..63b078887dc8 100644
--- a/AnkiDroid/src/main/res/values-ca/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ca/02-strings.xml
@@ -195,12 +195,12 @@
     <!-- Whiteboard save image message in Reviewer -->
     <string name="white_board_image_save_failed">Error al desar l\'imatge de la pissarra. %s</string>
     <string name="white_board_image_saved">Imatge de la pissara desada a %s</string>
-    <string name="title_whiteboard_editor" maxLength="28">Editor de la pissarra </string>
+    <string name="title_whiteboard_editor" maxLength="28">Editor de la pissarra</string>
     <string name="user_is_a_robot">Test automàtic detectat. Si ets un humà contacta amb el suport AnkiDroid</string>
     <!-- JS api -->
     <string name="api_version_developer_contact">Aquesta carta usa funcions AnkiDroid no compatibles. Contacta amb el desenvolupador %1$s, o mira la wiki %2$s</string>
     <string name="invalid_json_data">La carta ha proporcionat dades no vàlides. %s</string>
-    <string name="valid_js_api_version">Versió invàlida d\'API JS AnkiDroid. Contacta amb el desenvolupador %s o mira la wiki </string>
+    <string name="valid_js_api_version">Versió invàlida d\'API JS AnkiDroid. Contacta amb el desenvolupador %s o mira la wiki</string>
     <string name="update_js_api_version">Actualització disponible de l\'API JS AnkiDroid. Contacta amb el desenvolupador %s o mira la wiki</string>
     <string name="reviewer_invalid_api_version_visit_documentation">Veure</string>
     <string name="anki_js_error_code">(Codi d\'error: %d)</string>
diff --git a/AnkiDroid/src/main/res/values-ca/05-feedback.xml b/AnkiDroid/src/main/res/values-ca/05-feedback.xml
index b4b476c8b0c9..e1ba9e3096a2 100644
--- a/AnkiDroid/src/main/res/values-ca/05-feedback.xml
+++ b/AnkiDroid/src/main/res/values-ca/05-feedback.xml
@@ -55,5 +55,5 @@
     <string name="feedback_copy_debug">Copia les dades de depuració</string>
     <string name="feedback_report">Informa</string>
     <string name="feedback_report_automatically">Envia automàticament informes d\'error</string>
-    <string name="feedback_no_suitable_app_found">No s\'ha trobat cap aplicació adient. </string>
+    <string name="feedback_no_suitable_app_found">No s\'ha trobat cap aplicació adient.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ca/10-preferences.xml b/AnkiDroid/src/main/res/values-ca/10-preferences.xml
index 2ec70292a9a1..4d9738623789 100644
--- a/AnkiDroid/src/main/res/values-ca/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ca/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Tocar a baix a l\'esquerra</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Tocar a baix a la dreta</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">Menú ‘%s’</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">Menú ‘%s’</string>
     <string name="card_browser_enable_external_context_menu_summary">Permet a tot arreu el menú contextual \'%s\'</string>
     <string name="double_scrolling_gap" maxLength="41">Desplaçament doble</string>
     <string name="double_scrolling_gap_summ">Doble el scrolling amb l\'eReader</string>
diff --git a/AnkiDroid/src/main/res/values-ckb/02-strings.xml b/AnkiDroid/src/main/res/values-ckb/02-strings.xml
index 5236a1f3c028..51d87f61a038 100644
--- a/AnkiDroid/src/main/res/values-ckb/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ckb/02-strings.xml
@@ -128,7 +128,7 @@
     <string name="check_media" maxLength="28">پشکنینی ڕەنگاڵە</string>
     <string name="empty_cards" maxLength="28">کارتە بەتاڵەکان</string>
     <string name="unknown_type_field_warning">Type answer: unknown field %s</string>
-    <string name="delete_deck">دەستە دەسڕدرێتەوە&#8230; </string>
+    <string name="delete_deck">دەستە دەسڕدرێتەوە&#8230;</string>
     <string name="info_rate">Rate AnkiDroid</string>
     <string name="import_title">Importing</string>
     <string name="import_preparing_file">Preparing file for import&#8230;</string>
diff --git a/AnkiDroid/src/main/res/values-ckb/10-preferences.xml b/AnkiDroid/src/main/res/values-ckb/10-preferences.xml
index 1a12afc3c31c..5f33bc5fee24 100644
--- a/AnkiDroid/src/main/res/values-ckb/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ckb/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Double scrolling</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>
diff --git a/AnkiDroid/src/main/res/values-cs/02-strings.xml b/AnkiDroid/src/main/res/values-cs/02-strings.xml
index e2d8992cf4da..71b0ce8a5ea0 100644
--- a/AnkiDroid/src/main/res/values-cs/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-cs/02-strings.xml
@@ -352,7 +352,7 @@
     <string name="card_template_editor_group" comment="Label for the group of shortcuts related to the card template editor">Card Template Editor</string>
     <string name="edit_front_template" comment="Description of the shortcut that shows the question side of the card template">Edit front template</string>
     <string name="edit_back_template" comment="Description of the shortcut that shows the answer side of the card template">Edit back template</string>
-    <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Upravit formátování </string>
+    <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Upravit formátování</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">Akce uživatele %s není v tomto typu poznámky nastavena. Nakonfigurujte ji prosím</string>
diff --git a/AnkiDroid/src/main/res/values-cs/10-preferences.xml b/AnkiDroid/src/main/res/values-cs/10-preferences.xml
index e77478b1e220..dad229ecc8ef 100644
--- a/AnkiDroid/src/main/res/values-cs/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-cs/10-preferences.xml
@@ -119,7 +119,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Klepnutí vlevo dole</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Klepnutí vpravo dole</string>
     <string name="gestures_shake" maxLength="41">Zatřesení zařízením</string>
-    <string name="card_browser_enable_external_context_menu">Menu „%s“</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">Menu „%s“</string>
     <string name="card_browser_enable_external_context_menu_summary">Povolí globální kontextovou nabídku „%s“</string>
     <string name="double_scrolling_gap" maxLength="41">Dvojitý posun</string>
     <string name="double_scrolling_gap_summ">Dvojitý posuvník s eReader</string>
@@ -331,7 +331,7 @@
     </plurals>
     <!-- Delete unused media -->
     <string name="pref__delete_unused_media_files__title" maxLength="41" comment="Preference title">Odstranit nepoužívané multimediální soubory</string>
-    <string name="pref__delete_unused_media_files__summary">Odstranit obrázky a další multimédia, která nemají předponu _ a na které neodkazují žádné poznámky </string>
+    <string name="pref__delete_unused_media_files__summary">Odstranit obrázky a další multimédia, která nemají předponu _ a na které neodkazují žádné poznámky</string>
     <string name="dialog__delete_unused_media_files__title" comment="Title for a dialog where you can select unused media files to delete">Odstranit nepoužívané multimediální soubory</string>
     <!-- Delete backups -->
     <string name="pref__delete_backups__title" maxLength="41" comment="Preference title">Odstranit zálohy</string>
diff --git a/AnkiDroid/src/main/res/values-da/01-core.xml b/AnkiDroid/src/main/res/values-da/01-core.xml
index c9df8b8d760a..1563487eb1d2 100644
--- a/AnkiDroid/src/main/res/values-da/01-core.xml
+++ b/AnkiDroid/src/main/res/values-da/01-core.xml
@@ -124,7 +124,7 @@
     <string name="create_subdeck">Opret understak</string>
     <string name="empty_filtered_deck">Tømmer filtreret stak&#8230;</string>
     <string name="custom_study_deck_name">Tilpasset studiesession</string>
-    <string name="custom_study_deck_exists">Omdøb den eksisterende tilpassede stak først </string>
+    <string name="custom_study_deck_exists">Omdøb den eksisterende tilpassede stak først</string>
     <string name="search_deck" comment="Deck search for selecting it">Staksøgning</string>
     <string name="empty_deck">Denne stak er tom</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Staksøgning</string>
@@ -151,7 +151,7 @@
     <string name="card_template_editor_deck_override" maxLength="28">Overskriv stak</string>
     <string name="card_template_editor_insert_field" maxLength="28">Indsæt felt</string>
     <string name="card_template_editor_select_field">Vælg felt</string>
-    <string name="card_template_editor_cant_delete">Mindst én korttype er påkrævet </string>
+    <string name="card_template_editor_cant_delete">Mindst én korttype er påkrævet</string>
     <plurals name="card_template_editor_confirm_add">
         <item quantity="one">Dette vil oprette %1$d kort. Fortsæt?</item>
         <item quantity="other">Dette vil oprette %1$d kort. Fortsæt?</item>
diff --git a/AnkiDroid/src/main/res/values-da/10-preferences.xml b/AnkiDroid/src/main/res/values-da/10-preferences.xml
index 87963480083c..7ab27922efbc 100644
--- a/AnkiDroid/src/main/res/values-da/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-da/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Double scrolling</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>
diff --git a/AnkiDroid/src/main/res/values-de/01-core.xml b/AnkiDroid/src/main/res/values-de/01-core.xml
index 60ad9fb73335..9b079bacf0a6 100644
--- a/AnkiDroid/src/main/res/values-de/01-core.xml
+++ b/AnkiDroid/src/main/res/values-de/01-core.xml
@@ -184,7 +184,7 @@
     <string name="error__etc__cannot_write_to_or_create_file">Die Datei %s kann nicht erstellt oder überschrieben werden</string>
     <string name="directory_inaccessible_after_uninstall" comment="Dialog title if AnkiDroid can\'t access the collection once the app is installed">Unzugängliche Sammlung</string>
     <string name="directory_inaccessible_after_uninstall_summary" comment="the parameter is the path to the AnkiDroid folder. Typically /storage/emulated/0/AnkiDroid">Wir können, aufgrund einer Änderung der Play Store-Richtlinie, nachdem AnkiDroid deinstalliert wurde, auf Ihre Sammlung nicht zugreifen.\n\nIhre Daten sind sicher und können wiederhergestellt werden. Es befindet sich unter\n%s\n\nWählen Sie unten eine Wiederherstellungsmöglichkeit aus:</string>
-    <string name="directory_revoked_after_inactivity" comment="the first parameter is WRITE_EXTERNAL_STORAGE the second parameter is the path to the AnkiDroid folder. Typically /storage/emulated/0/AnkiDroid">Android hat den Zugriff auf %1$s entfernt wegen App-Aktivität. \n\nDeine Daten sind sicher und können wiederhergestellt werden. Die befinden sich bei \n%2$s\n\nWähle unten eine Möglichkeit aus, um sie wiederherzustellen. </string>
+    <string name="directory_revoked_after_inactivity" comment="the first parameter is WRITE_EXTERNAL_STORAGE the second parameter is the path to the AnkiDroid folder. Typically /storage/emulated/0/AnkiDroid">Android hat den Zugriff auf %1$s entfernt wegen App-Aktivität. \n\nDeine Daten sind sicher und können wiederhergestellt werden. Die befinden sich bei \n%2$s\n\nWähle unten eine Möglichkeit aus, um sie wiederherzustellen.</string>
     <string name="restore_data_from_ankiweb">von AnkiWeb wiederherstellen (empfohlen)</string>
     <string name="install_non_play_store_ankidroid_recommended">Ordnerzugriff wiederherstellen (empfohlen)</string>
     <string name="install_non_play_store_ankidroid">Ordnerzugriff wiederherstellen (erfahren)</string>
diff --git a/AnkiDroid/src/main/res/values-de/10-preferences.xml b/AnkiDroid/src/main/res/values-de/10-preferences.xml
index 23dd939c435c..eab456240d31 100644
--- a/AnkiDroid/src/main/res/values-de/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-de/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Unten links antippen</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Unten rechts antippen</string>
     <string name="gestures_shake" maxLength="41">Gerät schütteln</string>
-    <string name="card_browser_enable_external_context_menu">»%s«-Menü</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">»%s«-Menü</string>
     <string name="card_browser_enable_external_context_menu_summary">Aktiviert global das Kontextmenü »%s«</string>
     <string name="double_scrolling_gap" maxLength="41">Doppeltes scrollen</string>
     <string name="double_scrolling_gap_summ">Auf eReadern mit doppelter Schrittgröße scrollen</string>
diff --git a/AnkiDroid/src/main/res/values-el/02-strings.xml b/AnkiDroid/src/main/res/values-el/02-strings.xml
index 97e17a82c6c7..76ee19d7b598 100644
--- a/AnkiDroid/src/main/res/values-el/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-el/02-strings.xml
@@ -125,7 +125,7 @@
     <string name="rename" comment="Confirm that the renaming action should be processed." maxLength="28">Μετονομασία</string>
     <string name="checks_action" maxLength="28">Έλεγχος</string>
     <string name="check_db" maxLength="28">Έλεγχος βάσης δεδομένων</string>
-    <string name="check_media" maxLength="28">Έλεγχος πολυμέσων </string>
+    <string name="check_media" maxLength="28">Έλεγχος πολυμέσων</string>
     <string name="empty_cards" maxLength="28">Κενές κάρτες</string>
     <string name="unknown_type_field_warning">Τύπος απάντησης: άγνωστο πεδίο %s</string>
     <string name="delete_deck">Διαγραφή τράπουλας&#8230;\nΠαρακαλούμε περιμένετε.</string>
diff --git a/AnkiDroid/src/main/res/values-el/08-widget.xml b/AnkiDroid/src/main/res/values-el/08-widget.xml
index 15325c7803b0..7a31dd7b9528 100644
--- a/AnkiDroid/src/main/res/values-el/08-widget.xml
+++ b/AnkiDroid/src/main/res/values-el/08-widget.xml
@@ -60,7 +60,7 @@
         <item quantity="other">Απομένουν %d λεπτά</item>
     </plurals>
     <string name="widget_add_note_button">Προσθήκη νέας σημείωσης AnkiDroid</string>
-    <string name="deck_picker_widget_description" comment="Title of the Deck Picker Widget. Displayed to the user in Android\'s Widget Selection menu">Επιλογή τράπουλας </string>
+    <string name="deck_picker_widget_description" comment="Title of the Deck Picker Widget. Displayed to the user in Android\'s Widget Selection menu">Επιλογή τράπουλας</string>
     <string name="card_analysis_extra_widget_description">Ανάλυση καρτών</string>
     <!-- Strings to explain usage in Deck Picker and Card Analysis Widget Configuration screen -->
     <string name="select_decks_title" comment="Title for Deck Selection Dialog">Επιλογή τραπουλών</string>
diff --git a/AnkiDroid/src/main/res/values-el/10-preferences.xml b/AnkiDroid/src/main/res/values-el/10-preferences.xml
index b3c3c0e6f50a..7d488a099e74 100644
--- a/AnkiDroid/src/main/res/values-el/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-el/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Άγγιγμα κάτω αριστερά</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Άγγιγμα κάτω δεξιά</string>
     <string name="gestures_shake" maxLength="41">Ανακίνηση συσκευής</string>
-    <string name="card_browser_enable_external_context_menu">Μενού ‘%s’</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">Μενού ‘%s’</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Διπλή κύλιση</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>
@@ -285,7 +285,7 @@
     <string name="card_side_both" maxLength="28">Ερώτηση &amp; Απάντηση</string>
     <string name="display_binding_card_side_question" comment="When displaying a key bind on a preference this formatter is used if the bind only applies to the question">Ε: %s</string>
     <string name="display_binding_card_side_answer" comment="When displaying a key bind on a preference this formatter is used if the bind only applies to the answer">Α: %s</string>
-    <string name="display_binding_card_side_both" comment="When displaying a key bind on a preference this formatter is used if the bind only applies to both the question and the answer">%s </string>
+    <string name="display_binding_card_side_both" comment="When displaying a key bind on a preference this formatter is used if the bind only applies to both the question and the answer">%s</string>
     <!-- Binding Preference -->
     <string name="binding_remove_binding" comment="The parameter is the name of the key/gesture.     Keys cannot be translated yet.">Αφαίρεση ‘%s’</string>
     <string name="bindings_already_bound">Already bound to ‘%s’</string>
diff --git a/AnkiDroid/src/main/res/values-eo/10-preferences.xml b/AnkiDroid/src/main/res/values-eo/10-preferences.xml
index 1c0a8108ef8a..0181c4dd504a 100644
--- a/AnkiDroid/src/main/res/values-eo/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-eo/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Frapeti suban maldekstron</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Frapeti suban dekstron</string>
     <string name="gestures_shake" maxLength="41">Skui aparaton</string>
-    <string name="card_browser_enable_external_context_menu">Menuo “%s”</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">Menuo “%s”</string>
     <string name="card_browser_enable_external_context_menu_summary">Aktivigi la kuntekstan menuon “%s” tutaplikaĵe</string>
     <string name="double_scrolling_gap" maxLength="41">Duobla rulumado</string>
     <string name="double_scrolling_gap_summ">Duobligi distancon de rulumado kun elektronika legilo</string>
diff --git a/AnkiDroid/src/main/res/values-es-rAR/04-network.xml b/AnkiDroid/src/main/res/values-es-rAR/04-network.xml
index d3b8e47659fb..aa67287129f8 100644
--- a/AnkiDroid/src/main/res/values-es-rAR/04-network.xml
+++ b/AnkiDroid/src/main/res/values-es-rAR/04-network.xml
@@ -70,7 +70,7 @@
     <string name="sync_title">Sincronización</string>
     <string name="sync_log_uploading_message">Sincronización desde el dispositivo completa</string>
     <string name="sync_database_acknowledge">Colección sincronizada</string>
-    <string name="col_synced_media_in_background"> Colección sincronizada. Los archivos multimedia se están sincronizando en segundo plano.</string>
+    <string name="col_synced_media_in_background">Colección sincronizada. Los archivos multimedia se están sincronizando en segundo plano.</string>
     <string name="sync_corrupt_database">Su base de datos está dañada. Por favor, repárela antes de intentar la sincronización nuevamente.\n\nVer %s para informarse sobre la reparación de su base de datos.</string>
     <!-- Please run ‘Check database’ before syncing -->
     <string name="sync_sanity_local">Local</string>
diff --git a/AnkiDroid/src/main/res/values-es-rAR/10-preferences.xml b/AnkiDroid/src/main/res/values-es-rAR/10-preferences.xml
index 98f252272ffd..2a37f89dcfb8 100644
--- a/AnkiDroid/src/main/res/values-es-rAR/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-es-rAR/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Tocar abajo a la izquierda</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Tocar abajo a la derecha</string>
     <string name="gestures_shake" maxLength="41">Sacudir dispositivo</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menú </string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menú</string>
     <string name="card_browser_enable_external_context_menu_summary">Habilitar globalmente el menú contextual ‘%s</string>
     <string name="double_scrolling_gap" maxLength="41">Doble desplazamiento</string>
     <string name="double_scrolling_gap_summ">Doblar la distancia de desplazamiento con e-Reader</string>
diff --git a/AnkiDroid/src/main/res/values-es-rAR/17-model-manager.xml b/AnkiDroid/src/main/res/values-es-rAR/17-model-manager.xml
index 3239a4ae9463..92fa41fc40dd 100644
--- a/AnkiDroid/src/main/res/values-es-rAR/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-es-rAR/17-model-manager.xml
@@ -78,6 +78,6 @@
     <string name="card_template_editor_deck_override_off">Anulación del Mazo (desactivado)</string>
     <string name="model_manager_deck_override_added_message">Establecer mazo predeterminado de ‘%1$s’ a ‘%2$s’</string>
     <string name="model_manager_deck_override_removed_message">Mazo predeterminado para ‘%s’ eliminado</string>
-    <string name="deck_override_explanation">Selecciona el mazo para colocar nuevas tarjetas ‘%s’ </string>
+    <string name="deck_override_explanation">Selecciona el mazo para colocar nuevas tarjetas ‘%s’</string>
     <string name="deck_picker_dialog_filter_decks" maxLength="28">Filtrar mazos</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-es-rES/02-strings.xml b/AnkiDroid/src/main/res/values-es-rES/02-strings.xml
index 2dfa2336b1b4..82290c5b3ae8 100644
--- a/AnkiDroid/src/main/res/values-es-rES/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-es-rES/02-strings.xml
@@ -91,7 +91,7 @@
     <string name="studyoptions_total_label">Total de tarjetas</string>
     <!-- Card editor -->
     <string name="cardeditor_title_edit_card" maxLength="28">Editar nota</string>
-    <string name="discard">Borrar </string>
+    <string name="discard">Borrar</string>
     <string name="note_editor_no_cards_created">No se han creado tarjetas. Por favor, rellena más campos</string>
     <string name="note_editor_no_cards_created_all_fields">El tipo de nota actual no produjo ninguna tarjeta.\nPor favor, elije otro tipo de nota o haz clic en \"Tarjetas\" y añade un sustituto de campo</string>
     <string name="note_editor_insert_cloze_no_cloze_note_type">Las preguntas anidadas sólo funcionarán en un tipo de nota de Pregunta anidada (Cloze)</string>
diff --git a/AnkiDroid/src/main/res/values-es-rES/04-network.xml b/AnkiDroid/src/main/res/values-es-rES/04-network.xml
index f38f936e7022..884c51e43e4a 100644
--- a/AnkiDroid/src/main/res/values-es-rES/04-network.xml
+++ b/AnkiDroid/src/main/res/values-es-rES/04-network.xml
@@ -70,7 +70,7 @@
     <string name="sync_title">Sincronización</string>
     <string name="sync_log_uploading_message">Sincronización completa desde el cliente</string>
     <string name="sync_database_acknowledge">Colección sincronizada</string>
-    <string name="col_synced_media_in_background"> Colección sincronizada. Los archivos multimedia se están sincronizando en segundo plano.</string>
+    <string name="col_synced_media_in_background">Colección sincronizada. Los archivos multimedia se están sincronizando en segundo plano.</string>
     <string name="sync_corrupt_database">La base de datos está dañada. Por favor, arréglala antes de intentar volver a sincronizar.\n\nLee %s para obtener información acerca de cómo reparar la base de datos.</string>
     <!-- Please run ‘Check database’ before syncing -->
     <string name="sync_sanity_local">Local</string>
diff --git a/AnkiDroid/src/main/res/values-es-rES/10-preferences.xml b/AnkiDroid/src/main/res/values-es-rES/10-preferences.xml
index f865444b4378..7b806a7716b6 100644
--- a/AnkiDroid/src/main/res/values-es-rES/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-es-rES/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Tocar abajo a la izquierda</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Tocar abajo a la derecha</string>
     <string name="gestures_shake" maxLength="41">Agitar el dispositivo</string>
-    <string name="card_browser_enable_external_context_menu">Menú ‘%s’</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">Menú ‘%s’</string>
     <string name="card_browser_enable_external_context_menu_summary">Habilita globalmente el menú contextual ‘%s</string>
     <string name="double_scrolling_gap" maxLength="41">Desplazamiento doble</string>
     <string name="double_scrolling_gap_summ">Doblar la distancia de desplazamiento con e-Reader</string>
diff --git a/AnkiDroid/src/main/res/values-es-rES/17-model-manager.xml b/AnkiDroid/src/main/res/values-es-rES/17-model-manager.xml
index 9a6c43254f45..ca705ec24b58 100644
--- a/AnkiDroid/src/main/res/values-es-rES/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-es-rES/17-model-manager.xml
@@ -78,6 +78,6 @@
     <string name="card_template_editor_deck_override_off">Anulación del Mazo (desactivado)</string>
     <string name="model_manager_deck_override_added_message">Establecer mazo predeterminado de ‘%1$s’ a ‘%2$s’</string>
     <string name="model_manager_deck_override_removed_message">Mazo predeterminado para ‘%s’ eliminado</string>
-    <string name="deck_override_explanation">Selecciona el mazo para colocar nuevas tarjetas ‘%s’ </string>
+    <string name="deck_override_explanation">Selecciona el mazo para colocar nuevas tarjetas ‘%s’</string>
     <string name="deck_picker_dialog_filter_decks" maxLength="28">Filtrar mazos</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-et/10-preferences.xml b/AnkiDroid/src/main/res/values-et/10-preferences.xml
index 755b2dccb4f5..46df56dac63c 100644
--- a/AnkiDroid/src/main/res/values-et/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-et/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Double scrolling</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>
diff --git a/AnkiDroid/src/main/res/values-eu/10-preferences.xml b/AnkiDroid/src/main/res/values-eu/10-preferences.xml
index ab146548fe5d..69b104cf2604 100644
--- a/AnkiDroid/src/main/res/values-eu/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-eu/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Double scrolling</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>
diff --git a/AnkiDroid/src/main/res/values-fa/01-core.xml b/AnkiDroid/src/main/res/values-fa/01-core.xml
index 70f9fdd7abd3..23521d588c04 100644
--- a/AnkiDroid/src/main/res/values-fa/01-core.xml
+++ b/AnkiDroid/src/main/res/values-fa/01-core.xml
@@ -92,7 +92,7 @@
     <string name="menu_add" comment="A generic add button. Please inform us if you need more specific strings" maxLength="28">افزودن</string>
     <string name="menu_add_note" maxLength="28">افزودن یادداشت</string>
     <string name="menu_my_account" comment="Label of the window in which the user should enter their account. This text can\'t be found in AnkiDroid directly.">همگام سازی حساب</string>
-    <string name="menu_dismiss_note" maxLength="41">پنهان/حذف </string>
+    <string name="menu_dismiss_note" maxLength="41">پنهان/حذف</string>
     <string name="menu_bury_card" maxLength="28">مخفی کردن کارت</string>
     <string name="menu_bury_note" maxLength="28">مخفی کردن یادداشت</string>
     <string name="menu_suspend_card" maxLength="28">تعلیق کارت</string>
@@ -127,7 +127,7 @@
     <string name="custom_study_deck_exists">لطفا ابتدا دسته مطالعه سفارشی موجود را مجددا نام گذاری کنید.</string>
     <string name="search_deck" comment="Deck search for selecting it">جستجوی دسته‌ها</string>
     <string name="empty_deck">این دسته خالی است</string>
-    <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">جستجوی دسته‌ها </string>
+    <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">جستجوی دسته‌ها</string>
     <string name="invalid_deck_name">نام دسته نامعتبر است</string>
     <string name="studyoptions_congrats_finished">تبریک! امروز کارتان تمام شد.</string>
     <string name="studyoptions_congrats_next_due_in" comment="The param will be replaced with \'The next card will be ready in X time\'">دسته کارت فعلاً به پایان رسید! %s</string>
diff --git a/AnkiDroid/src/main/res/values-fa/10-preferences.xml b/AnkiDroid/src/main/res/values-fa/10-preferences.xml
index 02aeb7c86e89..f40c87670dcd 100644
--- a/AnkiDroid/src/main/res/values-fa/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-fa/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">لمس پایین سمت چپ</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">لمس پایین سمت راست</string>
     <string name="gestures_shake" maxLength="41">لرزش دستگاه</string>
-    <string name="card_browser_enable_external_context_menu">منوی \'%s\'</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">منوی \'%s\'</string>
     <string name="card_browser_enable_external_context_menu_summary">\'%s\' را در لیست به صورت عمومی فعال می‌کند</string>
     <string name="double_scrolling_gap" maxLength="41">پیمایش دو برابری</string>
     <string name="double_scrolling_gap_summ">فعال کنید اگر می‌خواهید فاصله پیمایش را در کتابخوان دیجیتالی دو برابر کنید</string>
diff --git a/AnkiDroid/src/main/res/values-fi/10-preferences.xml b/AnkiDroid/src/main/res/values-fi/10-preferences.xml
index 798bec4dafd3..ec1fdbe04062 100644
--- a/AnkiDroid/src/main/res/values-fi/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-fi/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Kosketa alavasemmalle</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Kosketa alaoikealle</string>
     <string name="gestures_shake" maxLength="41">Ravista laitetta</string>
-    <string name="card_browser_enable_external_context_menu">\"%s\" -valikko</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">\"%s\" -valikko</string>
     <string name="card_browser_enable_external_context_menu_summary">Ota \"%s\" -valikko käyttöön koko sovelluksessa</string>
     <string name="double_scrolling_gap" maxLength="41">Kaksoisvieritys</string>
     <string name="double_scrolling_gap_summ">Kaksinkertaista vieritysaskeleen koko eReaderin kanssa</string>
@@ -205,7 +205,7 @@
     <string name="paste_as_png" maxLength="41">Liitä leikepöydän kuvat PNG:nä</string>
     <string name="paste_as_png_summary">Oletusarvoisesti Anki liittää kuvat leikepöydältä JPG-tiedostoina levytilan säästämiseksi. Tämän vaihtoehdon avulla voit sen sijaan käyttää PNG-kuvia.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Takaisin/poistu painamalla \"takaisin\" kahdesti</string>
-    <string name="exit_via_double_tap_back_summ">Vältä poistumasta vahingossa kertausnäkymästä tai sovelluksesta </string>
+    <string name="exit_via_double_tap_back_summ">Vältä poistumasta vahingossa kertausnäkymästä tai sovelluksesta</string>
     <!-- Allow all files in media imports -->
     <string name="media_import_allow_all_files" maxLength="41">Salli kaikki tiedostot mediaa tuotaessa</string>
     <string name="media_import_allow_all_files_summ">Jos Android ei tunnista mediatiedostoja</string>
diff --git a/AnkiDroid/src/main/res/values-fil/10-preferences.xml b/AnkiDroid/src/main/res/values-fil/10-preferences.xml
index 50a3eb688465..2a3f5b7ea994 100644
--- a/AnkiDroid/src/main/res/values-fil/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-fil/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Pagpindot sa kaliwa sa ibaba</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Pagpindot sa kanan sa ibaba</string>
     <string name="gestures_shake" maxLength="41">Alugin ang device</string>
-    <string name="card_browser_enable_external_context_menu">Menu ng \'%s\'</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">Menu ng \'%s\'</string>
     <string name="card_browser_enable_external_context_menu_summary">Ine-enable ang context manu na \'%s\' kahit saan</string>
     <string name="double_scrolling_gap" maxLength="41">Double scrolling</string>
     <string name="double_scrolling_gap_summ">I-double ang scroll gap sa eReader</string>
diff --git a/AnkiDroid/src/main/res/values-fr/10-preferences.xml b/AnkiDroid/src/main/res/values-fr/10-preferences.xml
index 53d993b0443c..5240f94151b6 100644
--- a/AnkiDroid/src/main/res/values-fr/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-fr/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Toucher en bas à gauche</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Toucher en bas à droite</string>
     <string name="gestures_shake" maxLength="41">Secouer l\'appareil</string>
-    <string name="card_browser_enable_external_context_menu">Menu « %s »</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">Menu « %s »</string>
     <string name="card_browser_enable_external_context_menu_summary">Active le menu contextuel « %s » globalement</string>
     <string name="double_scrolling_gap" maxLength="41">Défilement double</string>
     <string name="double_scrolling_gap_summ">Doubler la vitesse de défilement avec eReader</string>
diff --git a/AnkiDroid/src/main/res/values-fy/10-preferences.xml b/AnkiDroid/src/main/res/values-fy/10-preferences.xml
index c7cc047f24b0..d28940d9f0d1 100644
--- a/AnkiDroid/src/main/res/values-fy/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-fy/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Double scrolling</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>
diff --git a/AnkiDroid/src/main/res/values-ga/03-dialogs.xml b/AnkiDroid/src/main/res/values-ga/03-dialogs.xml
index 02a1db1c03ab..ecdf0f3ba3a3 100644
--- a/AnkiDroid/src/main/res/values-ga/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ga/03-dialogs.xml
@@ -58,7 +58,7 @@
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Níl TTS ar fáil sa teanga seo</string>
     <string name="tts_no_tts">Teanga ar bith</string>
-    <string name="reposition_card_not_new_error">Ní féidir ach cártaí nua a athlonnú </string>
+    <string name="reposition_card_not_new_error">Ní féidir ach cártaí nua a athlonnú</string>
     <string name="reset_card_dialog_title">Glan stair an chárta maidir le do dhul ar aghaidh?</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d card reset</item>
diff --git a/AnkiDroid/src/main/res/values-ga/10-preferences.xml b/AnkiDroid/src/main/res/values-ga/10-preferences.xml
index e5ece8a446fa..799acaa9298f 100644
--- a/AnkiDroid/src/main/res/values-ga/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ga/10-preferences.xml
@@ -120,7 +120,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Double scrolling</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>
diff --git a/AnkiDroid/src/main/res/values-gl/10-preferences.xml b/AnkiDroid/src/main/res/values-gl/10-preferences.xml
index 182df6030014..09688bc5a50b 100644
--- a/AnkiDroid/src/main/res/values-gl/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-gl/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Desprazamento duplo</string>
     <string name="double_scrolling_gap_summ">Duplicar a distancia de desprazamento co eReader</string>
diff --git a/AnkiDroid/src/main/res/values-got/10-preferences.xml b/AnkiDroid/src/main/res/values-got/10-preferences.xml
index 2afb72668806..685d62aa4d39 100644
--- a/AnkiDroid/src/main/res/values-got/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-got/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Double scrolling</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>
diff --git a/AnkiDroid/src/main/res/values-gu/01-core.xml b/AnkiDroid/src/main/res/values-gu/01-core.xml
index ca2faeedd0a5..8f955c44578e 100644
--- a/AnkiDroid/src/main/res/values-gu/01-core.xml
+++ b/AnkiDroid/src/main/res/values-gu/01-core.xml
@@ -91,7 +91,7 @@
     <string name="edit_deck_description" comment="edit the deck description">વર્ણન સંપાદિત કરો</string>
     <string name="menu_add" comment="A generic add button. Please inform us if you need more specific strings" maxLength="28">ઉમેરો</string>
     <string name="menu_add_note" maxLength="28">નોંધ ઉમેરો</string>
-    <string name="menu_my_account" comment="Label of the window in which the user should enter their account. This text can\'t be found in AnkiDroid directly.">ખાતું સિંક્રનાઇઝ કરો </string>
+    <string name="menu_my_account" comment="Label of the window in which the user should enter their account. This text can\'t be found in AnkiDroid directly.">ખાતું સિંક્રનાઇઝ કરો</string>
     <string name="menu_dismiss_note" maxLength="41">છુપાવો / કાઢો</string>
     <string name="menu_bury_card" maxLength="28">કાર્ડ કાઢો</string>
     <string name="menu_bury_note" maxLength="28">નોંધ કાઢો</string>
@@ -105,12 +105,12 @@
     <string name="menu_flag_card" maxLength="28">કાર્ડને ચિહ્નિત કરો</string>
     <string name="menu_edit_tags" maxLength="28">ચિહ્નો બદલો</string>
     <string name="delete_note_message">આ નોંધ અને તેના તમામ કાડઁ ખરેખર કાઢી નાખીએ ?\n%s</string>
-    <string name="menu_search" maxLength="28">%1$s માં જુઓ </string>
+    <string name="menu_search" maxLength="28">%1$s માં જુઓ</string>
     <string name="menu_mark_note" maxLength="28">નોંધ ચિહ્નિત કરો</string>
     <string name="menu_unmark_note">ચિહ્નિત નોંધોમાથી કાઢો</string>
     <string name="menu_enable_voice_playback" maxLength="28">વૉઇસ પ્લેબેક સક્ષમ કરો</string>
     <string name="menu_disable_voice_playback">વૉઇસ પ્લેબેક અક્ષમ કરો</string>
-    <string name="new_deck">થપ્પી ઉમેરો </string>
+    <string name="new_deck">થપ્પી ઉમેરો</string>
     <string name="new_dynamic_deck">ફિલ્ટર કરેલ ડેક બનાવો</string>
     <string name="directory_inaccessible">AnkiDroid શબ્દાવલિ પહોંચ બહાર છે</string>
     <!--This is shown when AnkiDroid starts up with no storage permissions.
diff --git a/AnkiDroid/src/main/res/values-gu/10-preferences.xml b/AnkiDroid/src/main/res/values-gu/10-preferences.xml
index d51ba7c13a76..2b3b3d2c15b3 100644
--- a/AnkiDroid/src/main/res/values-gu/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-gu/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">નીચે ડાબી બાજુએ ટચ કરો</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">નીચે જમણે ટચ કરો</string>
     <string name="gestures_shake" maxLength="41">શેક ઉપકરણ</string>
-    <string name="card_browser_enable_external_context_menu">\'%s\' મેનૂ</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">\'%s\' મેનૂ</string>
     <string name="card_browser_enable_external_context_menu_summary">વૈશ્વિક સ્તરે \'%s\' સંદર્ભ મેનૂને સક્ષમ કરે છે</string>
     <string name="double_scrolling_gap" maxLength="41">ડબલ સ્ક્રોલિંગ</string>
     <string name="double_scrolling_gap_summ">eReader વડે સ્ક્રોલ ગેપને બમણો કરો</string>
diff --git a/AnkiDroid/src/main/res/values-heb/02-strings.xml b/AnkiDroid/src/main/res/values-heb/02-strings.xml
index 6a1133e62e7f..6ae33a3f9ef8 100644
--- a/AnkiDroid/src/main/res/values-heb/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-heb/02-strings.xml
@@ -150,7 +150,7 @@
     <string name="import_error_copy_to_cache">לא הצליח לשמור את הקובץ במטמון (ייתכן ששטח האחסון נגמר)</string>
     <string name="import_interrupted">הייבוא נפסק: AnkiDroid נסגר</string>
     <string name="export_preparation_in_progress">הכנה ליצוא&#8230;‏</string>
-    <string name="export_ready_title">הייצוא מוכן </string>
+    <string name="export_ready_title">הייצוא מוכן</string>
     <string name="export_send_no_handlers">לא נמצא יישום התומך ב- apkg. שומר&#8230;</string>
     <string name="export_save_apkg_successful">חבילת ה־Anki נשמרה בהצלחה</string>
     <string name="export_save_apkg_unsuccessful">שמירת חבילת Anki נכשלה</string>
diff --git a/AnkiDroid/src/main/res/values-heb/03-dialogs.xml b/AnkiDroid/src/main/res/values-heb/03-dialogs.xml
index fd1ea3da056c..94a2abb1016e 100644
--- a/AnkiDroid/src/main/res/values-heb/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-heb/03-dialogs.xml
@@ -75,7 +75,7 @@
     <string name="intent_aedict_category">כדי להוסיף כרטיסים ל-AnkiDroid הסר את כל קטגוריות פנקס הרשימות או הוסף אחת בשם \"ברירת מחדל\"</string>
     <string name="custom_study_new_extend">הוספה/הורדה(“-3”) הגבלת כרטיסים חדשים להיום ב</string>
     <string name="custom_study_rev_extend">הוספה/הורדה(“-3”) הגבלת חזרות להיום ב</string>
-    <string name="custom_study_forgotten">חזרה על כרטיסים נשכחים בx ימים האחרונים </string>
+    <string name="custom_study_forgotten">חזרה על כרטיסים נשכחים בx ימים האחרונים</string>
     <string name="custom_study_ahead">עבור כמה ימים ברצונך לשנן מראש?</string>
     <string name="custom_study_preview">צפייה ראשונית בכרטיסים חדשים שנוספו בx ימים האחרונים:</string>
     <string name="storage_full_title">האיחסון מלא</string>
@@ -128,7 +128,7 @@
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">מתבצע איתור כרטיסים ריקים&#8230;</string>
     <!-- Multimedia - Edit Field Activity -->
-    <string name="multimedia_editor_audio_permission_refused">לא מצליח לקבל הרשאת מיקרופון </string>
+    <string name="multimedia_editor_audio_permission_refused">לא מצליח לקבל הרשאת מיקרופון</string>
     <string name="multimedia_editor_failed">נכשל בפתיחת עורך מדיה.</string>
     <!-- Multimedia - Audio View -->
     <string name="multimedia_editor_audio_permission_denied">הרשאת הקלטת שמע נדחתה</string>
diff --git a/AnkiDroid/src/main/res/values-heb/10-preferences.xml b/AnkiDroid/src/main/res/values-heb/10-preferences.xml
index 98947e1146a5..1c3e416d7ba9 100644
--- a/AnkiDroid/src/main/res/values-heb/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-heb/10-preferences.xml
@@ -119,7 +119,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">נגיעה בצד שמאל למטה</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">נגיעה בצד ימין למטה</string>
     <string name="gestures_shake" maxLength="41">נער את המכשיר</string>
-    <string name="card_browser_enable_external_context_menu">תפריט %s</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">תפריט %s</string>
     <string name="card_browser_enable_external_context_menu_summary">מאפשר את תפריט ההקשר \'%s\' גלובלית במערכת</string>
     <string name="double_scrolling_gap" maxLength="41">גלילה כפולה</string>
     <string name="double_scrolling_gap_summ">הכפל את פער הגלילה עם eReader</string>
diff --git a/AnkiDroid/src/main/res/values-hi/02-strings.xml b/AnkiDroid/src/main/res/values-hi/02-strings.xml
index fdc65729afed..edccb1cc3c29 100644
--- a/AnkiDroid/src/main/res/values-hi/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-hi/02-strings.xml
@@ -116,7 +116,7 @@
     </plurals>
     <string name="fact_adder_intent_title" comment="Label of the \'Add Note\' window. This title can\'t be seen in AnkiDroid directly.">AnkiDroid कार्ड</string>
     <string name="note_editor_copy_note" maxLength="28">नोट कॉपी करें</string>
-    <string name="card_editor_reposition_card" comment="reposition a card in the new queue" maxLength="28">स्थानांतरित करे </string>
+    <string name="card_editor_reposition_card" comment="reposition a card in the new queue" maxLength="28">स्थानांतरित करे</string>
     <string name="card_editor_reset_card" maxLength="28">प्रगति को रीसेट</string>
     <string name="card_editor_reschedule_card" comment="Action to reschedule a card" maxLength="28">पुनः शेड्यूल करें</string>
     <string name="card_editor_preview_card" comment="Button offering to preview some card(s)" maxLength="28">पूर्वावलोकन</string>
@@ -146,8 +146,8 @@
     <string name="export_preparation_in_progress">निर्यात करने की तैयारी है&#8230;</string>
     <string name="export_ready_title">एक्सपोर्ट तैयार  है</string>
     <string name="export_send_no_handlers">apkg को संभालने के लिए कोई एप्लिकेशन उपलब्ध नहीं है। सहेजा जा रहा है &#8230;</string>
-    <string name="export_save_apkg_successful">सफलतापूर्वक Anki पैकेज को सहेजा गया </string>
-    <string name="export_save_apkg_unsuccessful">Anki पैकेज सहेजना विफल रहा </string>
+    <string name="export_save_apkg_successful">सफलतापूर्वक Anki पैकेज को सहेजा गया</string>
+    <string name="export_save_apkg_unsuccessful">Anki पैकेज सहेजना विफल रहा</string>
     <string name="export_share_title">Anki पैकेज का उपयोग करके भेजें</string>
     <string name="export_email_subject">AnkiDroid निर्यात किए गए स्पैनिश: %s</string>
     <string name="export_email_text"><![CDATA[        नमस्ते!
diff --git a/AnkiDroid/src/main/res/values-hi/04-network.xml b/AnkiDroid/src/main/res/values-hi/04-network.xml
index 2069725128c4..7b4a7bc36f2f 100644
--- a/AnkiDroid/src/main/res/values-hi/04-network.xml
+++ b/AnkiDroid/src/main/res/values-hi/04-network.xml
@@ -46,7 +46,7 @@
 -->
 <resources>
     <string name="youre_offline">आप ऑफ़लाइन हैं</string>
-    <string name="sync_error">सिंक में दिकत </string>
+    <string name="sync_error">सिंक में दिकत</string>
     <string name="vague_error" comment="Network error dialog title">गलती</string>
     <string name="retry">पुनः प्रयास करें</string>
     <string name="menu_get_shared_decks">साझा किए गए डेक पाएँ</string>
diff --git a/AnkiDroid/src/main/res/values-hi/10-preferences.xml b/AnkiDroid/src/main/res/values-hi/10-preferences.xml
index 3fdc576069f3..761161ea5a36 100644
--- a/AnkiDroid/src/main/res/values-hi/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-hi/10-preferences.xml
@@ -52,19 +52,19 @@
     </plurals>
     <string name="pref_milliseconds">%s एमएस</string>
     <!-- TODO: move to 20-search-preference so we can contribute upstream (searchpreference_no_results)-->
-    <string name="pref_search_no_results">कोई परिणाम नहीं </string>
+    <string name="pref_search_no_results">कोई परिणाम नहीं</string>
     <!-- preferences.xml categories-->
     <string name="pref_cat_general" comment="name of the general preference category" maxLength="41">सामान्य</string>
-    <string name="pref_cat_studying" maxLength="41">पढा जा रहा है </string>
+    <string name="pref_cat_studying" maxLength="41">पढा जा रहा है</string>
     <string name="pref_cat_system_wide" maxLength="41">विस्तृत - प्रणाली</string>
     <string name="pref_cat_reviewing" maxLength="41">समीक्षा</string>
     <string name="pref_cat_sync" comment="title of the sync preferences category" maxLength="41">साथ साथ करना</string>
-    <string name="pref_cat_scheduling" maxLength="41">निर्धारण </string>
+    <string name="pref_cat_scheduling" maxLength="41">निर्धारण</string>
     <string name="pref_cat_whiteboard" maxLength="41">श्वेतपट्ट</string>
     <string name="pref_cat_appearance" maxLength="41">दिखावट</string>
     <string name="pref_cat_themes" maxLength="41">थीम</string>
     <string name="pref_cat_gestures" maxLength="41">इशारे</string>
-    <string name="pref_cat_controls" maxLength="41">नियंत्रणे </string>
+    <string name="pref_cat_controls" maxLength="41">नियंत्रणे</string>
     <string name="pref_cat_advanced" maxLength="41">उन्नत</string>
     <string name="pref_cat_workarounds" maxLength="41">वैकल्पिक हल</string>
     <string name="pref_cat_plugins" maxLength="41">प्लगइन</string>
@@ -111,13 +111,13 @@
     <string name="gestures_tap_left" maxLength="41">बाएं स्पर्श करें</string>
     <string name="gestures_tap_right" maxLength="41">दाएं स्पर्श करें</string>
     <string name="gestures_tap_bottom" maxLength="41">नीचे स्पर्श करें</string>
-    <string name="gestures_corner_tap_top_left" maxLength="41">ऊपर से बाएं को छुएं </string>
-    <string name="gestures_corner_tap_top_right" maxLength="41">ऊपर से दाएं को छुएं </string>
+    <string name="gestures_corner_tap_top_left" maxLength="41">ऊपर से बाएं को छुएं</string>
+    <string name="gestures_corner_tap_top_right" maxLength="41">ऊपर से दाएं को छुएं</string>
     <string name="gestures_corner_tap_middle_center" maxLength="41">मध्य में केंद्र को स्पर्श करें</string>
-    <string name="gestures_corner_tap_bottom_left" maxLength="41">नीचे से बाएं से छुएं </string>
-    <string name="gestures_corner_tap_bottom_right" maxLength="41">नीचे से दाएं को छुएं </string>
+    <string name="gestures_corner_tap_bottom_left" maxLength="41">नीचे से बाएं से छुएं</string>
+    <string name="gestures_corner_tap_bottom_right" maxLength="41">नीचे से दाएं को छुएं</string>
     <string name="gestures_shake" maxLength="41">डिवाइस हिलाओ</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ मेन्यू</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ मेन्यू</string>
     <string name="card_browser_enable_external_context_menu_summary">विश्व स्तर पर \'%s\' संदर्भ मेनू को सक्षम करता है</string>
     <string name="double_scrolling_gap" maxLength="41">डबल स्क्रॉल</string>
     <string name="double_scrolling_gap_summ">ई-रीडर के साथ स्क्रॉल गैप डबल</string>
diff --git a/AnkiDroid/src/main/res/values-hi/11-arrays.xml b/AnkiDroid/src/main/res/values-hi/11-arrays.xml
index 964e5ae35122..0e1776c75e4b 100644
--- a/AnkiDroid/src/main/res/values-hi/11-arrays.xml
+++ b/AnkiDroid/src/main/res/values-hi/11-arrays.xml
@@ -81,7 +81,7 @@
     <!-- gestures_labels -->
     <string name="answer_again" maxLength="41">उत्तर (फिर से)</string>
     <string name="answer_hard" maxLength="41">कठिन उत्तर</string>
-    <string name="answer_good" maxLength="41">सही उत्तर </string>
+    <string name="answer_good" maxLength="41">सही उत्तर</string>
     <string name="answer_easy" maxLength="41">आसान उत्तर</string>
     <string name="gesture_play" maxLength="41">मीडिया चलाएं</string>
     <string name="gesture_abort_learning" maxLength="41">समीक्षक बंद करें</string>
diff --git a/AnkiDroid/src/main/res/values-hr/02-strings.xml b/AnkiDroid/src/main/res/values-hr/02-strings.xml
index a18e11ad9748..cdfb2c18a2a0 100644
--- a/AnkiDroid/src/main/res/values-hr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-hr/02-strings.xml
@@ -46,7 +46,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Navigation drawer strings -->
     <string name="drawer_open">Otvori ladicu</string>
-    <string name="drawer_close">Zatvori ladicu </string>
+    <string name="drawer_close">Zatvori ladicu</string>
     <string name="CardEditorCardDeck">Špil karata:</string>
     <string name="CardEditorNoteDeck">Špil:</string>
     <string name="CardEditorModel">Tip:</string>
@@ -58,14 +58,14 @@
     <string name="add_tag" maxLength="28">Dodaj oznaku</string>
     <string name="check_all_tags" maxLength="28">Označi / odznači sve oznake</string>
     <string name="filter_tags" maxLength="28">Filtriraj oznake</string>
-    <string name="no_tags">Niste još dodali ni jednu oznaku </string>
+    <string name="no_tags">Niste još dodali ni jednu oznaku</string>
     <string name="updated_version">Ažurirano na verziju %s</string>
     <!-- Reviewer.kt -->
     <string name="save_whiteboard" maxLength="28">Save whiteboard</string>
     <string name="enable_stylus" maxLength="28">Enable stylus writing</string>
     <string name="disable_stylus">Disable stylus writing</string>
     <string name="enable_whiteboard" maxLength="28">Omogući ploču</string>
-    <string name="disable_whiteboard">Onemogući ploču </string>
+    <string name="disable_whiteboard">Onemogući ploču</string>
     <string name="show_whiteboard">Pokaži ploču</string>
     <string name="hide_whiteboard" maxLength="28">Sakrij ploču</string>
     <string name="clear_whiteboard" maxLength="28">Obriši ploču</string>
diff --git a/AnkiDroid/src/main/res/values-hr/10-preferences.xml b/AnkiDroid/src/main/res/values-hr/10-preferences.xml
index b7e587005dc8..63ed0b1f23f5 100644
--- a/AnkiDroid/src/main/res/values-hr/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-hr/10-preferences.xml
@@ -118,7 +118,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Double scrolling</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>
diff --git a/AnkiDroid/src/main/res/values-hu/03-dialogs.xml b/AnkiDroid/src/main/res/values-hu/03-dialogs.xml
index 1ca1666dbded..0ef081125c30 100644
--- a/AnkiDroid/src/main/res/values-hu/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-hu/03-dialogs.xml
@@ -121,7 +121,7 @@
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Üres kártyák keresése&#8230;</string>
     <!-- Multimedia - Edit Field Activity -->
-    <string name="multimedia_editor_audio_permission_refused">Nem sikerült mikrofon engedélyt szerezni. </string>
+    <string name="multimedia_editor_audio_permission_refused">Nem sikerült mikrofon engedélyt szerezni.</string>
     <string name="multimedia_editor_failed">A Multimédia Szerkesztő megnyitása sikertelen</string>
     <!-- Multimedia - Audio View -->
     <string name="multimedia_editor_audio_permission_denied">Audió felvétel engedély megtagadva</string>
@@ -147,7 +147,7 @@
     <string name="error_selecting_image">Hiba a kép kiválasztása közben. Kérjük olvassa el az útmutatót. %s</string>
     <string name="error_deleting_image">Hiba a kép törlése közben</string>
     <string name="failed_to_apply_background_image">Hiba a  %s háttérkép feltevése közben</string>
-    <string name="background_image_too_large"> A Pakli Választó háttérkép túl nagy méretű</string>
+    <string name="background_image_too_large">A Pakli Választó háttérkép túl nagy méretű</string>
     <string name="image_max_size_allowed"> A maximum képméret %d MB</string>
     <string name="image_dimensions_too_large">Image dimensions are too large (%1$d × %2$d)</string>
     <!-- Global Intent handler -->
diff --git a/AnkiDroid/src/main/res/values-hu/10-preferences.xml b/AnkiDroid/src/main/res/values-hu/10-preferences.xml
index 291b6bc44260..f711618aa325 100644
--- a/AnkiDroid/src/main/res/values-hu/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-hu/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Érintés bal alul</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Érintés jobb alul</string>
     <string name="gestures_shake" maxLength="41">Készülék megrázása</string>
-    <string name="card_browser_enable_external_context_menu">\'%s\' Menü</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">\'%s\' Menü</string>
     <string name="card_browser_enable_external_context_menu_summary">Engedélyezi a \'%s\' kontextus menüt globálisan</string>
     <string name="double_scrolling_gap" maxLength="41">Dupla görgetés</string>
     <string name="double_scrolling_gap_summ">Görgess a kétszeres méretű e-Olvasó méretre</string>
diff --git a/AnkiDroid/src/main/res/values-hy/10-preferences.xml b/AnkiDroid/src/main/res/values-hy/10-preferences.xml
index 9e453f0acc53..357a2b35af54 100644
--- a/AnkiDroid/src/main/res/values-hy/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-hy/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Սեղմել ներքևի ձախ մասում</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Սեղմել ներքևի աջ մասում</string>
     <string name="gestures_shake" maxLength="41">Թափահարել սարքը</string>
-    <string name="card_browser_enable_external_context_menu">«%s» մենյու</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">«%s» մենյու</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Double scrolling</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>
diff --git a/AnkiDroid/src/main/res/values-ind/01-core.xml b/AnkiDroid/src/main/res/values-ind/01-core.xml
index 4944d29a4f4a..cd2d01bdc6fe 100644
--- a/AnkiDroid/src/main/res/values-ind/01-core.xml
+++ b/AnkiDroid/src/main/res/values-ind/01-core.xml
@@ -158,7 +158,7 @@
     <string name="card_template_editor_save_error">Tidak dapat menyimpan perubahan templat kartu: %s</string>
     <string name="template_for_current_card_deleted">Templat untuk kartu ini sudah dihapus.</string>
     <!-- Card Browser Appearance -->
-    <string name="card_template_browser_appearance_title">Tampilan Peramban </string>
+    <string name="card_template_browser_appearance_title">Tampilan Peramban</string>
     <!-- card Info -->
     <string name="card_info_title" maxLength="28">Info kartu</string>
     <!-- Permissions -->
diff --git a/AnkiDroid/src/main/res/values-ind/10-preferences.xml b/AnkiDroid/src/main/res/values-ind/10-preferences.xml
index cb00181bee9a..d6eb12ae42e3 100644
--- a/AnkiDroid/src/main/res/values-ind/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ind/10-preferences.xml
@@ -116,7 +116,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Sentuh bagian bawah kiri</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Sentuh bagian bawah kanan</string>
     <string name="gestures_shake" maxLength="41">Goyangkan perangkat</string>
-    <string name="card_browser_enable_external_context_menu">Menu ‘%s’</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">Menu ‘%s’</string>
     <string name="card_browser_enable_external_context_menu_summary">Mengaktifkan konteks menu ‘%s’ secara global</string>
     <string name="double_scrolling_gap" maxLength="41">Guliran ganda</string>
     <string name="double_scrolling_gap_summ">Gandakan jarak gulir dengan pembaca elektronik</string>
diff --git a/AnkiDroid/src/main/res/values-is/10-preferences.xml b/AnkiDroid/src/main/res/values-is/10-preferences.xml
index 2afb72668806..685d62aa4d39 100644
--- a/AnkiDroid/src/main/res/values-is/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-is/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Double scrolling</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>
diff --git a/AnkiDroid/src/main/res/values-it/10-preferences.xml b/AnkiDroid/src/main/res/values-it/10-preferences.xml
index be49f02d0691..f9ea47cb4ef7 100644
--- a/AnkiDroid/src/main/res/values-it/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-it/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Tocca in basso a sinistra</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Tocca in basso a destra</string>
     <string name="gestures_shake" maxLength="41">Agita il dispositivo</string>
-    <string name="card_browser_enable_external_context_menu">Menù «%s»</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">Menù «%s»</string>
     <string name="card_browser_enable_external_context_menu_summary">Abilita il menù contestuale «%s» globalmente</string>
     <string name="double_scrolling_gap" maxLength="41">Doppio scorrimento</string>
     <string name="double_scrolling_gap_summ">Raddoppia il divario di scorrimento con eReader</string>
diff --git a/AnkiDroid/src/main/res/values-iw/02-strings.xml b/AnkiDroid/src/main/res/values-iw/02-strings.xml
index 6a1133e62e7f..6ae33a3f9ef8 100644
--- a/AnkiDroid/src/main/res/values-iw/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-iw/02-strings.xml
@@ -150,7 +150,7 @@
     <string name="import_error_copy_to_cache">לא הצליח לשמור את הקובץ במטמון (ייתכן ששטח האחסון נגמר)</string>
     <string name="import_interrupted">הייבוא נפסק: AnkiDroid נסגר</string>
     <string name="export_preparation_in_progress">הכנה ליצוא&#8230;‏</string>
-    <string name="export_ready_title">הייצוא מוכן </string>
+    <string name="export_ready_title">הייצוא מוכן</string>
     <string name="export_send_no_handlers">לא נמצא יישום התומך ב- apkg. שומר&#8230;</string>
     <string name="export_save_apkg_successful">חבילת ה־Anki נשמרה בהצלחה</string>
     <string name="export_save_apkg_unsuccessful">שמירת חבילת Anki נכשלה</string>
diff --git a/AnkiDroid/src/main/res/values-iw/03-dialogs.xml b/AnkiDroid/src/main/res/values-iw/03-dialogs.xml
index fd1ea3da056c..94a2abb1016e 100644
--- a/AnkiDroid/src/main/res/values-iw/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-iw/03-dialogs.xml
@@ -75,7 +75,7 @@
     <string name="intent_aedict_category">כדי להוסיף כרטיסים ל-AnkiDroid הסר את כל קטגוריות פנקס הרשימות או הוסף אחת בשם \"ברירת מחדל\"</string>
     <string name="custom_study_new_extend">הוספה/הורדה(“-3”) הגבלת כרטיסים חדשים להיום ב</string>
     <string name="custom_study_rev_extend">הוספה/הורדה(“-3”) הגבלת חזרות להיום ב</string>
-    <string name="custom_study_forgotten">חזרה על כרטיסים נשכחים בx ימים האחרונים </string>
+    <string name="custom_study_forgotten">חזרה על כרטיסים נשכחים בx ימים האחרונים</string>
     <string name="custom_study_ahead">עבור כמה ימים ברצונך לשנן מראש?</string>
     <string name="custom_study_preview">צפייה ראשונית בכרטיסים חדשים שנוספו בx ימים האחרונים:</string>
     <string name="storage_full_title">האיחסון מלא</string>
@@ -128,7 +128,7 @@
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">מתבצע איתור כרטיסים ריקים&#8230;</string>
     <!-- Multimedia - Edit Field Activity -->
-    <string name="multimedia_editor_audio_permission_refused">לא מצליח לקבל הרשאת מיקרופון </string>
+    <string name="multimedia_editor_audio_permission_refused">לא מצליח לקבל הרשאת מיקרופון</string>
     <string name="multimedia_editor_failed">נכשל בפתיחת עורך מדיה.</string>
     <!-- Multimedia - Audio View -->
     <string name="multimedia_editor_audio_permission_denied">הרשאת הקלטת שמע נדחתה</string>
diff --git a/AnkiDroid/src/main/res/values-iw/10-preferences.xml b/AnkiDroid/src/main/res/values-iw/10-preferences.xml
index 98947e1146a5..1c3e416d7ba9 100644
--- a/AnkiDroid/src/main/res/values-iw/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-iw/10-preferences.xml
@@ -119,7 +119,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">נגיעה בצד שמאל למטה</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">נגיעה בצד ימין למטה</string>
     <string name="gestures_shake" maxLength="41">נער את המכשיר</string>
-    <string name="card_browser_enable_external_context_menu">תפריט %s</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">תפריט %s</string>
     <string name="card_browser_enable_external_context_menu_summary">מאפשר את תפריט ההקשר \'%s\' גלובלית במערכת</string>
     <string name="double_scrolling_gap" maxLength="41">גלילה כפולה</string>
     <string name="double_scrolling_gap_summ">הכפל את פער הגלילה עם eReader</string>
diff --git a/AnkiDroid/src/main/res/values-ja/01-core.xml b/AnkiDroid/src/main/res/values-ja/01-core.xml
index d8da95bb58ae..3c0d7eae908f 100644
--- a/AnkiDroid/src/main/res/values-ja/01-core.xml
+++ b/AnkiDroid/src/main/res/values-ja/01-core.xml
@@ -178,7 +178,7 @@
     <!-- Generic errors -->
     <string name="error__etc__cannot_write_to_or_create_file">ファイル %s への書き込みまたは同ファイルの作成ができません</string>
     <string name="directory_inaccessible_after_uninstall" comment="Dialog title if AnkiDroid can\'t access the collection once the app is installed">アクセスできないコレクション</string>
-    <string name="directory_inaccessible_after_uninstall_summary" comment="the parameter is the path to the AnkiDroid folder. Typically /storage/emulated/0/AnkiDroid"> Playストアのプライバシーポリシーの変更により、AnkiDroidはアンインストール前のコレクションにはアクセスできなくなりました。\n\nコレクションは\n%s\nに保存されており、復元可能です。 \n\n復元するための選択肢は次の通りです:</string>
+    <string name="directory_inaccessible_after_uninstall_summary" comment="the parameter is the path to the AnkiDroid folder. Typically /storage/emulated/0/AnkiDroid">Playストアのプライバシーポリシーの変更により、AnkiDroidはアンインストール前のコレクションにはアクセスできなくなりました。\n\nコレクションは\n%s\nに保存されており、復元可能です。 \n\n復元するための選択肢は次の通りです:</string>
     <string name="directory_revoked_after_inactivity" comment="the first parameter is WRITE_EXTERNAL_STORAGE the second parameter is the path to the AnkiDroid folder. Typically /storage/emulated/0/AnkiDroid">AnkiDroidを数か月使用していなかったため、 %1$s の権限が、Androidによって削除されました。\n\nあなたのコレクション（データ）自体は削除されておらず、使用を再開することも可能ですのでご安心ください。あなたのコレクションは次のフォルダに安全に保管されています：\n%2$s\n\nAnkiDroidの利用を再開するために、次の中からご希望の対処方法を選択してください。</string>
     <string name="restore_data_from_ankiweb">AnkiWebから復元 (推奨)</string>
     <string name="install_non_play_store_ankidroid_recommended">フォルダへのアクセスを回復 (推奨)</string>
diff --git a/AnkiDroid/src/main/res/values-ja/03-dialogs.xml b/AnkiDroid/src/main/res/values-ja/03-dialogs.xml
index 74cde8a6228e..2194f1fae01f 100644
--- a/AnkiDroid/src/main/res/values-ja/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ja/03-dialogs.xml
@@ -69,7 +69,7 @@
     <string name="custom_study_new_extend">上限枚数をいくつ増やしますか？（減らす場合は負の数）</string>
     <string name="custom_study_rev_extend">上限枚数をいくつ増やしますか？（減らす場合は負の数）</string>
     <string name="custom_study_forgotten">直近 x 日間で「やり直し」を選んだカードを再学習</string>
-    <string name="custom_study_ahead"> x 日先までの復習カードを予習</string>
+    <string name="custom_study_ahead">x 日先までの復習カードを予習</string>
     <string name="custom_study_preview">直近 x 日間で追加した習得未開始の新規カードを予習</string>
     <string name="storage_full_title">ストレージの空き容量がありません</string>
     <string name="storage_almost_full_title">ストレージの空き容量が少なくなっています</string>
@@ -136,7 +136,7 @@
     <string name="database_locked_title">データベースがロックされています</string>
     <string name="database_locked_summary">AnkiDroidデータベースを別のアプリが使用中です。該当するアプリを終了してAnkiDroidを再起動してください。</string>
     <string name="incompatible_database_version_title">互換性のないバージョンのデータベース</string>
-    <string name="incompatible_database_version_summary">このデータベースは、このAnkiDroidでは使用できません。 これを使用するには、AnkiDroidをアップグレードするか、データベースをダウングレードしてください。\n\nこのAnkiDroidで開ける最大バージョン: %1$d\nこのデータベースのバージョン: %2$d\n\n次の復元オプションは、現在のコレクションを、このAnkiDroidで使用できる可能性が高いデータベースで上書きします。 </string>
+    <string name="incompatible_database_version_summary">このデータベースは、このAnkiDroidでは使用できません。 これを使用するには、AnkiDroidをアップグレードするか、データベースをダウングレードしてください。\n\nこのAnkiDroidで開ける最大バージョン: %1$d\nこのデータベースのバージョン: %2$d\n\n次の復元オプションは、現在のコレクションを、このAnkiDroidで使用できる可能性が高いデータベースで上書きします。</string>
     <!-- Deck Picker Background-->
     <string name="background_image_applied">背景画像に適用しました</string>
     <string name="background_image_removed">背景画像を削除しました</string>
diff --git a/AnkiDroid/src/main/res/values-ja/10-preferences.xml b/AnkiDroid/src/main/res/values-ja/10-preferences.xml
index 143070d5aa84..ccfaae53d456 100644
--- a/AnkiDroid/src/main/res/values-ja/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ja/10-preferences.xml
@@ -116,7 +116,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">左下をタップ</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">右下をタップ</string>
     <string name="gestures_shake" maxLength="41">デバイスを振る</string>
-    <string name="card_browser_enable_external_context_menu">「%s」メニュー</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">「%s」メニュー</string>
     <string name="card_browser_enable_external_context_menu_summary">AnkiDroidおよび他のアプリ（ウェブブラウザなど）で、文字列を選択した際に表示されるコンテキストメニューに「%s」という項目を追加します</string>
     <string name="double_scrolling_gap" maxLength="41">ダブルスクロール</string>
     <string name="double_scrolling_gap_summ">eReader とのスクロールのギャップを 2 倍にする場合、これを有効にします</string>
diff --git a/AnkiDroid/src/main/res/values-jv/10-preferences.xml b/AnkiDroid/src/main/res/values-jv/10-preferences.xml
index 0f0b55cad9c9..6744950912bc 100644
--- a/AnkiDroid/src/main/res/values-jv/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-jv/10-preferences.xml
@@ -116,7 +116,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Double scrolling</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>
diff --git a/AnkiDroid/src/main/res/values-ka/01-core.xml b/AnkiDroid/src/main/res/values-ka/01-core.xml
index 1fd9f5019ed5..0f7efe802fde 100644
--- a/AnkiDroid/src/main/res/values-ka/01-core.xml
+++ b/AnkiDroid/src/main/res/values-ka/01-core.xml
@@ -176,7 +176,7 @@
     <string name="sync_conflict_message_new">კოლექციები ვერ შეერთდება.\nრომელი კოლექციის დატოვება გსურთ?</string>
     <string name="sync_conflict_keep_local_new" comment="Select AnkiDroid files to keep while syncing">AnkiDroid</string>
     <string name="sync_conflict_keep_remote_new" comment="Select AnkiWeb files to keep while syncing">Ankiweb</string>
-    <string name="sync_conflict_remote_confirm_new">ჩავანაცვლოთ თქვენი კოლექცია Ankidroid-ზე თქვენი AnkiWeb-ის კოლექციით? </string>
+    <string name="sync_conflict_remote_confirm_new">ჩავანაცვლოთ თქვენი კოლექცია Ankidroid-ზე თქვენი AnkiWeb-ის კოლექციით?</string>
     <string name="sync_conflict_local_confirm_new">ჩანაცვლდეს თქვენი კოლექცია AnkiWeb-ზე თქვენი AnkiDroid-ის კოლექციით?</string>
     <string name="sync_conflict_title_new">აირჩიეთ კოლექცია რომ დარჩეს</string>
     <string name="sync_conflict_replace_title">კოლექციის ჩანაცვლება</string>
diff --git a/AnkiDroid/src/main/res/values-ka/02-strings.xml b/AnkiDroid/src/main/res/values-ka/02-strings.xml
index 73ceaacafdaf..2e2616bc6f28 100644
--- a/AnkiDroid/src/main/res/values-ka/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ka/02-strings.xml
@@ -286,7 +286,7 @@
     <!-- App Intro -->
     <string name="intro_ankidroid_tagline_one">ნაკლები მეცადინეობა</string>
     <string name="intro_ankidroid_tagline_two">მეტის დამახსოვრება</string>
-    <string name="intro_short_ankidroid_explanation">Anki-ს განრიგის მგეგმავი რთულად დასახსომებელი ცოდნის უკეთ დასწავლასა და ღრმა ცოდნის შენარჩუნებაში გეხმარებათ, რათა დაზოგოთ ძვირფასი დრო </string>
+    <string name="intro_short_ankidroid_explanation">Anki-ს განრიგის მგეგმავი რთულად დასახსომებელი ცოდნის უკეთ დასწავლასა და ღრმა ცოდნის შენარჩუნებაში გეხმარებათ, რათა დაზოგოთ ძვირფასი დრო</string>
     <string name="intro_get_started" comment="Action to start AnkiDroid for the first time without syncing from AnkiWeb">დაწყება</string>
     <string name="intro_sync_from_ankiweb">სინქრონიზაცია AnkiWeb-თან</string>
     <!-- IntentHandler -->
diff --git a/AnkiDroid/src/main/res/values-ka/09-backup.xml b/AnkiDroid/src/main/res/values-ka/09-backup.xml
index 09fe8c5730ce..331c2f93fe8c 100644
--- a/AnkiDroid/src/main/res/values-ka/09-backup.xml
+++ b/AnkiDroid/src/main/res/values-ka/09-backup.xml
@@ -63,6 +63,6 @@
     <string name="backup_restore_no_backups">ამ მოწყობილობაზე ვერ მოიძებნა სარეზერვო ასლი. თქვენს კომპიუტერზე თუ გაქვთ შენახული სარეზერვო ასლები, ჩააკოპირეთ ისინი AnkiDroid-ის საქაღალდეში.</string>
     <string name="open_collection_failed_title">კოლექცია არ გაიხსნა</string>
     <string name="corrupt_db_message">თქვენი კოლექცია დაზიანებულია.\n\nსარეზერვო ასლიდან აღსადგენად შეეხეთ „ პარამეტრების“ ღილაკს; თუ არ იმუშავა, გთხოვთ, იხილოთ ინსტრუქცია მონაცემთა ბასის შესაკეთებლად:\n%1$s</string>
-    <string name="access_collection_failed_message">თქვენს კოლექციაზე წვდომისას დაფიქსირდა შეცდომა. შესაძლოა ეს უბრალოდ უვნებელი შეცდომის შედეგი იყოს ან კოლექციას რამე პრობლემა ქონდეს. \n\nშეცდომის გამოსწორების მიზნით გთხოვთ შეეხოთ „მონაცემთა ბაზის შემოწმებას“ ან დააჭიროთ „პარამეტრების“ ღილაკს, რათა აღადგინოთ მონაცემები სარეზერვო ასლიდან. ამ შეტყობინების მუდმივად ნახვის შემთხვევაში გთხოვთ გამოგვიგზავნოთ ხარვეზის შეტყობინება:\n%1$s  </string>
+    <string name="access_collection_failed_message">თქვენს კოლექციაზე წვდომისას დაფიქსირდა შეცდომა. შესაძლოა ეს უბრალოდ უვნებელი შეცდომის შედეგი იყოს ან კოლექციას რამე პრობლემა ქონდეს. \n\nშეცდომის გამოსწორების მიზნით გთხოვთ შეეხოთ „მონაცემთა ბაზის შემოწმებას“ ან დააჭიროთ „პარამეტრების“ ღილაკს, რათა აღადგინოთ მონაცემები სარეზერვო ასლიდან. ამ შეტყობინების მუდმივად ნახვის შემთხვევაში გთხოვთ გამოგვიგზავნოთ ხარვეზის შეტყობინება:\n%1$s</string>
     <string name="deck_repair_error">კოლექცია ვერ შეკეთდა</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ka/10-preferences.xml b/AnkiDroid/src/main/res/values-ka/10-preferences.xml
index 5905109b8d0b..add6dedb5427 100644
--- a/AnkiDroid/src/main/res/values-ka/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ka/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">ქვედა მარცხენა კუთხეში შეხება</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">ქვედა მარჯვენა კუთხეში შეხება</string>
     <string name="gestures_shake" maxLength="41">მოწყობილობის შენჯღრევა</string>
-    <string name="card_browser_enable_external_context_menu">„%s“-მენიუ</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">„%s“-მენიუ</string>
     <string name="card_browser_enable_external_context_menu_summary">გლობალურად ამატებს „%s“ ღილაკს კონტექსტურ მენიუში (მენიუ, რომელიც ტექსტის მონიშვნისას ჩნდება)</string>
     <string name="double_scrolling_gap" maxLength="41">ორმაგი ჩამოყოლა</string>
     <string name="double_scrolling_gap_summ">ელ-წამკითხველებში ეკრანის აწევ-ჩამოწევის დაშორების გაორმაგება</string>
diff --git a/AnkiDroid/src/main/res/values-kk/10-preferences.xml b/AnkiDroid/src/main/res/values-kk/10-preferences.xml
index 2afb72668806..685d62aa4d39 100644
--- a/AnkiDroid/src/main/res/values-kk/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-kk/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Double scrolling</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>
diff --git a/AnkiDroid/src/main/res/values-km/10-preferences.xml b/AnkiDroid/src/main/res/values-km/10-preferences.xml
index 7580650b7d07..6c1099c77fc7 100644
--- a/AnkiDroid/src/main/res/values-km/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-km/10-preferences.xml
@@ -116,7 +116,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Double scrolling</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>
diff --git a/AnkiDroid/src/main/res/values-kn/01-core.xml b/AnkiDroid/src/main/res/values-kn/01-core.xml
index 15135556085f..064de6f39ef5 100644
--- a/AnkiDroid/src/main/res/values-kn/01-core.xml
+++ b/AnkiDroid/src/main/res/values-kn/01-core.xml
@@ -76,7 +76,7 @@
     <string name="show_answer" maxLength="41">ಉತ್ತರ ತೋರಿಸು</string>
     <string name="hide_answer">ಉತ್ತರವನ್ನು ಮರೆಮಾಡಿ</string>
     <string name="ease_button_again" maxLength="41">ಮತ್ತೆ</string>
-    <string name="ease_button_hard" maxLength="41">ಕಠಿಣ </string>
+    <string name="ease_button_hard" maxLength="41">ಕಠಿಣ</string>
     <string name="ease_button_good" maxLength="41">ಒಳ್ಳೆಯದು</string>
     <string name="ease_button_easy">ಸುಲಭ</string>
     <string name="menu_import" maxLength="28">ಇಂಪೋರ್ಟ್</string>
@@ -89,7 +89,7 @@
     <string name="create_shortcut">ಕಿರುದಾರಿ ರಚಿಸಿ</string>
     <string name="browse_cards">ಕಾರ್ಡ್‌ಗಳನ್ನು ಬ್ರೌಸ್ ಮಾಡಿ</string>
     <string name="edit_deck_description" comment="edit the deck description">ವಿವರಣೆಯನ್ನು ಸಂಪಾದಿಸಿ</string>
-    <string name="menu_add" comment="A generic add button. Please inform us if you need more specific strings" maxLength="28">ಸೇರಿಸಿ </string>
+    <string name="menu_add" comment="A generic add button. Please inform us if you need more specific strings" maxLength="28">ಸೇರಿಸಿ</string>
     <string name="menu_add_note" maxLength="28">ಟಿಪ್ಪಣಿ ಸೇರಿಸಿ</string>
     <string name="menu_my_account" comment="Label of the window in which the user should enter their account. This text can\'t be found in AnkiDroid directly.">ಖಾತೆಯನ್ನು ಸಿಂಕ್ ಮಾಡಿ</string>
     <string name="menu_dismiss_note" maxLength="41">ಮರೆಮಾಡು / ಅಳಿಸಿ</string>
diff --git a/AnkiDroid/src/main/res/values-kn/02-strings.xml b/AnkiDroid/src/main/res/values-kn/02-strings.xml
index 427e1ccc5496..38f668f398f0 100644
--- a/AnkiDroid/src/main/res/values-kn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-kn/02-strings.xml
@@ -70,7 +70,7 @@
     <string name="hide_whiteboard" maxLength="28">ವೈಟ್‌ಬೋರ್ಡ್ ಮರೆಮಾಡಿ</string>
     <string name="clear_whiteboard" maxLength="28">ವೈಟ್‌ಬೋರ್ಡ್ ತೆರವುಗೊಳಿಸಿ</string>
     <string name="replay_audio" maxLength="28">ಆಡಿಯೊವನ್ನು ರಿಪ್ಲೇ ಮಾಡಿ</string>
-    <string name="leech_suspend_notification">ಕಾರ್ಡ್ ಅನ್ನು ಲೀಚ್ ಎಂದು ಗುರುತಿಸಲಾಗಿದೆ ಮತ್ತು ಅಮಾನತುಗೊಳಿಸಲಾಗಿದೆ </string>
+    <string name="leech_suspend_notification">ಕಾರ್ಡ್ ಅನ್ನು ಲೀಚ್ ಎಂದು ಗುರುತಿಸಲಾಗಿದೆ ಮತ್ತು ಅಮಾನತುಗೊಳಿಸಲಾಗಿದೆ</string>
     <string name="leech_notification">ಕಾರ್ಡ್ ಅನ್ನು ಲೀಚ್ ಎಂದು ಗುರುತಿಸಲಾಗಿದೆ</string>
     <string name="webview_crash_unknown">ಅಜ್ಞಾತ ದೋಷ</string>
     <string name="webview_crash_unknwon_detailed">ವೆಬ್‌ವೀಕ್ಷಣೆಯಲ್ಲಿನ ಆಂತರಿಕ ದೋಷದಿಂದಾಗಿ ಇದು ಸಂಭವಿಸಿದೆ</string>
diff --git a/AnkiDroid/src/main/res/values-kn/10-preferences.xml b/AnkiDroid/src/main/res/values-kn/10-preferences.xml
index 05319dc037be..b2dfe8a0938d 100644
--- a/AnkiDroid/src/main/res/values-kn/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-kn/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">ಕೆಳಗಿನ ಎಡಭಾಗವನ್ನು ಸ್ಪರ್ಶಿಸಿ</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">ಕೆಳಗಿನ ಬಲಕ್ಕೆ ಸ್ಪರ್ಶಿಸಿ</string>
     <string name="gestures_shake" maxLength="41">ಸಾಧನವನ್ನು ಅಲ್ಲಾಡಿಸಿ</string>
-    <string name="card_browser_enable_external_context_menu">\'%s\' ಮೆನು</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">\'%s\' ಮೆನು</string>
     <string name="card_browser_enable_external_context_menu_summary">ಜಾಗತಿಕವಾಗಿ \'%s\' ಸಂದರ್ಭ ಮೆನುವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುತ್ತದೆ</string>
     <string name="double_scrolling_gap" maxLength="41">ಡಬಲ್ ಸ್ಕ್ರೋಲಿಂಗ್</string>
     <string name="double_scrolling_gap_summ">eReader ನೊಂದಿಗೆ ಸ್ಕ್ರಾಲ್ ದೂರವನ್ನು ದ್ವಿಗುಣಗೊಳಿಸಿ</string>
@@ -233,7 +233,7 @@
     <string name="deck_conf_general" maxLength="41" comment="Label of the submenu for the general options of new deck">ಸಾಮಾನ್ಯ</string>
     <string name="deck_conf_reminders" maxLength="41">ಜ್ಞಾಪನೆಗಳು</string>
     <string name="deck_conf_cram_filter" maxLength="41">ಫಿಲ್ಟರ್</string>
-    <string name="deck_conf_cram_search" maxLength="41" comment="Label of a text field that contains a search query.">ಇದಕ್ಕಾಗಿ ಹುಡುಕು </string>
+    <string name="deck_conf_cram_search" maxLength="41" comment="Label of a text field that contains a search query.">ಇದಕ್ಕಾಗಿ ಹುಡುಕು</string>
     <string name="deck_conf_cram_limit" maxLength="41">ಗೆ ಮಿತಿ</string>
     <string name="deck_conf_cram_order" maxLength="41">Cards selected by</string>
     <string name="deck_conf_cram_reschedule" maxLength="41" comment="Title of the box labelled by deck_conf_cram_reschedule_summ">ಮರುಹೊಂದಿಸಿ</string>
diff --git a/AnkiDroid/src/main/res/values-ko/10-preferences.xml b/AnkiDroid/src/main/res/values-ko/10-preferences.xml
index e08e9886466f..00c07d5067fc 100644
--- a/AnkiDroid/src/main/res/values-ko/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ko/10-preferences.xml
@@ -116,7 +116,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">왼쪽 하단 터치</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">오른쪽 하단 터치</string>
     <string name="gestures_shake" maxLength="41">기기 흔들기</string>
-    <string name="card_browser_enable_external_context_menu">\"%s\" 메뉴</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">\"%s\" 메뉴</string>
     <string name="card_browser_enable_external_context_menu_summary">시스템 전역에서 글자를 길게 눌렀을 때 \'%s\' 컨텍스트 메뉴를 보입니다.</string>
     <string name="double_scrolling_gap" maxLength="41">이중 스크롤</string>
     <string name="double_scrolling_gap_summ">eReader 사용시 스크롤 간격 두배로 늘리기</string>
diff --git a/AnkiDroid/src/main/res/values-ko/17-model-manager.xml b/AnkiDroid/src/main/res/values-ko/17-model-manager.xml
index 946a10eedd38..b84a6bdb3bf0 100644
--- a/AnkiDroid/src/main/res/values-ko/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ko/17-model-manager.xml
@@ -45,7 +45,7 @@
     <string name="model_browser_rename" comment="Rename a note type">이름 변경하기</string>
     <string name="model_browser_template">카드 편집하기</string>
     <!--Rename-->
-    <string name="rename_model">노트 유형 이름 바꾸기 </string>
+    <string name="rename_model">노트 유형 이름 바꾸기</string>
     <!--Language Hint-->
     <string name="model_field_editor_language_hint_dialog_success_result">키보드 언어 힌트를 %s로 설정하기</string>
     <!--Field Editing-->
diff --git a/AnkiDroid/src/main/res/values-ku/10-preferences.xml b/AnkiDroid/src/main/res/values-ku/10-preferences.xml
index 1a12afc3c31c..5f33bc5fee24 100644
--- a/AnkiDroid/src/main/res/values-ku/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ku/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Double scrolling</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>
diff --git a/AnkiDroid/src/main/res/values-ky/10-preferences.xml b/AnkiDroid/src/main/res/values-ky/10-preferences.xml
index 2afb72668806..685d62aa4d39 100644
--- a/AnkiDroid/src/main/res/values-ky/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ky/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Double scrolling</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>
diff --git a/AnkiDroid/src/main/res/values-lt/01-core.xml b/AnkiDroid/src/main/res/values-lt/01-core.xml
index f38084fb37a4..96cb94e0bb46 100644
--- a/AnkiDroid/src/main/res/values-lt/01-core.xml
+++ b/AnkiDroid/src/main/res/values-lt/01-core.xml
@@ -133,7 +133,7 @@
     <string name="custom_study_deck_exists">Prašome pirmiausiai pervadinti esamą individualaus mokymosi rinkinį</string>
     <string name="search_deck" comment="Deck search for selecting it">Rinkinio paieška</string>
     <string name="empty_deck">Šis rinkinys yra tuščias</string>
-    <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Rinkinio paieška </string>
+    <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Rinkinio paieška</string>
     <string name="invalid_deck_name">Blogas rinkinio vardas</string>
     <string name="studyoptions_congrats_finished">Congratulations! You have finished for today.</string>
     <string name="studyoptions_congrats_next_due_in" comment="The param will be replaced with \'The next card will be ready in X time\'">Deck finished for now! %s</string>
@@ -154,7 +154,7 @@
     <string name="card_template_editor_back">Galinė pusė</string>
     <string name="card_template_editor_styling" maxLength="28">Išvaizdos keitimas</string>
     <string name="card_template_editor_menu_card_browser_appearance" maxLength="28">Naršyklės išvaizda</string>
-    <string name="card_template_editor_deck_override" maxLength="28">Rinkinio perrašymas </string>
+    <string name="card_template_editor_deck_override" maxLength="28">Rinkinio perrašymas</string>
     <string name="card_template_editor_insert_field" maxLength="28">Įterpti laukelį</string>
     <string name="card_template_editor_select_field">Pasirinkti laukelį</string>
     <string name="card_template_editor_cant_delete">Reikalingas bent vienas kortelės tipas</string>
diff --git a/AnkiDroid/src/main/res/values-lt/10-preferences.xml b/AnkiDroid/src/main/res/values-lt/10-preferences.xml
index da51a0dcd14a..72db714301fa 100644
--- a/AnkiDroid/src/main/res/values-lt/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-lt/10-preferences.xml
@@ -119,7 +119,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Dvigubas slinkimas</string>
     <string name="double_scrolling_gap_summ">Padvigubinkite slinkimo tarpą naudodami el. knygų skaityklę</string>
@@ -250,7 +250,7 @@
     <string name="deck_conf_cram_preview_delays_summ">Delays are in seconds. 0 returns card to original deck.</string>
     <!-- analytics options -->
     <string name="analytics_dialog_title">Padėkite tobulinti „AnkiDroid“!</string>
-    <string name="analytics_title" maxLength="41"> Dalintis funkcijų naudojimu</string>
+    <string name="analytics_title" maxLength="41">Dalintis funkcijų naudojimu</string>
     <string name="analytics_summ">Galite prisidėti prie „AnkiDroid“ tobulinimo, padėdami kūrėjų komandai suprasti, kokiomis funkcijomis žmonės naudojasi</string>
     <string name="note_editor_replace_newlines" maxLength="41">Replace newlines with HTML</string>
     <string name="note_editor_replace_newlines_summ">In the Note Editor, convert any instances of &lt;br&gt; to newlines when editing a card.</string>
diff --git a/AnkiDroid/src/main/res/values-lv/10-preferences.xml b/AnkiDroid/src/main/res/values-lv/10-preferences.xml
index 7e32dc0495df..61a6ac3f7dba 100644
--- a/AnkiDroid/src/main/res/values-lv/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-lv/10-preferences.xml
@@ -118,7 +118,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Double scrolling</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>
diff --git a/AnkiDroid/src/main/res/values-mk/10-preferences.xml b/AnkiDroid/src/main/res/values-mk/10-preferences.xml
index 36d535304d51..2d27886b5c21 100644
--- a/AnkiDroid/src/main/res/values-mk/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-mk/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Double scrolling</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>
diff --git a/AnkiDroid/src/main/res/values-ml/10-preferences.xml b/AnkiDroid/src/main/res/values-ml/10-preferences.xml
index ee9b1eb61620..f6d7abe1086a 100644
--- a/AnkiDroid/src/main/res/values-ml/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ml/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">ചുവടെ ഇടത് സ്പർശിക്കുക</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">ചുവടെ വലതുവശത്ത് സ്‌പർശിക്കുക</string>
     <string name="gestures_shake" maxLength="41">ഉപകരണം കുലുക്കുക</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ മെനു</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ മെനു</string>
     <string name="card_browser_enable_external_context_menu_summary">ആഗോളതലത്തിൽ ‘%s’ സന്ദർഭ മെനു പ്രവർത്തനക്ഷമമാക്കുന്നു</string>
     <string name="double_scrolling_gap" maxLength="41">ഇരട്ട സ്ക്രോളിംഗ്</string>
     <string name="double_scrolling_gap_summ">eReader ഉപയോഗിച്ച് സ്ക്രോൾ വിടവ് ഇരട്ടിയാക്കുക</string>
diff --git a/AnkiDroid/src/main/res/values-mn/01-core.xml b/AnkiDroid/src/main/res/values-mn/01-core.xml
index d019686631be..ba496bd68a53 100644
--- a/AnkiDroid/src/main/res/values-mn/01-core.xml
+++ b/AnkiDroid/src/main/res/values-mn/01-core.xml
@@ -147,7 +147,7 @@
     <string name="card_template_editor_front">Картын урд талын загвар</string>
     <string name="card_template_editor_back">Картын ард талын загвар</string>
     <string name="card_template_editor_styling" maxLength="28">Харагдах байдал</string>
-    <string name="card_template_editor_menu_card_browser_appearance" maxLength="28">Карт хайгчид харагдах байдал </string>
+    <string name="card_template_editor_menu_card_browser_appearance" maxLength="28">Карт хайгчид харагдах байдал</string>
     <string name="card_template_editor_deck_override" maxLength="28">Багцыг шууд сонгох</string>
     <string name="card_template_editor_insert_field" maxLength="28">Талбар оруулах</string>
     <string name="card_template_editor_select_field">Талбараа сонгох</string>
@@ -163,7 +163,7 @@
     <string name="card_template_editor_save_error">Картны загварын өөрчлөлтүүдийг хадгалах боломжгүй байна:%s</string>
     <string name="template_for_current_card_deleted">Энэ картны төрөл нь устгагдсан байна</string>
     <!-- Card Browser Appearance -->
-    <string name="card_template_browser_appearance_title">Карт хайгчийн харагдах байдал </string>
+    <string name="card_template_browser_appearance_title">Карт хайгчийн харагдах байдал</string>
     <!-- card Info -->
     <string name="card_info_title" maxLength="28">Картын тухай мэдээлэл</string>
     <!-- Permissions -->
diff --git a/AnkiDroid/src/main/res/values-mn/02-strings.xml b/AnkiDroid/src/main/res/values-mn/02-strings.xml
index 5ddffc7feb50..3095a3491ae3 100644
--- a/AnkiDroid/src/main/res/values-mn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-mn/02-strings.xml
@@ -64,7 +64,7 @@
     <string name="save_whiteboard" maxLength="28">Зурсан зургаа хадгалах</string>
     <string name="enable_stylus" maxLength="28">Enable stylus writing</string>
     <string name="disable_stylus">Disable stylus writing</string>
-    <string name="enable_whiteboard" maxLength="28">Зураг зурах горимыг идэвхжүүлэх </string>
+    <string name="enable_whiteboard" maxLength="28">Зураг зурах горимыг идэвхжүүлэх</string>
     <string name="disable_whiteboard">Зураг зурах горимыг унтраах</string>
     <string name="show_whiteboard">Зурсан зургыг харуулах</string>
     <string name="hide_whiteboard" maxLength="28">Зурсан зургыг нуух</string>
@@ -74,13 +74,13 @@
     <string name="leech_notification">Card marked as leech</string>
     <string name="webview_crash_unknown">Тодорхойгүй алдаа</string>
     <string name="webview_crash_unknwon_detailed">This was caused by an internal error in the WebView</string>
-    <string name="webview_crash_oom">Багтаамж дүүрсэн байна </string>
+    <string name="webview_crash_oom">Багтаамж дүүрсэн байна</string>
     <string name="webview_crash_oom_details">The WebView was terminated by the system. This typically happens when the application runs out of memory, often due to large fonts or media.</string>
     <string name="webview_crash_nonfatal">WebView renderer crashed. Cause: %s</string>
     <string name="webview_crash_fatal">Fatal Error: WebView renderer crashed. Cause: %s</string>
     <string name="webview_crash_loop_dialog_title">System WebView Rendering Failure</string>
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
-    <string name="filter_by_flags" maxLength="41">Дарцагнууд </string>
+    <string name="filter_by_flags" maxLength="41">Дарцагнууд</string>
     <!-- Custom study options -->
     <string name="custom_study_limit_tags">Limit to particular tags</string>
     <plurals name="studyoptions_buried_count">
diff --git a/AnkiDroid/src/main/res/values-mn/10-preferences.xml b/AnkiDroid/src/main/res/values-mn/10-preferences.xml
index 5a7b2e0e63d5..c8775dba4933 100644
--- a/AnkiDroid/src/main/res/values-mn/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-mn/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Double scrolling</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>
diff --git a/AnkiDroid/src/main/res/values-mr/10-preferences.xml b/AnkiDroid/src/main/res/values-mr/10-preferences.xml
index fce8239f69ed..07ac158f4790 100644
--- a/AnkiDroid/src/main/res/values-mr/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-mr/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">डावीकडे तळाशी स्पर्श करा</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">उजवीकडे तळाशी स्पर्श करा</string>
     <string name="gestures_shake" maxLength="41">शेक डिव्हाइस</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ मेनू</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ मेनू</string>
     <string name="card_browser_enable_external_context_menu_summary">जागतिक स्तरावर ‘%s’ संदर्भ मेनू सक्षम करते</string>
     <string name="double_scrolling_gap" maxLength="41">डबल स्क्रोलिंग</string>
     <string name="double_scrolling_gap_summ">EReader सह स्क्रोल अंतर दुप्पट करा</string>
diff --git a/AnkiDroid/src/main/res/values-ms/10-preferences.xml b/AnkiDroid/src/main/res/values-ms/10-preferences.xml
index fae55e520a82..52bf5127aec0 100644
--- a/AnkiDroid/src/main/res/values-ms/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ms/10-preferences.xml
@@ -116,7 +116,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Sentuh bawah kiri</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Sentuh bawah kanan</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">Menu ‘%s’</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">Menu ‘%s’</string>
     <string name="card_browser_enable_external_context_menu_summary">Dayakan menu konteks ‘%s’ secara global</string>
     <string name="double_scrolling_gap" maxLength="41">Tatal dua kali</string>
     <string name="double_scrolling_gap_summ">Jarak tatal ganda dua untuk e-pembaca</string>
diff --git a/AnkiDroid/src/main/res/values-my/10-preferences.xml b/AnkiDroid/src/main/res/values-my/10-preferences.xml
index 0f0b55cad9c9..6744950912bc 100644
--- a/AnkiDroid/src/main/res/values-my/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-my/10-preferences.xml
@@ -116,7 +116,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Double scrolling</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>
diff --git a/AnkiDroid/src/main/res/values-nl/02-strings.xml b/AnkiDroid/src/main/res/values-nl/02-strings.xml
index 7437411e0ec8..af3d16185798 100644
--- a/AnkiDroid/src/main/res/values-nl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-nl/02-strings.xml
@@ -80,7 +80,7 @@
     <string name="webview_crash_fatal">Fatale fout: WebView renderer is gecrasht. Oorzaak: %s</string>
     <string name="webview_crash_loop_dialog_title">Systeem WebView Rendering Mislukking.</string>
     <string name="webview_crash_loop_dialog_content">Systeem WebView kon de kaart \'%1$s\' niet renderen.\n%2$s</string>
-    <string name="filter_by_flags" maxLength="41">Vlaggen </string>
+    <string name="filter_by_flags" maxLength="41">Vlaggen</string>
     <!-- Custom study options -->
     <string name="custom_study_limit_tags">Beperken tot bepaalde tags</string>
     <plurals name="studyoptions_buried_count">
diff --git a/AnkiDroid/src/main/res/values-nl/10-preferences.xml b/AnkiDroid/src/main/res/values-nl/10-preferences.xml
index 55de3dbe51fb..aae9cb87a030 100644
--- a/AnkiDroid/src/main/res/values-nl/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-nl/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Druk linksonder</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Druk rechtsonder</string>
     <string name="gestures_shake" maxLength="41">Schud apparaat</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Schakelt het contextmenu \' \'%s\' overal in</string>
     <string name="double_scrolling_gap" maxLength="41">Sneller scrollen</string>
     <string name="double_scrolling_gap_summ">Verdubbel de scroll-afstand voor eReader</string>
diff --git a/AnkiDroid/src/main/res/values-nn/04-network.xml b/AnkiDroid/src/main/res/values-nn/04-network.xml
index c5af5dec75a3..f3debe49fdcb 100644
--- a/AnkiDroid/src/main/res/values-nn/04-network.xml
+++ b/AnkiDroid/src/main/res/values-nn/04-network.xml
@@ -74,7 +74,7 @@
     <string name="sync_corrupt_database">Databasen din er ødelagt. Vennligst fiks den før du prøver å synkronisere på nytt.\n\nSee %s for informasjon om å reparere databaser.</string>
     <!-- Please run ‘Check database’ before syncing -->
     <string name="sync_sanity_local">Lokalt</string>
-    <string name="sync_sanity_remote">Ekstern </string>
+    <string name="sync_sanity_remote">Ekstern</string>
     <string name="one_way_sync_title" maxLength="41">One-way sync</string>
     <string name="one_way_sync_confirmation">One way sync requested</string>
     <string name="full_sync_confirmation">The requested change will require a full upload of the database when you next synchronize your collection. If you have reviews or other changes waiting on another device that haven’t been synchronized here yet, they will be lost. Continue?</string>
diff --git a/AnkiDroid/src/main/res/values-nn/10-preferences.xml b/AnkiDroid/src/main/res/values-nn/10-preferences.xml
index b947fe8b4de8..1e9662eee910 100644
--- a/AnkiDroid/src/main/res/values-nn/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-nn/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Berør nederst til venstre</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Berør nederst til høyre</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Meny</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Meny</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Dobbelskrolling</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>
diff --git a/AnkiDroid/src/main/res/values-no/04-network.xml b/AnkiDroid/src/main/res/values-no/04-network.xml
index 14c122fd8d52..41653286e9b9 100644
--- a/AnkiDroid/src/main/res/values-no/04-network.xml
+++ b/AnkiDroid/src/main/res/values-no/04-network.xml
@@ -74,7 +74,7 @@
     <string name="sync_corrupt_database">Databasen din er ødelagt. Vennligst fiks den før du prøver å synkronisere på nytt.\n\nSee %s for informasjon om å reparere databaser.</string>
     <!-- Please run ‘Check database’ before syncing -->
     <string name="sync_sanity_local">Lokalt</string>
-    <string name="sync_sanity_remote">Ekstern </string>
+    <string name="sync_sanity_remote">Ekstern</string>
     <string name="one_way_sync_title" maxLength="41">One-way sync</string>
     <string name="one_way_sync_confirmation">One way sync requested</string>
     <string name="full_sync_confirmation">The requested change will require a full upload of the database when you next synchronize your collection. If you have reviews or other changes waiting on another device that haven’t been synchronized here yet, they will be lost. Continue?</string>
diff --git a/AnkiDroid/src/main/res/values-no/10-preferences.xml b/AnkiDroid/src/main/res/values-no/10-preferences.xml
index e13ea649f9fb..f14ca5be4423 100644
--- a/AnkiDroid/src/main/res/values-no/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-no/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Berør nederst til venstre</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Berør nederst til høyre</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Meny</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Meny</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Dobbelskrolling</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>
diff --git a/AnkiDroid/src/main/res/values-or/02-strings.xml b/AnkiDroid/src/main/res/values-or/02-strings.xml
index b46d46cb6e01..77769b81c340 100644
--- a/AnkiDroid/src/main/res/values-or/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-or/02-strings.xml
@@ -95,7 +95,7 @@
     <string name="note_editor_no_cards_created">କୌଣସି ପତ୍ର ସୃଷ୍ଟି ହୋଇନାହିଁ। ଦୟାକରି ଅଧିକ କ୍ଷେତ୍ର ପୂରଣ କରନ୍ତୁ</string>
     <string name="note_editor_no_cards_created_all_fields">ଚଳିତ ନୋଟ୍ ପ୍ରକାର କୌଣସି ପତ୍ର ଉତ୍ପାଦନ କଲା ନାହିଁ।\nଦୟାକରି ଅନ୍ୟ କୌଣସି ନୋଟ୍ ପ୍ରକାର ବାଛନ୍ତୁ କିମ୍ବା ‘ପତ୍ର’ କ୍ଲିକ୍ କରି ଗୋଟେ କ୍ଷେତ୍ର ପ୍ରତିସ୍ଥାପନ ଯୋଡ଼ନ୍ତୁ</string>
     <string name="note_editor_insert_cloze_no_cloze_note_type">କ୍ଲୋଜ ବିଲୋପ କେବଳ କ୍ଲୋଜ ନୋଟ ପ୍ରକାରରେ ହିଁ କାମ କରେ</string>
-    <string name="saving_facts">ନୋଟ୍ ସଂରକ୍ଷିତ କରାଯାଉଛି </string>
+    <string name="saving_facts">ନୋଟ୍ ସଂରକ୍ଷିତ କରାଯାଉଛି</string>
     <string name="saving_model">ନୋଟ୍ ପ୍ରକାର ସଂରକ୍ଷିତ ହଉଛି</string>
     <string name="save" maxLength="28">ସଞ୍ଚୟ</string>
     <string name="close">ବନ୍ଦ</string>
diff --git a/AnkiDroid/src/main/res/values-or/03-dialogs.xml b/AnkiDroid/src/main/res/values-or/03-dialogs.xml
index 44eb04f64da5..f2d91aaa43ba 100644
--- a/AnkiDroid/src/main/res/values-or/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-or/03-dialogs.xml
@@ -138,7 +138,7 @@
     <!-- Database Errors-->
     <string name="database_locked_title">ଡାଟାବେସ୍ ଲକ୍ ହୋଇଛି</string>
     <string name="database_locked_summary">AnkiDroid ଡାଟାବେସ୍ ଅନ୍ୟ ଏକ ଆପ୍ ଦ୍ୱାରା ଵ୍ୟଵହାର ହେଉଛି। ଦୟାକରି ଅନ୍ୟ ଆପ୍‌ଟିକୁ ବନ୍ଦ କରି AnkiDroid ଖୋଲନ୍ତୁ।</string>
-    <string name="incompatible_database_version_title">ଅସଙ୍ଗତ ଡାଟାବେସ୍ ସଂସ୍କରଣ </string>
+    <string name="incompatible_database_version_title">ଅସଙ୍ଗତ ଡାଟାବେସ୍ ସଂସ୍କରଣ</string>
     <string name="incompatible_database_version_summary">AnkiDroidର ଏହି ସଂସ୍କରଣ ଡାଟାବେସ୍ ସହିତ କାମ କରିପାରିବନାହିଁ। ଏହାକୁ ଖୋଲିବା ପାଇଁ AnkiDroidକୁ ଅଦ୍ୟତନ କରନ୍ତୁ କିମ୍ବା ଡାଟାବେସ୍‌କୁ ଡାଉନଗ୍ରେଡ୍ କରନ୍ତୁ\n\nସମର୍ଥିତ ସଂସ୍କରଣ: %1$d\nଡାଟାବେସ୍ ସଂସ୍କରଣ: %2$d\n\nନିମ୍ନଲିଖିତ ପୁନରୁଦ୍ଧାର ଵିକଳ୍ପ ଆପଣଙ୍କର ସାମ୍ପ୍ରତିକ ସଂଗ୍ରହକୁ ନବଲିଖନ କରିବ, ସମ୍ଭବତଃ ଏକ ସୁସଙ୍ଗତ ଡାଟାବେସ୍ ସଂସ୍କରଣ ସହିତ:</string>
     <!-- Deck Picker Background-->
     <string name="background_image_applied">ପୃଷ୍ଠପଟ ପ୍ରତିଛବି ପ୍ରୟୋଗ ହୋଇଛି</string>
diff --git a/AnkiDroid/src/main/res/values-or/04-network.xml b/AnkiDroid/src/main/res/values-or/04-network.xml
index 61d145b7ff43..c52469516d3f 100644
--- a/AnkiDroid/src/main/res/values-or/04-network.xml
+++ b/AnkiDroid/src/main/res/values-or/04-network.xml
@@ -60,7 +60,7 @@
     <string name="sign_up_description">AnkiWeb ଖାତା ନାହିଁ କି? ଏହା ମାଗଣା ଅଟେ!</string>
     <string name="sign_up_not_affiliated">ସୂଚନା: AnkiWeb AnkiDroid ସହିତ ଜଡ଼ିତ ନୁହେଁ</string>
     <string name="sign_up">ସାଇନ୍ ଅପ୍</string>
-    <string name="logged_as">ଭାବେ ଲଗ୍ ଇନ୍ କରିଛନ୍ତି </string>
+    <string name="logged_as">ଭାବେ ଲଗ୍ ଇନ୍ କରିଛନ୍ତି</string>
     <string name="log_out">ଲଗ୍ ଆଉଟ୍</string>
     <string name="reset_password">ପାସ୍‌ୱର୍ଡ଼ ପୁନଃସେଟ୍ କର</string>
     <string name="lost_mail_instructions">ଇମେଲ୍ ଭୁଲିଗଲେ କି?</string>
diff --git a/AnkiDroid/src/main/res/values-or/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-or/07-cardbrowser.xml
index 92d8a72038de..d3531829f192 100644
--- a/AnkiDroid/src/main/res/values-or/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-or/07-cardbrowser.xml
@@ -67,7 +67,7 @@
     <string name="card_browser_list_my_searches" maxLength="28">ମୋ ସନ୍ଧାନଗୁଡ଼ିକ</string>
     <string name="card_browser_list_my_searches_save" maxLength="28">ସନ୍ଧାନ ସଂରକ୍ଷିତ କର</string>
     <string name="card_browser_list_my_searches_title">ଏକ ସଞ୍ଚିତ ସନ୍ଧାନ ବାଛନ୍ତୁ</string>
-    <string name="card_browser_list_my_searches_new_name">ସାମ୍ପ୍ରତିକ ସନ୍ଧାନ ପାଇଁ ନାମ </string>
+    <string name="card_browser_list_my_searches_new_name">ସାମ୍ପ୍ରତିକ ସନ୍ଧାନ ପାଇଁ ନାମ</string>
     <string name="card_browser_list_my_searches_new_search_error_empty_name">ଆପଣ ନାମ ବିନା ସନ୍ଧାନ ସଞ୍ଚୟ କରିପାରିବେ ନାହିଁ</string>
     <string name="card_browser_list_my_searches_new_search_error_dup">ନାଁଟି ଵିଦ୍ୟମାନ ଅଛି</string>
     <string name="no_note_to_edit">ସମ୍ପାଦନ କରିବାକୁ କୌଣସି ନୋଟ୍ ନାହିଁ</string>
@@ -76,7 +76,7 @@
     <string name="card_browser_search_hint" comment="Message displayed in the search text field in the card browser.">ସନ୍ଧାନ</string>
     <string name="card_browser_cram_search" maxLength="28" comment="Menu entry to start a search.">ସନ୍ଧାନ</string>
     <string name="card_browser_change_display_order_title">ପ୍ରଦର୍ଶନ କ୍ରମ ପରିବର୍ତ୍ତନ କରନ୍ତୁ</string>
-    <string name="card_details_tags">ଟ୍ୟାଗ୍ </string>
+    <string name="card_details_tags">ଟ୍ୟାଗ୍</string>
     <string-array name="card_browser_order_labels">
         <item>କୌଣସି ସଜାଣି ନାହିଁ (ଦ୍ରୁତ)</item>
         <item>ସଜାଇବା କ୍ଷେତ୍ର ଅନୁସାରେ</item>
diff --git a/AnkiDroid/src/main/res/values-or/10-preferences.xml b/AnkiDroid/src/main/res/values-or/10-preferences.xml
index 441b861c4858..02f477755b8b 100644
--- a/AnkiDroid/src/main/res/values-or/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-or/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">ତଳ ବାମକୁ ସ୍ପର୍ଶ କଲେ</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">ତଳ ଡାହାଣକୁ ସ୍ପର୍ଶ କଲେ</string>
     <string name="gestures_shake" maxLength="41">ଡିଵାଇସ୍ ଝାଙ୍କିଲେ</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ ମେନୁ</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ ମେନୁ</string>
     <string name="card_browser_enable_external_context_menu_summary">ସବୁ ଜାଗାରେ ‘%s’ ପ୍ରସଙ୍ଗ ମେନୁକୁ ସକ୍ଷମ କରିଥାଏ</string>
     <string name="double_scrolling_gap" maxLength="41">ଦ୍ୱିଗୁଣ ସ୍କ୍ରୋଲିଂ</string>
     <string name="double_scrolling_gap_summ">eReaderରେ ସ୍କ୍ରୋଲ୍ ଫାଙ୍କକୁ ଦୁଇଗୁଣ କରନ୍ତୁ</string>
diff --git a/AnkiDroid/src/main/res/values-pa/10-preferences.xml b/AnkiDroid/src/main/res/values-pa/10-preferences.xml
index cf5e71071f84..0871fcf08f0a 100644
--- a/AnkiDroid/src/main/res/values-pa/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-pa/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">ਹੇਠਾਂ ਖੱਬੇ ਪਾਸੇ ਛੋਹਵੋ</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">ਹੇਠਾਂ ਸੱਜੇ ਪਾਸੇ ਛੋਹਵੋ</string>
     <string name="gestures_shake" maxLength="41">ਸ਼ੇਕ ਜੰਤਰ</string>
-    <string name="card_browser_enable_external_context_menu">\'%s\' ਮੀਨੂ</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">\'%s\' ਮੀਨੂ</string>
     <string name="card_browser_enable_external_context_menu_summary">ਵਿਸ਼ਵ ਪੱਧਰ \'ਤੇ \'%s\' ਸੰਦਰਭ ਮੀਨੂ ਨੂੰ ਸਮਰੱਥ ਬਣਾਉਂਦਾ ਹੈ</string>
     <string name="double_scrolling_gap" maxLength="41">ਡਬਲ ਸਕ੍ਰੋਲਿੰਗ</string>
     <string name="double_scrolling_gap_summ">eReader ਨਾਲ ਸਕ੍ਰੋਲ ਗੈਪ ਨੂੰ ਦੁੱਗਣਾ ਕਰੋ</string>
diff --git a/AnkiDroid/src/main/res/values-pl/02-strings.xml b/AnkiDroid/src/main/res/values-pl/02-strings.xml
index d286aa22e0c6..25366c9d37ee 100644
--- a/AnkiDroid/src/main/res/values-pl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-pl/02-strings.xml
@@ -80,7 +80,7 @@
     <string name="webview_crash_fatal">Błąd krytyczny: awaria renderowania WebView. Przyczyna: %s</string>
     <string name="webview_crash_loop_dialog_title">Błąd renderowania WebView systemu</string>
     <string name="webview_crash_loop_dialog_content">System WebView nie potrafił wyrenderować karty \'%1$s\'.\n %2$s</string>
-    <string name="filter_by_flags" maxLength="41">Flagi </string>
+    <string name="filter_by_flags" maxLength="41">Flagi</string>
     <!-- Custom study options -->
     <string name="custom_study_limit_tags">Ogranicz do poszczególnych tagów</string>
     <plurals name="studyoptions_buried_count">
diff --git a/AnkiDroid/src/main/res/values-pl/10-preferences.xml b/AnkiDroid/src/main/res/values-pl/10-preferences.xml
index a600c190a198..a6ed05f686a1 100644
--- a/AnkiDroid/src/main/res/values-pl/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-pl/10-preferences.xml
@@ -119,8 +119,8 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Dotknij lewej dolnej części ekranu</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Dotknij prawej dolnej części ekranu</string>
     <string name="gestures_shake" maxLength="41">Potrząśnij urządzeniem</string>
-    <string name="card_browser_enable_external_context_menu">Menu „%s”</string>
-    <string name="card_browser_enable_external_context_menu_summary">Włącza menu kontekstowe „%s”globalne </string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">Menu „%s”</string>
+    <string name="card_browser_enable_external_context_menu_summary">Włącza menu kontekstowe „%s”globalne</string>
     <string name="double_scrolling_gap" maxLength="41">Podwójne przewijanie</string>
     <string name="double_scrolling_gap_summ">Podwójny skok suwaka na eReaderze</string>
     <string name="swipe_sensitivity" maxLength="41">Czułość przy przewijaniu</string>
@@ -299,7 +299,7 @@
     <!-- Developer options -->
     <string name="pref_cat_dev_options" maxLength="41">Ustawienia programisty</string>
     <string name="dev_options_enabled_pref" maxLength="41">Włącz opcje dla programistów</string>
-    <string name="disable_dev_options">Wyłącz opcje dla programistów </string>
+    <string name="disable_dev_options">Wyłącz opcje dla programistów</string>
     <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
diff --git a/AnkiDroid/src/main/res/values-pt-rBR/10-preferences.xml b/AnkiDroid/src/main/res/values-pt-rBR/10-preferences.xml
index a006180a68f7..96b1a404208d 100644
--- a/AnkiDroid/src/main/res/values-pt-rBR/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-pt-rBR/10-preferences.xml
@@ -95,7 +95,7 @@
     </string-array>
     <string name="gestures" maxLength="41">Habilitar gestos</string>
     <string name="gestures_summ">Atribuir gestos a ações tais como responder e editar cards.</string>
-    <string name="gestures_corner_touch" maxLength="41">9 Ações de Toque </string>
+    <string name="gestures_corner_touch" maxLength="41">9 Ações de Toque</string>
     <string name="gestures_corner_touch_summary">Permitir gestos de toque nos cantos da tela</string>
     <string name="show_keyboard_shortcuts" maxLength="41">Exibir teclas de atalho</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Painel de navegação em tela cheia</string>
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Toque Baixo Esquerda</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Toque Baixo Direita</string>
     <string name="gestures_shake" maxLength="41">Agitar o dispositivo</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu </string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Habilita o menu de contexto globalmente ‘%s\'</string>
     <string name="double_scrolling_gap" maxLength="41">Rolagem dupla</string>
     <string name="double_scrolling_gap_summ">Duplicar a lacuna de rolagem com eReader</string>
@@ -225,8 +225,8 @@
     <string name="answer_buttons" maxLength="41">Botões de resposta</string>
     <string name="card" maxLength="41" comment="Generic term to refer to a card">Carta</string>
     <string name="note" maxLength="41">Nota</string>
-    <string name="navigation" maxLength="41">Navegação </string>
-    <string name="media" maxLength="41">Multimídia </string>
+    <string name="navigation" maxLength="41">Navegação</string>
+    <string name="media" maxLength="41">Multimídia</string>
     <string name="misc" maxLength="41">Diversos</string>
     <!-- studyoptions -->
     <string name="studyoptions_limit_select_tags">Selecione Tags</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rPT/10-preferences.xml b/AnkiDroid/src/main/res/values-pt-rPT/10-preferences.xml
index 55810d8247fe..54ec232f5283 100644
--- a/AnkiDroid/src/main/res/values-pt-rPT/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-pt-rPT/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Toque no canto inferior esquerdo</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Toque no canto inferior direito</string>
     <string name="gestures_shake" maxLength="41">Agitar o dispositivo</string>
-    <string name="card_browser_enable_external_context_menu">Menu ‘%s’</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">Menu ‘%s’</string>
     <string name="card_browser_enable_external_context_menu_summary">Activa o menu contextual ‘%s’, globalmente</string>
     <string name="double_scrolling_gap" maxLength="41">Scroll duplo</string>
     <string name="double_scrolling_gap_summ">Duplicar a velocidade de scroll com o eReader</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rPT/16-multimedia-editor.xml b/AnkiDroid/src/main/res/values-pt-rPT/16-multimedia-editor.xml
index 76793be159d0..a94ad8c7ff10 100644
--- a/AnkiDroid/src/main/res/values-pt-rPT/16-multimedia-editor.xml
+++ b/AnkiDroid/src/main/res/values-pt-rPT/16-multimedia-editor.xml
@@ -65,7 +65,7 @@
     <!-- Message when recording fails -->
     <string name="multimedia_editor_audio_view_recording_failed">Falha na gravação</string>
     <string name="multimedia_editor_audio_view_playing_failed">Falha na reprodução</string>
-    <string name="multimedia_editor_audio_view_create_failed">Não foi possível criar a barra de ferramentas de gravação </string>
+    <string name="multimedia_editor_audio_view_create_failed">Não foi possível criar a barra de ferramentas de gravação</string>
     <!-- Crop function-->
     <string name="crop_image">Quer recortar esta imagem?</string>
     <string name="crop_button" maxLength="28">Recortar imagem</string>
diff --git a/AnkiDroid/src/main/res/values-ro/01-core.xml b/AnkiDroid/src/main/res/values-ro/01-core.xml
index 629a181ad196..5dabc1bb22a5 100644
--- a/AnkiDroid/src/main/res/values-ro/01-core.xml
+++ b/AnkiDroid/src/main/res/values-ro/01-core.xml
@@ -106,11 +106,11 @@
     <string name="menu_flag" maxLength="41">Marcaj</string>
     <string name="rename_flag">Rename flags</string>
     <string name="menu_flag_card" maxLength="28">Marchează card</string>
-    <string name="menu_edit_tags" maxLength="28">Editează etichete </string>
+    <string name="menu_edit_tags" maxLength="28">Editează etichete</string>
     <string name="delete_note_message">Doriți sigur să ștergeți această notă și toate cardurile sale?\n%s</string>
     <string name="menu_search" maxLength="28">Căutare în %1$s</string>
     <string name="menu_mark_note" maxLength="28">Marcheaza nota</string>
-    <string name="menu_unmark_note">Demarcheaza nota </string>
+    <string name="menu_unmark_note">Demarcheaza nota</string>
     <string name="menu_enable_voice_playback" maxLength="28">Enable voice playback</string>
     <string name="menu_disable_voice_playback">Disable voice playback</string>
     <string name="new_deck">Crează punte</string>
diff --git a/AnkiDroid/src/main/res/values-ro/10-preferences.xml b/AnkiDroid/src/main/res/values-ro/10-preferences.xml
index fe449472cd22..ecdd4c451ecd 100644
--- a/AnkiDroid/src/main/res/values-ro/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ro/10-preferences.xml
@@ -118,7 +118,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Double scrolling</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>
diff --git a/AnkiDroid/src/main/res/values-ru/02-strings.xml b/AnkiDroid/src/main/res/values-ru/02-strings.xml
index 0a0a57363097..5d9c11f14e56 100644
--- a/AnkiDroid/src/main/res/values-ru/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ru/02-strings.xml
@@ -140,7 +140,7 @@
     <string name="import_preparing_file">Подготовка файла для импорта&#8230;</string>
     <string name="import_message_add" comment="Adding a new deck to the collection (import)">Добавить</string>
     <string name="import_message_replace_confirm">Ваша коллекция будет удалена, и её заменят данные из файла %s</string>
-    <string name="import_dialog_message_add">Добавить \"%s\" в коллекцию? Может потребоваться немало времени </string>
+    <string name="import_dialog_message_add">Добавить \"%s\" в коллекцию? Может потребоваться немало времени</string>
     <string name="import_log_no_apkg">Это недопустимый пакет Anki</string>
     <string name="import_title_error" comment="Title of error dialog">Ошибка</string>
     <string name="import_error_handle_exception">Не удалось импортировать файл\n\n%s</string>
diff --git a/AnkiDroid/src/main/res/values-ru/10-preferences.xml b/AnkiDroid/src/main/res/values-ru/10-preferences.xml
index 8410c29f97af..40b4e05cbf79 100644
--- a/AnkiDroid/src/main/res/values-ru/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ru/10-preferences.xml
@@ -119,7 +119,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Касание внизу в левом углу</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Касание внизу в правом углу</string>
     <string name="gestures_shake" maxLength="41">Потрясти устройство </string>
-    <string name="card_browser_enable_external_context_menu">Пункт «%s» в меню</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">Пункт «%s» в меню</string>
     <string name="card_browser_enable_external_context_menu_summary">Добавляет пункт «%s» в контекстное меню системы</string>
     <string name="double_scrolling_gap" maxLength="41">Двойная прокрутка</string>
     <string name="double_scrolling_gap_summ">Удвоить дистанцию прокрутки на читалках</string>
diff --git a/AnkiDroid/src/main/res/values-sat/01-core.xml b/AnkiDroid/src/main/res/values-sat/01-core.xml
index 64bd00a34917..8431af58b448 100644
--- a/AnkiDroid/src/main/res/values-sat/01-core.xml
+++ b/AnkiDroid/src/main/res/values-sat/01-core.xml
@@ -89,7 +89,7 @@
     <string name="create_shortcut">ᱥᱚᱴᱠᱚᱴ ᱛᱮᱭᱟᱨ ᱢᱮ</string>
     <string name="browse_cards">ᱠᱟᱰ ᱠᱚ ᱵᱨᱟᱩᱡᱽ ᱢᱮ</string>
     <string name="edit_deck_description" comment="edit the deck description">ᱥᱟᱯᱲᱟᱣ ᱞᱤᱥᱴᱤ</string>
-    <string name="menu_add" comment="A generic add button. Please inform us if you need more specific strings" maxLength="28">ᱥᱮᱞᱮᱫ </string>
+    <string name="menu_add" comment="A generic add button. Please inform us if you need more specific strings" maxLength="28">ᱥᱮᱞᱮᱫ</string>
     <string name="menu_add_note" maxLength="28">ᱠᱷᱟᱴᱚ ᱵᱤᱪᱟᱹᱨ ᱥᱮᱞᱮᱫ ᱢᱮ</string>
     <string name="menu_my_account" comment="Label of the window in which the user should enter their account. This text can\'t be found in AnkiDroid directly.">ᱠᱷᱟᱛᱟ ᱟᱹᱭᱩᱨ ᱢᱤᱫ ᱢᱮ</string>
     <string name="menu_dismiss_note" maxLength="41">ᱩᱠᱩᱭ ᱢᱮ/ᱜᱫ ᱜᱤᱰᱤ</string>
@@ -112,7 +112,7 @@
     <string name="menu_disable_voice_playback">ᱥᱮᱨᱮᱧ ᱯᱷᱟᱭᱞᱟᱣ ᱵᱚᱫᱚᱞ</string>
     <string name="new_deck">ᱱᱟᱶᱟ ᱰᱮᱠ ᱛᱮᱭᱟᱨ ᱢᱮ</string>
     <string name="new_dynamic_deck">ᱯᱷᱤᱞᱴᱚᱨ ᱰᱮᱠ ᱛᱮᱭᱟᱨ ᱢᱮ</string>
-    <string name="directory_inaccessible">AnkiDroid ᱩᱱᱩᱫᱩᱜ ᱫᱚ ᱵᱟᱭ ᱦᱟᱛᱟᱣ ᱫᱟᱲᱮᱟᱜ ᱠᱟᱱᱟ </string>
+    <string name="directory_inaccessible">AnkiDroid ᱩᱱᱩᱫᱩᱜ ᱫᱚ ᱵᱟᱭ ᱦᱟᱛᱟᱣ ᱫᱟᱲᱮᱟᱜ ᱠᱟᱱᱟ</string>
     <!--This is shown when AnkiDroid starts up with no storage permissions.
     The user is taken to the "App Info" screen, and needs to click "Permissions" and
     grant AnkiDroid the \'Storage\' permission. This needs to be a fairly generic message as implementations
@@ -137,7 +137,7 @@
     <string name="cancel_sync_confirm" tools:ignore="UnusedResources">ᱟᱭᱩᱨ ᱢᱤᱫ ᱵᱟᱫᱽ ᱜᱤᱰᱤᱭᱟᱢ ᱥᱮ ?</string>
     <string name="continue_sync" tools:ignore="UnusedResources">ᱟᱭᱩᱨ ᱢᱤᱫ ᱪᱟᱹᱞᱩ ᱫᱚᱦᱚᱭ</string>
     <string name="sync_cancelled" tools:ignore="UnusedResources">ᱟᱭᱩᱨ ᱢᱤᱫ ᱵᱟᱫᱽ ᱜᱤᱰᱤ</string>
-    <string name="sync_cancel_message" tools:ignore="UnusedResources">ᱵᱟᱫ ᱜᱤᱰᱤᱼᱜ ᱠᱟᱱᱟ &#8230;\n ᱠᱤᱪᱷᱤ ᱥᱚᱢᱟᱭ ᱤᱫᱤ ᱫᱟᱲᱮᱭᱟᱜᱼᱟᱭ ᱾ </string>
+    <string name="sync_cancel_message" tools:ignore="UnusedResources">ᱵᱟᱫ ᱜᱤᱰᱤᱼᱜ ᱠᱟᱱᱟ &#8230;\n ᱠᱤᱪᱷᱤ ᱥᱚᱢᱟᱭ ᱤᱫᱤ ᱫᱟᱲᱮᱭᱟᱜᱼᱟᱭ ᱾</string>
     <string name="syncing_media">ᱥᱤᱸᱠᱨᱚᱱᱥ ᱢᱮᱰᱤᱭᱟ</string>
     <string name="export_deck" maxLength="28">ᱰᱮᱠ ᱵᱷᱮᱡᱟᱭ ᱢᱮ</string>
     <string name="export_collection">ᱴᱩᱢᱟᱹᱞ ᱵᱷᱮᱡᱟᱭ ᱢᱮ</string>
@@ -160,8 +160,8 @@
         <item quantity="one">\&quot;%2$s\&quot; ᱠᱟᱰ ᱯᱨᱚᱠᱟᱨ ᱟᱨ %1$d ᱠᱟᱰ ᱠᱚ ᱮᱢᱟᱱ ᱜᱮᱫ ᱜᱤᱰᱤ ᱟ ᱥᱮ?</item>
         <item quantity="other">\&quot;%2$s\&quot; ᱠᱟᱰ ᱯᱨᱚᱠᱟᱨ ᱟᱨ %1$d ᱠᱟᱰ ᱠᱚ ᱮᱢᱟᱱ ᱜᱮᱫ ᱜᱤᱰᱤ ᱟ ᱥᱮ?</item>
     </plurals>
-    <string name="card_template_editor_save_error">ᱠᱟᱰ ᱪᱷᱚᱸᱪ ᱵᱟᱭ ᱥᱚᱝᱪᱚᱭᱚᱜ ᱠᱟᱱᱟᱺ %s </string>
-    <string name="template_for_current_card_deleted">ᱱᱚᱶᱟ ᱠᱟᱰ ᱨᱮᱭᱟᱼᱜ ᱠᱟᱲ ᱯᱨᱚᱠᱟᱨ ᱜᱮᱫ ᱜᱤᱰᱤ ᱮᱱᱟ ᱾ </string>
+    <string name="card_template_editor_save_error">ᱠᱟᱰ ᱪᱷᱚᱸᱪ ᱵᱟᱭ ᱥᱚᱝᱪᱚᱭᱚᱜ ᱠᱟᱱᱟᱺ %s</string>
+    <string name="template_for_current_card_deleted">ᱱᱚᱶᱟ ᱠᱟᱰ ᱨᱮᱭᱟᱼᱜ ᱠᱟᱲ ᱯᱨᱚᱠᱟᱨ ᱜᱮᱫ ᱜᱤᱰᱤ ᱮᱱᱟ ᱾</string>
     <!-- Card Browser Appearance -->
     <string name="card_template_browser_appearance_title">ᱵᱨᱟᱩᱡᱚᱨ ᱧᱮᱞᱚᱜ ᱠᱚ</string>
     <!-- card Info -->
diff --git a/AnkiDroid/src/main/res/values-sat/02-strings.xml b/AnkiDroid/src/main/res/values-sat/02-strings.xml
index 3480004b6005..a1cb5ce5adda 100644
--- a/AnkiDroid/src/main/res/values-sat/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sat/02-strings.xml
@@ -46,34 +46,34 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Navigation drawer strings -->
     <string name="drawer_open">ᱰᱨᱚᱣᱟᱹᱨ ᱠᱷᱩᱞᱟᱹᱭ ᱢᱮ </string>
-    <string name="drawer_close">ᱰᱨᱚᱣᱟᱹᱨ ᱵᱚᱸᱫᱚᱭ ᱢᱮ </string>
+    <string name="drawer_close">ᱰᱨᱚᱣᱟᱹᱨ ᱵᱚᱸᱫᱚᱭ ᱢᱮ</string>
     <string name="CardEditorCardDeck">ᱠᱟᱰ ᱰᱮᱠᱺ </string>
     <string name="CardEditorNoteDeck">ᱰᱮᱠᱺ </string>
     <string name="CardEditorModel">ᱯᱨᱚᱠᱟᱨᱺ </string>
-    <string name="CardEditorTags">ᱴᱮᱜᱥᱺ%1$s </string>
-    <string name="CardEditorCards">ᱠᱟᱰᱺ%1$s </string>
+    <string name="CardEditorTags">ᱴᱮᱜᱥᱺ%1$s</string>
+    <string name="CardEditorCards">ᱠᱟᱰᱺ%1$s</string>
     <string name="edit_occlusions">ᱚᱠᱥᱩᱞᱤᱥᱚᱱ ᱥᱟᱯᱲᱟᱣ ᱢᱮ</string>
-    <string name="tag_name">ᱴᱮᱜ ᱧᱩᱛᱩᱢ </string>
-    <string name="add_new_filter_tags">ᱥᱮᱞᱮᱫ/ᱴᱮᱜ ᱯᱷᱤᱞᱴᱚᱨ </string>
-    <string name="add_tag" maxLength="28">ᱴᱮᱜ ᱥᱮᱞᱮᱫ ᱢᱮ </string>
-    <string name="check_all_tags" maxLength="28">ᱪᱮᱠ ᱢᱮ/ᱡᱷᱚᱛᱟ ᱴᱮᱜ uncheck ᱢᱮ </string>
-    <string name="filter_tags" maxLength="28">ᱴᱮᱜ ᱯᱷᱤᱞᱴᱚᱨ ᱢᱮ </string>
-    <string name="no_tags">ᱟᱢ ᱴᱮᱜ ᱵᱟᱝ ᱥᱮᱞᱮᱫ ᱠᱟᱜᱼᱟᱢ </string>
-    <string name="updated_version">%s ᱵᱷᱟᱹᱨᱥᱚᱱ ᱛᱮ ᱟᱹᱯᱰᱮᱴ ᱮᱱᱟ  </string>
+    <string name="tag_name">ᱴᱮᱜ ᱧᱩᱛᱩᱢ</string>
+    <string name="add_new_filter_tags">ᱥᱮᱞᱮᱫ/ᱴᱮᱜ ᱯᱷᱤᱞᱴᱚᱨ</string>
+    <string name="add_tag" maxLength="28">ᱴᱮᱜ ᱥᱮᱞᱮᱫ ᱢᱮ</string>
+    <string name="check_all_tags" maxLength="28">ᱪᱮᱠ ᱢᱮ/ᱡᱷᱚᱛᱟ ᱴᱮᱜ uncheck ᱢᱮ</string>
+    <string name="filter_tags" maxLength="28">ᱴᱮᱜ ᱯᱷᱤᱞᱴᱚᱨ ᱢᱮ</string>
+    <string name="no_tags">ᱟᱢ ᱴᱮᱜ ᱵᱟᱝ ᱥᱮᱞᱮᱫ ᱠᱟᱜᱼᱟᱢ</string>
+    <string name="updated_version">%s ᱵᱷᱟᱹᱨᱥᱚᱱ ᱛᱮ ᱟᱹᱯᱰᱮᱴ ᱮᱱᱟ</string>
     <!-- Reviewer.kt -->
-    <string name="save_whiteboard" maxLength="28">ᱯᱩᱸᱰ ᱵᱚᱰ ᱥᱟᱱᱪᱟᱣ ᱢᱮ </string>
+    <string name="save_whiteboard" maxLength="28">ᱯᱩᱸᱰ ᱵᱚᱰ ᱥᱟᱱᱪᱟᱣ ᱢᱮ</string>
     <string name="enable_stylus" maxLength="28">ᱥᱴᱟᱭᱞᱩᱥ ᱚᱞᱚᱜ ᱮᱱᱮᱡ ᱢᱮ</string>
     <string name="disable_stylus">ᱥᱴᱟᱭᱞᱩᱥ ᱚᱞᱚᱜ ᱵᱚᱫᱚᱞ ᱢᱮ</string>
     <string name="enable_whiteboard" maxLength="28">ᱥᱤᱠᱮᱴ ᱞᱟᱜᱩᱭ ᱢᱮ </string>
-    <string name="disable_whiteboard">ᱥᱤᱠᱮᱴ ᱵᱚᱱᱫ ᱢᱮ </string>
-    <string name="show_whiteboard">ᱥᱤᱠᱮᱴ ᱫᱮᱠᱷᱟᱣ ᱢᱮ </string>
-    <string name="hide_whiteboard" maxLength="28">ᱥᱤᱠᱮᱴ ᱩᱠᱩᱭ ᱢᱮ </string>
-    <string name="clear_whiteboard" maxLength="28">ᱥᱤᱠᱮᱴ ᱤᱬᱤᱡ ᱢᱮ </string>
-    <string name="replay_audio" maxLength="28">Audio replay ᱢᱮ </string>
+    <string name="disable_whiteboard">ᱥᱤᱠᱮᱴ ᱵᱚᱱᱫ ᱢᱮ</string>
+    <string name="show_whiteboard">ᱥᱤᱠᱮᱴ ᱫᱮᱠᱷᱟᱣ ᱢᱮ</string>
+    <string name="hide_whiteboard" maxLength="28">ᱥᱤᱠᱮᱴ ᱩᱠᱩᱭ ᱢᱮ</string>
+    <string name="clear_whiteboard" maxLength="28">ᱥᱤᱠᱮᱴ ᱤᱬᱤᱡ ᱢᱮ</string>
+    <string name="replay_audio" maxLength="28">Audio replay ᱢᱮ</string>
     <string name="leech_suspend_notification">ᱠᱟᱰ ᱫᱚ leech ᱟᱨ ᱵᱚᱸᱫ ᱛᱮ ᱢᱟᱨᱠ ᱮᱱᱟ</string>
-    <string name="leech_notification">ᱠᱟᱰ ᱫᱚ leech ᱛᱮ ᱢᱟᱨᱠ ᱮᱱᱟ </string>
-    <string name="webview_crash_unknown">ᱵᱟᱝᱵᱟᱰᱟᱭᱟᱜ ᱵᱷᱩᱞ </string>
-    <string name="webview_crash_unknwon_detailed">ᱱᱚᱶᱟ ᱫᱚ WebView ᱨᱮ ᱵᱷᱤᱛᱨᱤ ᱵᱷᱩᱞ ᱠᱷᱟᱛᱤᱨ ᱛᱮ </string>
+    <string name="leech_notification">ᱠᱟᱰ ᱫᱚ leech ᱛᱮ ᱢᱟᱨᱠ ᱮᱱᱟ</string>
+    <string name="webview_crash_unknown">ᱵᱟᱝᱵᱟᱰᱟᱭᱟᱜ ᱵᱷᱩᱞ</string>
+    <string name="webview_crash_unknwon_detailed">ᱱᱚᱶᱟ ᱫᱚ WebView ᱨᱮ ᱤᱱᱴᱚᱨᱱᱟᱞ ᱵᱷᱩᱞ ᱠᱷᱟᱛᱤᱨ ᱛᱮ </string>
     <string name="webview_crash_oom">Out of Memory</string>
     <string name="webview_crash_oom_details">ᱥᱤᱥᱴᱚᱢ ᱫᱚ Webview ᱵᱚᱸᱫ ᱠᱮᱜᱼᱟᱭ ᱾ ᱱᱚᱶᱟ ᱫᱚ ᱡᱟᱹᱥᱛᱤ ᱢᱟᱨᱟᱝ ᱯᱷᱚᱱᱴᱥ ᱟᱨ ᱢᱤᱰᱭᱟ  ᱠᱷᱟᱹᱛᱤᱨ ᱟᱣᱩᱴ ᱚᱯᱷ ᱢᱮᱢᱚᱨᱤ ᱫᱮᱠᱷᱟᱣ ᱮᱫ ᱟᱭ ᱾</string>
     <string name="webview_crash_nonfatal">WebView ᱨᱮᱱᱰᱚᱨᱚᱨ ᱠᱨᱟᱥ ᱮᱱᱟ ᱾ ᱠᱟᱨᱚᱬ:%s</string>
@@ -95,7 +95,7 @@
     <string name="note_editor_no_cards_created">ᱚᱠᱟ ᱠᱟᱰ ᱦᱚᱸ ᱵᱟᱭ ᱛᱮᱟᱛ ᱟᱠᱟᱱᱟ ᱾ ᱫᱚᱭᱟᱡᱟᱜᱮ ᱟᱨᱦᱚᱸ ᱡᱟᱭᱜᱟ ᱯᱩᱨᱚᱬ ᱢᱮ</string>
     <string name="note_editor_no_cards_created_all_fields">ᱱᱚᱶᱟ ᱠᱷᱟᱴᱚ ᱵᱤᱪᱟᱹᱨ ᱯᱨᱚᱠᱟᱨ ᱠᱟᱰ ᱵᱟᱭ ᱛᱮᱭᱟᱨᱮᱟᱭ ᱾ \n ᱫᱚᱭᱠᱟᱛᱮ ᱱᱟᱶᱟ ᱠᱷᱟᱴᱚ ᱵᱤᱪᱟᱹᱨ ᱯᱨᱚᱠᱟᱨ ᱨᱮᱭᱟᱜ ᱵᱟᱪᱷᱟᱣ ᱢᱮ, ᱟᱨ ᱵᱟᱝᱠᱷᱟᱱ \'ᱠᱟᱨᱰᱥ\' ᱨᱮ ᱚᱛᱟ ᱡᱟ ᱟᱨ field substitute ᱥᱮᱞᱮᱫ ᱢᱮ</string>
     <string name="note_editor_insert_cloze_no_cloze_note_type">ᱠᱞᱚᱡ ᱢᱮᱴᱟᱹᱣ ᱫᱚ ᱠᱞᱚᱡ ᱱᱚᱴ ᱯᱨᱚᱠᱟᱨ ᱴᱷᱮᱱ ᱮ ᱠᱟᱹᱢᱤ ᱟ</string>
-    <string name="saving_facts">ᱠᱷᱟᱴᱚ ᱵᱤᱪᱟᱹᱨ ᱥᱚᱱᱪᱟᱣ ᱢᱮ </string>
+    <string name="saving_facts">ᱠᱷᱟᱴᱚ ᱵᱤᱪᱟᱹᱨ ᱥᱚᱱᱪᱟᱣ ᱢᱮ</string>
     <string name="saving_model">ᱠᱷᱟᱴᱚ ᱵᱤᱪᱟᱹᱨ ᱯᱨᱚᱠᱟᱨ ᱥᱟᱱᱪᱟᱣ ᱢᱮ</string>
     <string name="save" maxLength="28">ᱥᱟᱝᱪᱚᱣ</string>
     <string name="close">ᱵᱚᱫᱽ</string>
@@ -121,7 +121,7 @@
     <string name="card_editor_reschedule_card" comment="Action to reschedule a card" maxLength="28">ᱨᱤᱥᱮᱰᱭᱩᱞ ᱢᱮ</string>
     <string name="card_editor_preview_card" comment="Button offering to preview some card(s)" maxLength="28">ᱞᱟᱦᱟᱛᱮᱭᱟᱜ ᱧᱮᱞ</string>
     <string name="copy_as_markdown" comment="Copies text to the clipboard as Markdown" maxLength="28">ᱪᱮᱫ ᱞᱮᱠᱟᱱ ᱱᱳᱴ ᱠᱚ ᱧᱟᱢ ᱟᱠᱟᱱᱟ</string>
-    <string name="preview_progress_bar_text" comment="What card we are on out of how many in card previewer progress bar"> %2$d ᱨᱮᱱᱟᱜ %1$d</string>
+    <string name="preview_progress_bar_text" comment="What card we are on out of how many in card previewer progress bar">%2$d ᱨᱮᱱᱟᱜ %1$d</string>
     <string name="rename" comment="Confirm that the renaming action should be processed." maxLength="28">ᱫᱚᱦᱲᱟ ᱧᱩᱛᱩᱢ</string>
     <string name="checks_action" maxLength="28">ᱪᱟᱠᱷᱟ</string>
     <string name="check_db" maxLength="28">ᱰᱟᱴᱟᱵᱮᱥ ᱪᱮᱠ ᱢᱮ</string>
@@ -159,13 +159,13 @@
         ]]></string>
     <string name="export_choice_share">ᱦᱟᱹᱴᱤᱧ</string>
     <string name="export_choice_save_to">ᱞᱟᱹᱜᱤᱫ ᱫᱚᱦᱚᱭ ᱢᱮ</string>
-    <string name="export_saving_exported_collection"> ᱮᱠᱥᱯᱳᱨᱴ ᱟᱠᱟᱱ ᱯᱷᱤᱞᱤ ᱥᱟᱦᱟᱣ ᱠᱟᱱᱟ&#8230;</string>
+    <string name="export_saving_exported_collection">ᱮᱠᱥᱯᱳᱨᱴ ᱟᱠᱟᱱ ᱯᱷᱤᱞᱤ ᱥᱟᱦᱟᱣ ᱠᱟᱱᱟ&#8230;</string>
     <string name="study_options" comment="Name for a preference category in Filtered deck (aka Cram deck, aka Custom study) options" maxLength="28">ᱚᱯᱥᱚᱱᱠᱚ</string>
     <string name="menu__deck_options" maxLength="28">ᱰᱮᱠ ᱚᱯᱥᱚᱱᱠᱚ</string>
     <string name="menu__study_options" comment="Menu item that opens options for a Filtered deck (aka Cram deck, aka Custom study)">ᱯᱟᱲᱦᱟᱣ ᱚᱯᱥᱚᱱ ᱠᱚ</string>
     <string name="select_tts" maxLength="28">TTS ᱯᱟᱹᱨᱥᱤ ᱥᱮᱴ ᱢᱮ</string>
     <string name="custom_study" maxLength="28">ᱱᱤᱡᱮᱛᱮ ᱯᱟᱲᱦᱟᱣ</string>
-    <string name="dyn_deck_desc">ᱱᱚᱶᱟ ᱫᱚ ᱱᱚᱨᱢᱟᱞ ᱥᱮᱰᱭᱩᱞ ᱠᱷᱣᱱ ᱮᱴᱟᱜ ᱨᱮ ᱯᱟᱲᱦᱟᱣ ᱞᱟᱹᱜᱤᱫ ᱥᱯᱮᱥᱟᱞ ᱰᱮᱠ ᱠᱟᱱᱟ ᱾ ᱠᱟᱰ ᱠᱚ ᱨᱤᱵᱷᱤᱣ ᱯᱚᱨᱮ ᱟᱡ ᱛᱮᱜᱮ ᱢᱩᱞ ᱰᱮᱢᱠ ᱥᱮᱱ ᱥᱮᱱᱚᱜᱼᱟ ᱾ ᱰᱮᱠ ᱞᱤᱥᱴ ᱠᱷᱚᱱ ᱰᱮᱠᱜᱮᱫ ᱜᱤᱰᱤ ᱞᱮᱠᱷᱱᱟ ᱫᱚ ᱡᱷᱚᱛᱚ ᱠᱟᱲ ᱢᱩᱞ ᱰᱮᱠ ᱥᱮᱱ ᱥᱮᱱᱚᱜᱼᱟ  </string>
+    <string name="dyn_deck_desc">ᱱᱚᱶᱟ ᱫᱚ ᱱᱚᱨᱢᱟᱞ ᱥᱮᱰᱭᱩᱞ ᱠᱷᱣᱱ ᱮᱴᱟᱜ ᱨᱮ ᱯᱟᱲᱦᱟᱣ ᱞᱟᱹᱜᱤᱫ ᱥᱯᱮᱥᱟᱞ ᱰᱮᱠ ᱠᱟᱱᱟ ᱾ ᱠᱟᱰ ᱠᱚ ᱨᱤᱵᱷᱤᱣ ᱯᱚᱨᱮ ᱟᱡ ᱛᱮᱜᱮ ᱢᱩᱞ ᱰᱮᱢᱠ ᱥᱮᱱ ᱥᱮᱱᱚᱜᱼᱟ ᱾ ᱰᱮᱠ ᱞᱤᱥᱴ ᱠᱷᱚᱱ ᱰᱮᱠᱜᱮᱫ ᱜᱤᱰᱤ ᱞᱮᱠᱷᱱᱟ ᱫᱚ ᱡᱷᱚᱛᱚ ᱠᱟᱲ ᱢᱩᱞ ᱰᱮᱠ ᱥᱮᱱ ᱥᱮᱱᱚᱜᱼᱟ</string>
     <string name="steps_error">ᱥᱴᱮᱯᱥ ᱫᱚ ᱥᱩᱱᱭᱚ ᱱᱩᱚᱢᱵᱚᱨ ᱠᱷᱚᱱ ᱰᱷᱮᱨ ᱜᱮ ᱛᱟᱦᱮᱱ ᱢᱟ</string>
     <string name="steps_min_error">ᱠᱚᱢ ᱥᱮ ᱠᱚᱢ ᱢᱤᱫᱴᱟᱝ ᱥᱴᱮᱯ ᱫᱚᱨᱠᱟᱨ</string>
     <string name="tag_editor_add_feedback">“%1$s” ᱥᱞᱮᱫ ᱞᱟᱹᱜᱤᱫ ᱛᱮ “%2$s” ᱚᱛᱟᱭᱯᱮ</string>
@@ -193,7 +193,7 @@
     <string name="restore_default" maxLength="28">ᱢᱩᱞ ᱯᱷᱮᱰᱟᱛ ᱨᱮ ᱫᱚᱦᱰᱟ ᱡᱚᱜᱟᱣ</string>
     <string name="reviewer_tts_cloze_spoken_replacement">ᱮᱠᱷᱮᱵᱟᱜ</string>
     <!-- Whiteboard save image message in Reviewer -->
-    <string name="white_board_image_save_failed">ᱯᱩᱸᱰ ᱵᱚᱰ ᱪᱤᱛᱟᱹᱨ ᱥᱟᱱᱪᱟᱣ ᱵᱷᱩᱞ ᱾. %s </string>
+    <string name="white_board_image_save_failed">ᱯᱩᱸᱰ ᱵᱚᱰ ᱪᱤᱛᱟᱹᱨ ᱥᱟᱱᱪᱟᱣ ᱵᱷᱩᱞ ᱾. %s</string>
     <string name="white_board_image_saved">ᱯᱩᱸᱰ ᱵᱚᱰ ᱪᱤᱛᱟᱹᱨ %s ᱛᱮ ᱥᱟᱱᱪᱟᱣ</string>
     <string name="title_whiteboard_editor" maxLength="28">ᱯᱩᱸᱰᱵᱚᱰ ᱮᱰᱤᱴᱚᱨ</string>
     <string name="user_is_a_robot">ᱟᱹᱴᱚᱢᱮᱴᱮᱰ ᱴᱮᱥᱴ ᱯᱟᱱᱛᱮ ᱚᱲᱚᱠ ᱾ ᱡᱩᱫᱤ ᱟᱢ ᱦᱚᱲ ᱠᱟᱱᱟᱢ AnkiDroid ᱥᱚᱢᱯᱚᱨᱠ ᱠᱚᱢ</string>
diff --git a/AnkiDroid/src/main/res/values-sat/03-dialogs.xml b/AnkiDroid/src/main/res/values-sat/03-dialogs.xml
index ce68b82b3ae1..9e405972f8f0 100644
--- a/AnkiDroid/src/main/res/values-sat/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sat/03-dialogs.xml
@@ -62,7 +62,7 @@
         <item quantity="other">%d ᱠᱟᱰ ᱨᱤᱥᱮᱴ</item>
     </plurals>
     <string name="answering_error_title">ᱥᱟᱹᱠᱷᱭᱟᱛ ᱵᱟᱹᱭᱥᱟᱣ ᱵᱷᱩᱞ ᱦᱩᱭᱮᱱᱟ</string>
-    <string name="answering_error_message">ᱴᱩᱢᱟᱹᱞ ᱛᱮ ᱚᱞ ᱵᱷᱩᱞ ᱾ database ᱫᱚ ᱠᱦᱟᱨᱟᱯ ᱜᱮᱭᱟ ᱟᱨ ᱵᱟᱝᱠᱷᱟᱱ ᱰᱤᱥᱠ ᱨᱮ ᱥᱯᱮᱥ ᱵᱟᱱᱩᱜᱟ ᱾ \n\nᱡᱚᱫᱤ ᱵᱟᱨᱚᱢᱵᱟᱨ ᱱᱚᱠᱟ ᱦᱩᱭᱩᱜ ᱠᱟᱱᱟ, ᱮᱱᱰᱮᱠᱷᱟᱱ ᱟᱨ ᱢᱤᱫ ᱡᱮᱠᱷᱟ ᱰᱟᱴᱟᱵᱮᱥ ᱪᱮᱠ ᱯᱮ ᱟᱨ ᱵᱟᱝᱠᱷᱟᱱ backup ᱠᱷᱚᱱ ᱰᱟᱴᱟ restore ᱛᱟᱵᱚᱱ ᱯᱮ ᱾ ᱚᱱᱟ ᱞᱟᱹᱜᱤᱫ \&quot;options\&quot; ᱨᱮ ᱚᱛᱟᱭ ᱯᱮ ᱾\n\ᱟᱨ ᱵᱟᱝᱠᱷᱟᱱ ᱱᱚᱟ ᱫᱚ bug ᱦᱩᱭ ᱫᱟᱲᱮᱭᱟᱜᱟ; ᱫᱚᱭᱟᱠᱟᱛᱮ report ᱯᱮ ᱾ </string>
+    <string name="answering_error_message">ᱴᱩᱢᱟᱹᱞ ᱛᱮ ᱚᱞ ᱵᱷᱩᱞ ᱾ database ᱫᱚ ᱠᱦᱟᱨᱟᱯ ᱜᱮᱭᱟ ᱟᱨ ᱵᱟᱝᱠᱷᱟᱱ ᱰᱤᱥᱠ ᱨᱮ ᱥᱯᱮᱥ ᱵᱟᱱᱩᱜᱟ ᱾ \n\nᱡᱚᱫᱤ ᱵᱟᱨᱚᱢᱵᱟᱨ ᱱᱚᱠᱟ ᱦᱩᱭᱩᱜ ᱠᱟᱱᱟ, ᱮᱱᱰᱮᱠᱷᱟᱱ ᱟᱨ ᱢᱤᱫ ᱡᱮᱠᱷᱟ ᱰᱟᱴᱟᱵᱮᱥ ᱪᱮᱠ ᱯᱮ ᱟᱨ ᱵᱟᱝᱠᱷᱟᱱ backup ᱠᱷᱚᱱ ᱰᱟᱴᱟ restore ᱛᱟᱵᱚᱱ ᱯᱮ ᱾ ᱚᱱᱟ ᱞᱟᱹᱜᱤᱫ \&quot;options\&quot; ᱨᱮ ᱚᱛᱟᱭ ᱯᱮ ᱾\n\ᱟᱨ ᱵᱟᱝᱠᱷᱟᱱ ᱱᱚᱟ ᱫᱚ bug ᱦᱩᱭ ᱫᱟᱲᱮᱭᱟᱜᱟ; ᱫᱚᱭᱟᱠᱟᱛᱮ report ᱯᱮ ᱾</string>
     <string name="answering_error_report">ᱦᱩᱰᱟᱜ ᱥᱚᱱᱫᱮᱥ</string>
     <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
     <string name="repair_deck_dialog">ᱟᱢ ᱫᱚ ᱱᱚᱶᱟ database ᱥᱟᱡᱟᱣ ᱥᱮᱱᱟᱢ ᱠᱟᱱᱟ ᱥᱮ ? \n\nᱮᱛᱷᱚᱵ ᱢᱟᱲᱟᱝ ᱨᱮ, ᱢᱤᱫᱴᱟᱝ ᱠᱚᱯᱤ \&quot;%s\&quot; ᱥᱚᱵᱼᱯᱷᱚᱞᱰᱟᱨ ᱨᱮ ᱛᱮᱭᱨᱚᱜᱽᱟ ᱱᱟᱦ ᱾</string>
@@ -115,7 +115,7 @@
         <item quantity="other">%d ᱨᱮᱫ ᱠᱚ ᱜᱮᱫ ᱜᱤᱰᱤ ᱮᱱᱟ</item>
     </plurals>
     <!-- Tags Dialog Options -->
-    <string name="tags_dialog_option_all_cards">ᱡᱷᱚᱛᱚ ᱠᱟᱰ ᱠᱚ </string>
+    <string name="tags_dialog_option_all_cards">ᱡᱷᱚᱛᱚ ᱠᱟᱰ ᱠᱚ</string>
     <string name="tags_dialog_option_new_cards">ᱱᱟᱶᱟ</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">ᱮᱢᱚᱜ ᱥᱚᱢᱚᱭ</string>
     <!-- Empty cards -->
diff --git a/AnkiDroid/src/main/res/values-sat/04-network.xml b/AnkiDroid/src/main/res/values-sat/04-network.xml
index 254ce16781ee..d19f9292de56 100644
--- a/AnkiDroid/src/main/res/values-sat/04-network.xml
+++ b/AnkiDroid/src/main/res/values-sat/04-network.xml
@@ -46,13 +46,13 @@
 -->
 <resources>
     <string name="youre_offline">ᱟᱢ ᱫᱚ ᱚᱯᱷᱞᱟᱭᱤᱱ ᱨᱮ</string>
-    <string name="sync_error">ᱟᱹᱭᱩᱨ ᱢᱤᱫ ᱵᱷᱩᱞ </string>
+    <string name="sync_error">ᱟᱹᱭᱩᱨ ᱢᱤᱫ ᱵᱷᱩᱞ</string>
     <string name="vague_error" comment="Network error dialog title">ᱵᱷᱩᱞ</string>
-    <string name="retry">ᱫᱼᱪᱮᱥᱴᱟ </string>
-    <string name="menu_get_shared_decks">ᱥᱟᱡᱟᱣᱟ ᱠᱟᱱ ᱰᱮᱠ ᱠᱚ ᱧᱟᱢ ᱢᱮ </string>
+    <string name="retry">ᱫᱼᱪᱮᱥᱴᱟ</string>
+    <string name="menu_get_shared_decks">ᱥᱟᱡᱟᱣᱟ ᱠᱟᱱ ᱰᱮᱠ ᱠᱚ ᱧᱟᱢ ᱢᱮ</string>
     <string name="connection_error_message">ᱱᱮᱴᱣᱟᱨᱠ ᱦᱩᱰᱟᱹᱜ ᱦᱩᱭ ᱮᱱᱟ</string>
     <string name="not_logged_in_title">AnkiWeb ᱛᱮ ᱵᱷᱤᱛᱤᱨ ᱵᱚᱞᱚ</string>
-    <string name="login_create_account_message">cloud ᱟᱹᱭᱩᱨ ᱢᱤᱫ ᱠᱟᱹᱢᱤ ᱨᱮ ᱵᱷᱤᱛᱤᱨ ᱵᱚᱞᱚ ᱞᱟᱹᱜᱤᱫ third party ᱠᱷᱟᱛᱟ ᱫᱚᱨᱠᱟᱨ ᱾ ᱱᱟᱶᱟ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱤᱱᱟ ᱛᱟᱭᱚᱢ ᱡᱷᱟᱸᱯ ᱠᱚ ᱧᱮᱞ ᱢᱮ ᱾ </string>
+    <string name="login_create_account_message">cloud ᱟᱹᱭᱩᱨ ᱢᱤᱫ ᱠᱟᱹᱢᱤ ᱨᱮ ᱵᱷᱤᱛᱤᱨ ᱵᱚᱞᱚ ᱞᱟᱹᱜᱤᱫ third party ᱠᱷᱟᱛᱟ ᱫᱚᱨᱠᱟᱨ ᱾ ᱱᱟᱶᱟ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱤᱱᱟ ᱛᱟᱭᱚᱢ ᱡᱷᱟᱸᱯ ᱠᱚ ᱧᱮᱞ ᱢᱮ ᱾</string>
     <!-- MyAccount.kt -->
     <string name="username">ᱤ-ᱢᱮᱞ ᱴᱷᱤᱠᱟᱹᱱᱟ</string>
     <string name="password">ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ</string>
@@ -60,7 +60,7 @@
     <string name="sign_up_description">AnkiWeb ᱠᱷᱟᱛᱟ ᱵᱟᱹᱱᱩᱜ ᱟ ? ᱱᱚᱶᱟ ᱫᱚ  ᱥᱟᱹᱫᱷᱤᱱ ᱜᱮᱭᱟ!</string>
     <string name="sign_up_not_affiliated">ᱠᱷᱟᱴᱚ ᱵᱤᱪᱟᱹᱨ ᱢᱮ: AnkiWeb ᱟᱜ AnkiDroid ᱥᱟᱞᱟᱜ ᱪᱮᱫ ᱥᱚᱢᱯᱚᱨᱠᱚ ᱵᱟᱹᱱᱩᱜᱽᱟ</string>
     <string name="sign_up">ᱧᱩᱛᱩᱢ ᱚᱞ</string>
-    <string name="logged_as">ᱞᱮᱠᱷᱟ ᱵᱚᱞᱚᱣᱟᱠ </string>
+    <string name="logged_as">ᱞᱮᱠᱷᱟ ᱵᱚᱞᱚᱣᱟᱠ</string>
     <string name="log_out">ᱵᱟᱦᱨᱮ ᱚᱰᱚᱠ</string>
     <string name="reset_password">ᱫᱚᱦᱲᱟ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ</string>
     <string name="lost_mail_instructions">ᱤᱼᱢᱮᱞ ᱦᱤᱲᱤᱧᱮᱱᱟ ᱥᱮ?</string>
diff --git a/AnkiDroid/src/main/res/values-sat/09-backup.xml b/AnkiDroid/src/main/res/values-sat/09-backup.xml
index e47cc77e5be5..5a70466d5760 100644
--- a/AnkiDroid/src/main/res/values-sat/09-backup.xml
+++ b/AnkiDroid/src/main/res/values-sat/09-backup.xml
@@ -46,7 +46,7 @@
 <resources>
     <string name="backup_deck_no_storage_left">ᱥᱚᱯᱷᱴᱣᱮᱭᱟᱨ ᱫᱚ ᱵᱟᱝ ᱥᱟᱦᱟᱣ ᱟᱠᱟᱱᱟ. ᱟᱢᱟᱜ ᱥᱴᱳᱨᱮᱡ ᱨᱮ ᱥᱯᱮᱥᱮᱡᱽ ᱵᱟᱹᱱᱩᱜᱼᱟ᱾ ᱵᱮᱠᱟᱨᱯᱷ ᱰᱤᱯᱷᱤᱰ ᱠᱚᱢ ᱢᱮ ᱟᱨᱵᱟᱝ ᱮᱴᱟᱜ ᱯᱷᱟᱤᱞ ᱠᱚ ᱵᱚᱫᱚᱞ ᱢᱮ.</string>
     <string name="storage_warning">Less than %d MB space on your storage left.\nFree some space to avoid data loss.</string>
-    <string name="backup_restore" maxLength="28">ᱱᱚᱠᱚᱞ-ᱡᱚ ᱫᱚᱦᱰᱟ ᱡᱚᱜᱟᱣ </string>
+    <string name="backup_restore" maxLength="28">ᱱᱚᱠᱚᱞ-ᱡᱚ ᱫᱚᱦᱰᱟ ᱡᱚᱜᱟᱣ</string>
     <string name="backup_new_collection">ᱱᱟᱶᱟ ᱴᱩᱢᱟᱹᱞ</string>
     <string name="backup_del_collection">ᱴᱩᱢᱟᱹᱞ ᱜᱮᱫ ᱜᱤᱲᱤ ᱢᱮ ᱟᱨ ᱱᱟᱶᱟ ᱛᱮᱭᱟᱨ ᱢᱮ</string>
     <string name="backup_del_collection_question">ᱴᱩᱢᱟᱹᱞ ᱜᱮᱫ ᱜᱤᱲᱤ ᱢᱮ ᱟᱨ ᱱᱟᱶᱟ ᱛᱮᱭᱟᱨ ᱢᱮ? ᱱᱚᱶᱟ ᱟᱢᱟᱜ ᱪᱮᱫᱚᱜ ᱴᱷᱚᱞᱨᱟᱣᱟᱭ, ᱡᱷᱚᱛᱚ ᱠᱟᱰ ᱢᱮᱴᱟᱣᱼᱜ ᱛᱟᱢᱟ ᱾ ᱾</string>
diff --git a/AnkiDroid/src/main/res/values-sat/10-preferences.xml b/AnkiDroid/src/main/res/values-sat/10-preferences.xml
index 91ad5bbf9ea3..6dcd46751e9d 100644
--- a/AnkiDroid/src/main/res/values-sat/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sat/10-preferences.xml
@@ -61,7 +61,7 @@
     <string name="pref_cat_sync" comment="title of the sync preferences category" maxLength="41">ᱟᱭᱩᱨ ᱢᱤᱫ</string>
     <string name="pref_cat_scheduling" maxLength="41">ᱡᱚᱡᱚᱱᱟ</string>
     <string name="pref_cat_whiteboard" maxLength="41">ᱯᱩᱸᱰᱯᱟᱴᱟ</string>
-    <string name="pref_cat_appearance" maxLength="41">ᱧᱮᱞᱚᱜ ᱠᱚ </string>
+    <string name="pref_cat_appearance" maxLength="41">ᱧᱮᱞᱚᱜ ᱠᱚ</string>
     <string name="pref_cat_themes" maxLength="41">ᱛᱷᱤᱢᱥ</string>
     <string name="pref_cat_gestures" maxLength="41">ᱪᱤᱱᱦᱟᱹ</string>
     <string name="pref_cat_controls" maxLength="41">ᱠᱳᱸᱴᱨᱳᱞ</string>
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">ᱞᱟᱛᱟᱨ ᱞᱮᱸᱜᱟ ᱯᱟᱦᱴᱟ ᱨᱮ ᱚᱛᱟᱭ ᱢᱮ</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">ᱞᱟᱛᱟᱨ ᱡᱟᱡᱚᱢ ᱛᱤ ᱯᱟᱦᱴᱟ ᱚᱛᱟᱭ ᱢᱮ</string>
     <string name="gestures_shake" maxLength="41">ᱥᱤᱠᱷᱱᱟᱹᱛ ᱚᱱᱚᱞ</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ ᱢᱚᱱᱩ</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ ᱢᱚᱱᱩ</string>
     <string name="card_browser_enable_external_context_menu_summary">ᱠᱚᱱᱴᱮᱠᱥᱴ ᱢᱮᱱᱩ ᱠᱡᱟᱜᱟᱛ ᱨᱮ ‘%s’ ᱦᱩᱭ ᱦᱚᱪᱚ</string>
     <string name="double_scrolling_gap" maxLength="41">ᱫᱚᱦᱲᱟ ᱥᱠᱨᱚᱞ</string>
     <string name="double_scrolling_gap_summ">ᱤᱼᱨᱤᱰᱚᱨ ᱮᱨ ᱥᱠᱨᱚᱞ ᱜᱮᱯ ᱫᱚᱦᱲᱟᱭ ᱢᱮ</string>
@@ -162,7 +162,7 @@
     <string name="vertical_centering" maxLength="41">ᱛᱟᱞᱟ ᱥᱟᱡᱟᱣ</string>
     <string name="vertical_centering_summ">ᱠᱟᱰ ᱨᱮᱭᱟᱜ ᱡᱤᱱᱤᱥ ᱠᱚ ᱛᱟᱞᱟ ᱨᱮ ᱥᱤᱫᱷᱟ ᱛᱮ ᱟᱹᱜᱩᱭᱢᱮ</string>
     <string name="pref_double_tap_time_interval" maxLength="41">ᱵᱟᱨᱫᱷᱟᱣ ᱞᱭᱟᱯ ᱚᱠᱛᱚ ᱤᱱᱴᱟᱹᱨᱵᱷᱟᱞ (ᱢᱤᱞᱤᱥᱮᱠᱮᱰ)</string>
-    <string name="pref_double_tap_time_interval_summary">ᱡᱩᱫᱤ ᱱᱤᱛᱚᱜ ᱵᱟᱝ ᱦᱩᱭᱟᱹᱠᱟᱱᱟ ᱮᱱᱠᱷᱟᱱ ᱞᱟᱹᱱᱟᱹᱭ ᱵᱚᱴᱚᱱ ᱨᱮᱭᱟᱜ ᱫᱚᱥᱟᱨ ᱴᱭᱟᱯ ᱵᱟᱝ ᱛᱩᱸᱠᱷᱤᱜ-ᱟ । ᱱᱚᱣᱟ ᱦᱩᱯᱠᱟᱹ ᱰᱚᱵᱚᱞ ᱴᱭᱟᱯ ᱴᱷᱟᱠᱮᱫ ᱚᱪᱚᱭᱟ </string>
+    <string name="pref_double_tap_time_interval_summary">ᱡᱩᱫᱤ ᱱᱤᱛᱚᱜ ᱵᱟᱝ ᱦᱩᱭᱟᱹᱠᱟᱱᱟ ᱮᱱᱠᱷᱟᱱ ᱞᱟᱹᱱᱟᱹᱭ ᱵᱚᱴᱚᱱ ᱨᱮᱭᱟᱜ ᱫᱚᱥᱟᱨ ᱴᱭᱟᱯ ᱵᱟᱝ ᱛᱩᱸᱠᱷᱤᱜ-ᱟ । ᱱᱚᱣᱟ ᱦᱩᱯᱠᱟᱹ ᱰᱚᱵᱚᱞ ᱴᱭᱟᱯ ᱴᱷᱟᱠᱮᱫ ᱚᱪᱚᱭᱟ</string>
     <string name="pref_show_answer_long_press_time" maxLength="41">ᱟᱹᱰᱤ ᱫᱤᱱ ᱞᱟᱦᱟᱛᱮ ᱚᱞ ᱞᱟᱹᱠᱛᱤ ᱠᱟᱱᱟ</string>
     <string name="pref_show_answer_long_press_time_summary">Minimum pressing time before the show answer button registers a touch.</string>
     <string name="show_estimates" maxLength="41">ᱵᱟᱹᱴᱟᱹᱱ ᱥᱚᱢᱚᱭ ᱫᱮᱠᱷᱟᱣ</string>
@@ -178,7 +178,7 @@
     <string name="use_current" maxLength="41">ᱱᱟᱶᱟ ᱠᱟᱰ ᱠᱚ ᱞᱟᱹᱜᱤᱫ ᱰᱮᱠ</string>
     <string name="learn_cutoff" maxLength="41">ᱢᱟᱲᱟᱝ ᱥᱮᱫ ᱯᱟᱲᱦᱟᱣ ᱪᱮᱫᱚᱜ</string>
     <string name="time_limit" maxLength="41">ᱥᱚᱢᱚᱭ ᱵᱟᱠᱥᱚ ᱚᱠᱛᱚ ᱥᱤᱢᱟᱹ</string>
-    <string name="day_offset_with_description" maxLength="41">ᱜᱟᱯᱟ ᱫᱤᱱ ᱟᱜ ᱮᱛᱦᱚᱵ </string>
+    <string name="day_offset_with_description" maxLength="41">ᱜᱟᱯᱟ ᱫᱤᱱ ᱟᱜ ᱮᱛᱦᱚᱵ</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one">%d ᱚᱠᱛᱚ ᱥᱮᱛᱟᱜ</item>
         <item quantity="other">ᱧᱤᱫᱟᱹ ᱛᱟᱞᱟ ᱠᱷᱚᱱ %d ᱚᱠᱛᱚ</item>
diff --git a/AnkiDroid/src/main/res/values-sat/11-arrays.xml b/AnkiDroid/src/main/res/values-sat/11-arrays.xml
index 0e6775d49dcb..3b55e6404408 100644
--- a/AnkiDroid/src/main/res/values-sat/11-arrays.xml
+++ b/AnkiDroid/src/main/res/values-sat/11-arrays.xml
@@ -95,7 +95,7 @@
     <string name="gesture_flag_remove" maxLength="41">ᱯᱚᱛᱠᱟ ᱚᱪᱚᱜ ᱢᱮ</string>
     <string name="gesture_page_up" maxLength="41">ᱥᱟᱠᱟᱢ ᱪᱮᱛᱟᱱ</string>
     <string name="gesture_page_down" maxLength="41">ᱥᱟᱠᱟᱢ ᱞᱟᱛᱟᱨ</string>
-    <string name="gesture_abort_sync" maxLength="41">ᱥᱟᱱᱛᱟᱲᱤ ᱱᱤᱩᱡᱽ ᱰᱮᱥᱠ </string>
+    <string name="gesture_abort_sync" maxLength="41">ᱥᱟᱱᱛᱟᱲᱤ ᱱᱤᱩᱡᱽ ᱰᱮᱥᱠ</string>
     <string name="gesture_toggle_whiteboard" maxLength="41">ᱯᱩᱱᱰᱵᱚᱰ ᱴᱩᱜᱟᱹᱞ ᱢᱮ</string>
     <string name="gesture_show_hint" maxLength="41">ᱦᱤᱱᱫᱤ ᱪᱤᱛᱟᱹᱨ</string>
     <string name="gesture_show_all_hints" maxLength="41">ᱡᱚᱛᱚ ᱥᱟᱹᱠᱷᱭᱟᱹᱛ ᱮᱢ ᱢᱮ</string>
diff --git a/AnkiDroid/src/main/res/values-sat/16-multimedia-editor.xml b/AnkiDroid/src/main/res/values-sat/16-multimedia-editor.xml
index 72f3a2f75fb1..577f3d908996 100644
--- a/AnkiDroid/src/main/res/values-sat/16-multimedia-editor.xml
+++ b/AnkiDroid/src/main/res/values-sat/16-multimedia-editor.xml
@@ -58,17 +58,17 @@
     <string name="multimedia_editor_image_field_editing_photo">ᱠᱭᱟᱢᱮᱨᱟ</string>
     <!-- General -->
     <!-- not a good message, when an unexpected error happens -->
-    <string name="multimedia_editor_something_wrong">ᱡᱟᱦᱟᱱᱟᱜ ᱠᱚ ᱵᱷᱩᱞ ᱦᱩᱭᱮᱱᱟ </string>
+    <string name="multimedia_editor_something_wrong">ᱡᱟᱦᱟᱱᱟᱜ ᱠᱚ ᱵᱷᱩᱞ ᱦᱩᱭᱮᱱᱟ</string>
     <string name="multimedia_editor_png_paste_error">ᱠᱞᱤᱯᱵᱚᱰ ᱪᱤᱛᱟᱹᱨ png ᱨᱮ ᱵᱚᱫᱚᱞ ᱨᱮ ᱦᱤᱲᱤᱡ : %s</string>
     <string name="multimedia_editor_attach_mm_content" comment="used for screen readers. Not visible to the user">%1$s ᱡᱟᱭᱜᱟ ᱨᱮ ᱢᱟᱹᱞᱴᱤᱢᱤᱰᱤᱭᱟ ᱡᱤᱱᱤᱥ ᱞᱟᱴᱷᱟᱭ ᱢᱮ</string>
     <!-- Audio view -->
     <!-- Message when recording fails -->
-    <string name="multimedia_editor_audio_view_recording_failed">ᱨᱮᱠᱚᱰ ᱠᱚ ᱰᱤᱜᱟᱹᱣᱮᱱᱟ </string>
-    <string name="multimedia_editor_audio_view_playing_failed">ᱮᱛᱦᱚᱵ ᱠᱚ ᱰᱤᱜᱟᱹᱣ </string>
-    <string name="multimedia_editor_audio_view_create_failed">ᱨᱮᱠᱚᱰ ᱦᱟᱹᱛᱤᱭᱟᱨ ᱵᱟᱨ ᱵᱟᱭ ᱛᱮᱭᱟᱨᱚᱜ ᱠᱟᱱᱟ </string>
+    <string name="multimedia_editor_audio_view_recording_failed">ᱨᱮᱠᱚᱰ ᱠᱚ ᱰᱤᱜᱟᱹᱣᱮᱱᱟ</string>
+    <string name="multimedia_editor_audio_view_playing_failed">ᱮᱛᱦᱚᱵ ᱠᱚ ᱰᱤᱜᱟᱹᱣ</string>
+    <string name="multimedia_editor_audio_view_create_failed">ᱨᱮᱠᱚᱰ ᱦᱟᱹᱛᱤᱭᱟᱨ ᱵᱟᱨ ᱵᱟᱭ ᱛᱮᱭᱟᱨᱚᱜ ᱠᱟᱱᱟ</string>
     <!-- Crop function-->
     <string name="crop_image">ᱟᱢ ᱪᱤᱛᱟᱹᱨ ᱠᱷᱟᱴᱚ ᱥᱟᱱᱟᱮᱫ ᱢᱮᱭᱟ ᱥᱮ ᱵᱟᱝ-ᱟ  ?</string>
-    <string name="crop_button" maxLength="28">ᱪᱤᱛᱟᱹᱨ ᱠᱷᱟᱴᱚᱭ ᱢᱮ </string>
+    <string name="crop_button" maxLength="28">ᱪᱤᱛᱟᱹᱨ ᱠᱷᱟᱴᱚᱭ ᱢᱮ</string>
     <string name="save_dialog_content">ᱱᱤᱛᱚᱜᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱢᱟᱨᱟᱝ ᱫᱚ %sMB ᱠᱟᱱᱟ. ᱰᱤᱯᱷᱚᱞᱴ ᱪᱤᱛᱟᱹᱨ ᱢᱟᱨᱟᱝ ᱜᱚᱴᱟ ᱫᱚ 1MB ᱠᱟᱱᱟ. ᱟᱢ ᱱᱚᱶᱟ ᱠᱚᱢᱯᱨᱮᱥ (compress) ᱠᱮᱭᱟᱢ ᱥᱮ?</string>
     <string name="select_image_failed">"ᱪᱤᱛᱹᱨ ᱵᱟᱪᱷᱟᱣ ᱦᱩᱰᱟᱹᱜ, ᱫᱚᱭᱚᱠᱟᱛᱮ ᱫᱩᱦᱰᱟᱹ ᱪᱮᱥᱴᱟᱭ ᱢᱮ"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">ᱯᱷᱤᱞᱰ ᱥᱟᱦᱴᱟ</string>
diff --git a/AnkiDroid/src/main/res/values-sat/17-model-manager.xml b/AnkiDroid/src/main/res/values-sat/17-model-manager.xml
index 13bfd8a817bb..4c8afbefa644 100644
--- a/AnkiDroid/src/main/res/values-sat/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-sat/17-model-manager.xml
@@ -31,7 +31,7 @@
     <!--Toasts-->
     <string name="toast_last_model">ᱟᱢ ᱢᱟᱲᱟᱝᱼᱟᱜ ᱠᱷᱟᱴᱚ ᱵᱤᱪᱟᱹᱨ ᱯᱨᱚᱠᱟᱨ ᱵᱟᱝ ᱢᱮᱴᱟᱣ ᱫᱟᱲᱮᱟᱜᱼᱟ</string>
     <string name="toast_last_field">ᱠᱷᱟᱴᱚ ᱵᱤᱪᱟᱹᱨ ᱯᱨᱚᱠᱟᱨ ᱴᱷᱮᱱ ᱢᱤᱫᱴᱟᱝ ᱠᱷᱚᱱ ᱡᱟᱹᱥᱛᱤ ᱡᱟᱭᱜᱟ ᱛᱟᱦᱮᱱ ᱠᱟᱛᱷᱟ</string>
-    <string name="toast_empty_name">ᱟᱢ ᱫᱚ ᱧᱩᱛᱩᱢ ᱚᱞ ᱛᱮ ᱦᱩᱭᱟᱢᱟ </string>
+    <string name="toast_empty_name">ᱟᱢ ᱫᱚ ᱧᱩᱛᱩᱢ ᱚᱞ ᱛᱮ ᱦᱩᱭᱟᱢᱟ</string>
     <string name="toast_duplicate_field">ᱡᱟᱭᱜᱟ ᱧᱩᱛᱩᱢ ᱠᱟᱹᱢᱤ ᱨᱮ ᱟᱜᱩ ᱠᱟᱱᱟ</string>
     <!--Plurals-->
     <plurals name="model_browser_types_available">
@@ -59,7 +59,7 @@
     <string name="model_field_editor_reposition_menu">ᱡᱟᱭᱜᱟ ᱵᱚᱫᱚᱞ</string>
     <string name="model_field_editor_toggle_sticky">ᱥᱮᱞᱮᱫ ‌ᱡᱷᱚᱜ ᱢᱟᱲᱟᱝᱼᱟᱜ ᱤᱱᱯᱩᱴ ᱩᱭᱦᱟᱹᱨᱢᱮ</string>
     <string name="model_field_editor_changing">ᱡᱟᱭᱜᱟ ᱟᱹᱯᱰᱟᱴᱼᱚᱜ ᱠᱟᱱᱟ</string>
-    <string name="model_field_editor_sort_field">ᱡᱟᱭᱜᱟ ᱛᱮ ᱥᱚᱴᱼᱚᱜ ᱠᱟᱱᱟ </string>
+    <string name="model_field_editor_sort_field">ᱡᱟᱭᱜᱟ ᱛᱮ ᱥᱚᱴᱼᱚᱜ ᱠᱟᱱᱟ</string>
     <!--Warnings-->
     <string name="model_delete_warning">ᱥᱭᱚᱨ ᱱᱚᱶᱟ ᱠᱷᱟᱴᱚ ᱵᱤᱪᱟᱹᱨ ᱯᱨᱚᱠᱟᱨ‌ ᱜᱮᱫ ᱜᱤᱲᱤ ᱥᱮᱱᱟᱢ ᱠᱟᱱᱟ?</string>
     <string name="field_delete_warning">ᱥᱭᱚᱨ ᱱᱚᱶᱟ ᱡᱟᱭᱜᱟ ᱜᱮᱫ ᱜᱤᱲᱤ ᱥᱟᱱᱟᱢ ᱠᱟᱱᱟ?</string>
diff --git a/AnkiDroid/src/main/res/values-sc/10-preferences.xml b/AnkiDroid/src/main/res/values-sc/10-preferences.xml
index 3fe9c90b1acb..c14f816604b0 100644
--- a/AnkiDroid/src/main/res/values-sc/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sc/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Toca in bassu a manca</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Toca in bassu a dereta</string>
     <string name="gestures_shake" maxLength="41">Iscutzina su dispositivu</string>
-    <string name="card_browser_enable_external_context_menu">Menù ‘%s’</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">Menù ‘%s’</string>
     <string name="card_browser_enable_external_context_menu_summary">Abilitat su menù de cuntestu ‘%s’ globalmente</string>
     <string name="double_scrolling_gap" maxLength="41">Iscurrimentu dòpiu</string>
     <string name="double_scrolling_gap_summ">Addopiat sa distàntzia de iscurrimentu cun eReader</string>
@@ -265,7 +265,7 @@
     <string name="key_picker_default_press_key">Incarca una tecla</string>
     <string name="binding_add_axis">Annanghe unu joystick/controllore de movimentu</string>
     <string name="axis_picker_move_joystick">Move unu joystick/controllore de movimentu</string>
-    <string name="user_actions" maxLength="41">Atziones utente </string>
+    <string name="user_actions" maxLength="41">Atziones utente</string>
     <string name="user_actions_summary" maxLength="41">Esecuta JavaScript dae s\'ischermada de ripetitzione</string>
     <string name="user_action_1" maxLength="28">Atzione utente 1</string>
     <string name="user_action_2" maxLength="28">Atzione utente 2</string>
diff --git a/AnkiDroid/src/main/res/values-sk/10-preferences.xml b/AnkiDroid/src/main/res/values-sk/10-preferences.xml
index 226cfc4ecf45..2d586f1858ee 100644
--- a/AnkiDroid/src/main/res/values-sk/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sk/10-preferences.xml
@@ -119,7 +119,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Dotyk dole vľavo</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Dotyk dole vpravo</string>
     <string name="gestures_shake" maxLength="41">Pri zatrasení</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Povoliť globálne kontextové menu pre ‘%s’</string>
     <string name="double_scrolling_gap" maxLength="41">Dvojitý posun</string>
     <string name="double_scrolling_gap_summ">Zdvojnásobiť posúvanie s eReader</string>
diff --git a/AnkiDroid/src/main/res/values-sl/10-preferences.xml b/AnkiDroid/src/main/res/values-sl/10-preferences.xml
index ca1609ee775c..e8ff108fb2ab 100644
--- a/AnkiDroid/src/main/res/values-sl/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sl/10-preferences.xml
@@ -119,7 +119,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Dvojni pomik</string>
     <string name="double_scrolling_gap_summ">Podvoji razmik pomikanja z eReaderjem</string>
diff --git a/AnkiDroid/src/main/res/values-sq/10-preferences.xml b/AnkiDroid/src/main/res/values-sq/10-preferences.xml
index 2afb72668806..685d62aa4d39 100644
--- a/AnkiDroid/src/main/res/values-sq/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sq/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Double scrolling</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>
diff --git a/AnkiDroid/src/main/res/values-sr/10-preferences.xml b/AnkiDroid/src/main/res/values-sr/10-preferences.xml
index adcced2c1592..8b279ece25cf 100644
--- a/AnkiDroid/src/main/res/values-sr/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sr/10-preferences.xml
@@ -118,7 +118,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Дупло проклизавање</string>
     <string name="double_scrolling_gap_summ">Удвостручи међупросторе између клизаче на е-Читалацу</string>
diff --git a/AnkiDroid/src/main/res/values-ss/10-preferences.xml b/AnkiDroid/src/main/res/values-ss/10-preferences.xml
index 2afb72668806..685d62aa4d39 100644
--- a/AnkiDroid/src/main/res/values-ss/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ss/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Double scrolling</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>
diff --git a/AnkiDroid/src/main/res/values-sv/10-preferences.xml b/AnkiDroid/src/main/res/values-sv/10-preferences.xml
index 3959d20748a9..da3634ecc729 100644
--- a/AnkiDroid/src/main/res/values-sv/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sv/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Tryck längst ner till vänster</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Tryck längst ner till höger</string>
     <string name="gestures_shake" maxLength="41">Skaka enhet</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Meny</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Meny</string>
     <string name="card_browser_enable_external_context_menu_summary">Aktiverar sammanhangsmenyn ‘%s’ globalt</string>
     <string name="double_scrolling_gap" maxLength="41">Dubbelrullning</string>
     <string name="double_scrolling_gap_summ">Aktivera detta om du vill dubbla scroll gap med eReader</string>
diff --git a/AnkiDroid/src/main/res/values-sw/10-preferences.xml b/AnkiDroid/src/main/res/values-sw/10-preferences.xml
index 2afb72668806..685d62aa4d39 100644
--- a/AnkiDroid/src/main/res/values-sw/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sw/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Double scrolling</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>
diff --git a/AnkiDroid/src/main/res/values-ta/10-preferences.xml b/AnkiDroid/src/main/res/values-ta/10-preferences.xml
index 06b518e1c809..617bbb61c891 100644
--- a/AnkiDroid/src/main/res/values-ta/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ta/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">கீழே இடதுபுறத்தைத் தொடவும்</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">கீழ் வலதுபுறத்தைத் தொடவும்</string>
     <string name="gestures_shake" maxLength="41">சாதனத்தை அசைக்கவும்</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ மெனு</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ மெனு</string>
     <string name="card_browser_enable_external_context_menu_summary">உலகளவில் சூழல் மெனு \'%s\' ஐ இயக்குகிறது</string>
     <string name="double_scrolling_gap" maxLength="41">இரட்டை ஸ்க்ரோலிங்</string>
     <string name="double_scrolling_gap_summ">eReader மூலம் ஸ்க்ரோல் இடைவெளியை இரட்டிப்பாக்கவும்</string>
diff --git a/AnkiDroid/src/main/res/values-te/10-preferences.xml b/AnkiDroid/src/main/res/values-te/10-preferences.xml
index 6cf9ad76dca4..68f6b9e97056 100644
--- a/AnkiDroid/src/main/res/values-te/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-te/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">దిగువ ఎడమవైపు తాకండి</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">దిగువ కుడివైపు తాకండి</string>
     <string name="gestures_shake" maxLength="41">షేక్ పరికరం</string>
-    <string name="card_browser_enable_external_context_menu">\'%s\' మెను</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">\'%s\' మెను</string>
     <string name="card_browser_enable_external_context_menu_summary">ప్రపంచవ్యాప్తంగా \'%s\' సందర్భ మెనుని ప్రారంభిస్తుంది</string>
     <string name="double_scrolling_gap" maxLength="41">డబుల్ స్క్రోలింగ్</string>
     <string name="double_scrolling_gap_summ">eReader తో డబుల్ స్క్రోల్ స్పేస్</string>
@@ -264,7 +264,7 @@
     <string name="key_picker_default_press_key">ఒక కీని నొక్కండి</string>
     <string name="binding_add_axis">జాయ్‌స్టిక్/మోషన్ కంట్రోలర్‌ను జోడించండి</string>
     <string name="axis_picker_move_joystick">జాయ్‌స్టిక్/మోషన్ కంట్రోలర్‌ను తరలించండి</string>
-    <string name="user_actions" maxLength="41">వినియోగదారు చర్యలు </string>
+    <string name="user_actions" maxLength="41">వినియోగదారు చర్యలు</string>
     <string name="user_actions_summary" maxLength="41">సమీక్ష స్క్రీన్ నుండి జావాస్క్రిప్ట్‌ని ట్రిగ్గర్ చేయండి</string>
     <string name="user_action_1" maxLength="28">వినియోగదారు చర్య 1</string>
     <string name="user_action_2" maxLength="28">వినియోగదారు చర్యలు 2</string>
diff --git a/AnkiDroid/src/main/res/values-tg/10-preferences.xml b/AnkiDroid/src/main/res/values-tg/10-preferences.xml
index 2afb72668806..685d62aa4d39 100644
--- a/AnkiDroid/src/main/res/values-tg/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-tg/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Double scrolling</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>
diff --git a/AnkiDroid/src/main/res/values-tgl/10-preferences.xml b/AnkiDroid/src/main/res/values-tgl/10-preferences.xml
index c475e20c408f..3067be54aaae 100644
--- a/AnkiDroid/src/main/res/values-tgl/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-tgl/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Double scroll</string>
     <string name="double_scrolling_gap_summ">I-double ang scroll puwang sa eReader</string>
diff --git a/AnkiDroid/src/main/res/values-th/10-preferences.xml b/AnkiDroid/src/main/res/values-th/10-preferences.xml
index 5437805dcdb3..d42d70fdb5b1 100644
--- a/AnkiDroid/src/main/res/values-th/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-th/10-preferences.xml
@@ -116,7 +116,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Double scrolling</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>
diff --git a/AnkiDroid/src/main/res/values-ti/10-preferences.xml b/AnkiDroid/src/main/res/values-ti/10-preferences.xml
index 2afb72668806..685d62aa4d39 100644
--- a/AnkiDroid/src/main/res/values-ti/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ti/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Double scrolling</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>
diff --git a/AnkiDroid/src/main/res/values-tn/10-preferences.xml b/AnkiDroid/src/main/res/values-tn/10-preferences.xml
index 2afb72668806..685d62aa4d39 100644
--- a/AnkiDroid/src/main/res/values-tn/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-tn/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Double scrolling</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>
diff --git a/AnkiDroid/src/main/res/values-tr/03-dialogs.xml b/AnkiDroid/src/main/res/values-tr/03-dialogs.xml
index 3988615f0e66..87dadba934c4 100644
--- a/AnkiDroid/src/main/res/values-tr/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-tr/03-dialogs.xml
@@ -130,7 +130,7 @@
     <string name="integrity_check_startup_content">AnkiDroid yükseltildi. Bu yükseltme, olası veritabanı sorunları için düzeltmeleri içerir ve veritabanını şimdi kontrol etmenizi öneririz.</string>
     <string name="integrity_check_continue_anyway">Yine de devam et</string>
     <string name="integrity_check_insufficient_space">Veritabanı Kontrolü büyük miktarda geçici depolama alanı kullanıyor.\n\nDevam etmeden önce cihazınızda en az %s boş alanın olması şiddetle önerilir.</string>
-    <string name="integrity_check_insufficient_space_extra_content">\n\nŞu anda %s boş alanınız var. </string>
+    <string name="integrity_check_insufficient_space_extra_content">\n\nŞu anda %s boş alanınız var.</string>
     <!-- Card Browser -->
     <!-- AbstractFlashCardViewer -->
     <string name="card_viewer_url_decode_error">Karttaki verinin kod çözme hatası</string>
diff --git a/AnkiDroid/src/main/res/values-tr/10-preferences.xml b/AnkiDroid/src/main/res/values-tr/10-preferences.xml
index 4fcde1ee114b..57cc33ebc426 100644
--- a/AnkiDroid/src/main/res/values-tr/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-tr/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Sol alta dokun</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Sağ alta dokun</string>
     <string name="gestures_shake" maxLength="41">Cihazı salla</string>
-    <string name="card_browser_enable_external_context_menu">\"%s\" Menüsü</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">\"%s\" Menüsü</string>
     <string name="card_browser_enable_external_context_menu_summary">\"%s\" durum menüsünü uygulama çapında etkinleştirir</string>
     <string name="double_scrolling_gap" maxLength="41">Hızlı kaydırma</string>
     <string name="double_scrolling_gap_summ">eOkuyucu\'yla kaydırma mesafesini iki katına çıkarmak istiyorsanız bunu etkinleştirin</string>
diff --git a/AnkiDroid/src/main/res/values-ts/10-preferences.xml b/AnkiDroid/src/main/res/values-ts/10-preferences.xml
index 2afb72668806..685d62aa4d39 100644
--- a/AnkiDroid/src/main/res/values-ts/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ts/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Double scrolling</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>
diff --git a/AnkiDroid/src/main/res/values-tt/01-core.xml b/AnkiDroid/src/main/res/values-tt/01-core.xml
index 006f65786166..dd825a424d23 100644
--- a/AnkiDroid/src/main/res/values-tt/01-core.xml
+++ b/AnkiDroid/src/main/res/values-tt/01-core.xml
@@ -134,7 +134,7 @@
     <string name="cancel_sync_confirm" tools:ignore="UnusedResources">Синхронизацияне кире кагыргамы?</string>
     <string name="continue_sync" tools:ignore="UnusedResources">Синхронизацияне дәвам итү</string>
     <string name="sync_cancelled" tools:ignore="UnusedResources">Синхронизация кире кагылган</string>
-    <string name="sync_cancel_message" tools:ignore="UnusedResources">Кире кагу&#8230;\nБу бераз вакыт алырга мөмкин </string>
+    <string name="sync_cancel_message" tools:ignore="UnusedResources">Кире кагу&#8230;\nБу бераз вакыт алырга мөмкин</string>
     <string name="syncing_media">Syncing media</string>
     <string name="export_deck" maxLength="28">Колоданы экспортлау</string>
     <string name="export_collection">Export collection</string>
diff --git a/AnkiDroid/src/main/res/values-tt/02-strings.xml b/AnkiDroid/src/main/res/values-tt/02-strings.xml
index b623434ff751..43081719cf60 100644
--- a/AnkiDroid/src/main/res/values-tt/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tt/02-strings.xml
@@ -142,7 +142,7 @@
     <string name="import_interrupted">Импорт бүленгән иде</string>
     <string name="export_preparation_in_progress">Preparing export&#8230;</string>
     <string name="export_ready_title">Export ready</string>
-    <string name="export_send_no_handlers">apkg файлын укый ала торган кушымталар юк. Саклана&#8230; </string>
+    <string name="export_send_no_handlers">apkg файлын укый ала торган кушымталар юк. Саклана&#8230;</string>
     <string name="export_save_apkg_successful">Anki пакеты уңышлы итеп сакланды</string>
     <string name="export_save_apkg_unsuccessful">Anki пакеты саклана алмады</string>
     <string name="export_share_title">Send Anki package using</string>
@@ -163,7 +163,7 @@
     <string name="menu__study_options" comment="Menu item that opens options for a Filtered deck (aka Cram deck, aka Custom study)">Study options</string>
     <string name="select_tts" maxLength="28">Текст телен көйләргә</string>
     <string name="custom_study" maxLength="28">Тагын өйрәнү</string>
-    <string name="dyn_deck_desc">Бу - гадәттәгедән тыш күбрәк уку өчен колода. Кәртләрне карап чыккач, алар үзенең колодаларына кире кайтачаклар. Бу колоданы бетерү аның эчендәге кәртләрнең үзенең колодаларына кайтуына китерер. </string>
+    <string name="dyn_deck_desc">Бу - гадәттәгедән тыш күбрәк уку өчен колода. Кәртләрне карап чыккач, алар үзенең колодаларына кире кайтачаклар. Бу колоданы бетерү аның эчендәге кәртләрнең үзенең колодаларына кайтуына китерер.</string>
     <string name="steps_error">Адымнар 0дән күбрәк сан булырга тиеш</string>
     <string name="steps_min_error">Бер булса да адым кирәк</string>
     <string name="tag_editor_add_feedback">Touch “%2$s” to confirm adding “%1$s”</string>
diff --git a/AnkiDroid/src/main/res/values-tt/03-dialogs.xml b/AnkiDroid/src/main/res/values-tt/03-dialogs.xml
index 02da01f46ef1..4638256f4bbd 100644
--- a/AnkiDroid/src/main/res/values-tt/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-tt/03-dialogs.xml
@@ -133,7 +133,7 @@
     <string name="card_viewer_url_decode_error">Error decoding data from card</string>
     <!-- Deck Options -->
     <!-- Database Errors-->
-    <string name="database_locked_title">Мәгълүматлар базасы бикләнгән </string>
+    <string name="database_locked_title">Мәгълүматлар базасы бикләнгән</string>
     <string name="database_locked_summary">The AnkiDroid database is in use by another application. Please close the other application then reopen AnkiDroid.</string>
     <string name="incompatible_database_version_title">Incompatible Database Version</string>
     <string name="incompatible_database_version_summary">The database is a more advanced version than this version of AnkiDroid can work with. Upgrade AnkiDroid or downgrade the database to open it\n\nSupported version: %1$d\nDatabase version: %2$d\n\nThe following restore options will overwrite your current collection, possibly with a compatible database version:</string>
diff --git a/AnkiDroid/src/main/res/values-tt/10-preferences.xml b/AnkiDroid/src/main/res/values-tt/10-preferences.xml
index 77338cbf06a4..b79ebb5c0528 100644
--- a/AnkiDroid/src/main/res/values-tt/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-tt/10-preferences.xml
@@ -116,7 +116,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Меню</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Меню</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Double scrolling</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>
diff --git a/AnkiDroid/src/main/res/values-ug/10-preferences.xml b/AnkiDroid/src/main/res/values-ug/10-preferences.xml
index 8eeef4798a35..b75ba655ca97 100644
--- a/AnkiDroid/src/main/res/values-ug/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ug/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">سول ئاستىنى چەك</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">ئوڭ ئاستىنى چەك</string>
     <string name="gestures_shake" maxLength="41">ئۈسكۈنىنى سىلكى</string>
-    <string name="card_browser_enable_external_context_menu">«%s» تىزىملىكى</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">«%s» تىزىملىكى</string>
     <string name="card_browser_enable_external_context_menu_summary">«%s» مەزمۇن تىزىملىكىنى پۈتكۈل دائىرىدە قوزغىتىدۇ</string>
     <string name="double_scrolling_gap" maxLength="41">قوش دومىلات</string>
     <string name="double_scrolling_gap_summ">ئېلېكتىرونلۇق ئوقۇغۇچتا قوش دومىلىتىدۇ</string>
diff --git a/AnkiDroid/src/main/res/values-uk/02-strings.xml b/AnkiDroid/src/main/res/values-uk/02-strings.xml
index 11ae400144aa..bc1656cbec5e 100644
--- a/AnkiDroid/src/main/res/values-uk/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-uk/02-strings.xml
@@ -154,7 +154,7 @@
     <string name="export_send_no_handlers">Не знайдено додатків для обробки apkg. Збереження&#8230;</string>
     <string name="export_save_apkg_successful">Пакунок Anki успішно збережено</string>
     <string name="export_save_apkg_unsuccessful">Не вдалося зберегти пакунок Anki</string>
-    <string name="export_share_title">Надіслати пакет Anki використовуючи </string>
+    <string name="export_share_title">Надіслати пакет Anki використовуючи</string>
     <string name="export_email_subject">AnkiDroid експортує картки: %s</string>
     <string name="export_email_text"><![CDATA[        Привіт!
         <br/><br/>
diff --git a/AnkiDroid/src/main/res/values-uk/10-preferences.xml b/AnkiDroid/src/main/res/values-uk/10-preferences.xml
index d15f04dfb6a2..507b176d059e 100644
--- a/AnkiDroid/src/main/res/values-uk/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-uk/10-preferences.xml
@@ -119,7 +119,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Дотик лівого нижнього кута</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Дотик правого нижнього кута</string>
     <string name="gestures_shake" maxLength="41">Потрясти пристроєм</string>
-    <string name="card_browser_enable_external_context_menu">Меню \'%s\'</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">Меню \'%s\'</string>
     <string name="card_browser_enable_external_context_menu_summary">Включає \'%s\' в загальне контекстне меню</string>
     <string name="double_scrolling_gap" maxLength="41">Подвійне прокручування</string>
     <string name="double_scrolling_gap_summ">Подвоїти розрив прокручування в eReader-і</string>
@@ -246,7 +246,7 @@
     <string name="deck_conf_cram_reschedule_summ">Перепланувати картки на основі моїх відповідей в цій колоді</string>
     <string name="deck_conf_cram_filter_2_check">Увімкнути другий фільтр</string>
     <string name="deck_conf_cram_steps_summ" maxLength="41">Задати власні кроки</string>
-    <string name="deck_conf_cram_preview_delays" maxLength="41"> Затримка попереднього перегляду</string>
+    <string name="deck_conf_cram_preview_delays" maxLength="41">Затримка попереднього перегляду</string>
     <string name="deck_conf_cram_preview_delays_summ">Затримка в секундах. 0 повертає картку до початкової колоди.</string>
     <!-- analytics options -->
     <string name="analytics_dialog_title">Допоможіть зробити AnkiDroid кращим!</string>
diff --git a/AnkiDroid/src/main/res/values-uk/17-model-manager.xml b/AnkiDroid/src/main/res/values-uk/17-model-manager.xml
index e0de7a9154e1..420ce7c3d657 100644
--- a/AnkiDroid/src/main/res/values-uk/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-uk/17-model-manager.xml
@@ -53,7 +53,7 @@
     <!--Rename-->
     <string name="rename_model">Перейменувати тип запису</string>
     <!--Language Hint-->
-    <string name="model_field_editor_language_hint_dialog_success_result">Встановити %s як мову підказок </string>
+    <string name="model_field_editor_language_hint_dialog_success_result">Встановити %s як мову підказок</string>
     <!--Field Editing-->
     <string name="model_field_editor_title">Редагувати поля</string>
     <string name="model_field_editor_add" maxLength="28">Додати поле</string>
diff --git a/AnkiDroid/src/main/res/values-ur/10-preferences.xml b/AnkiDroid/src/main/res/values-ur/10-preferences.xml
index 3711d4dfe0b0..cc6717183e11 100644
--- a/AnkiDroid/src/main/res/values-ur/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ur/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">نیچے بائیں کو ٹچ کریں</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">نیچے دائیں کو ٹچ کریں</string>
     <string name="gestures_shake" maxLength="41">شیک ڈیوائس</string>
-    <string name="card_browser_enable_external_context_menu">\'%s\' مینو</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">\'%s\' مینو</string>
     <string name="card_browser_enable_external_context_menu_summary">عالمی سطح پر \'%s\' سیاق و سباق کے مینو کو فعال کرتا ہے۔</string>
     <string name="double_scrolling_gap" maxLength="41">ڈبل اسکرولنگ</string>
     <string name="double_scrolling_gap_summ">eReader کے ساتھ اسکرول گیپ کو دوگنا کریں</string>
diff --git a/AnkiDroid/src/main/res/values-uz/10-preferences.xml b/AnkiDroid/src/main/res/values-uz/10-preferences.xml
index 2afb72668806..685d62aa4d39 100644
--- a/AnkiDroid/src/main/res/values-uz/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-uz/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Double scrolling</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>
diff --git a/AnkiDroid/src/main/res/values-ve/10-preferences.xml b/AnkiDroid/src/main/res/values-ve/10-preferences.xml
index 2afb72668806..685d62aa4d39 100644
--- a/AnkiDroid/src/main/res/values-ve/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ve/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Double scrolling</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>
diff --git a/AnkiDroid/src/main/res/values-vi/10-preferences.xml b/AnkiDroid/src/main/res/values-vi/10-preferences.xml
index 87abb76e2cfc..e1f663a5e2c0 100644
--- a/AnkiDroid/src/main/res/values-vi/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-vi/10-preferences.xml
@@ -77,7 +77,7 @@
     <string name="reset_confirmation">Thiết lập lại tất cả các trạng thái</string>
     <string name="card_zoom" maxLength="41">Thu phóng thẻ</string>
     <string name="image_zoom" maxLength="41">Thu phóng hình ảnh</string>
-    <string name="button_size" maxLength="41">Kích thước nút trả lời </string>
+    <string name="button_size" maxLength="41">Kích thước nút trả lời</string>
     <string name="card_browser_font_size" maxLength="41">Thẻ trình duyệt font rộng</string>
     <string name="card_browser_hide_media" maxLength="41">Hiển thị tên tệp trong trình duyệt thẻ</string>
     <string name="card_browser_hide_media_summary">Hiển thị tên tệp phương tiện trong các trường câu hỏi / câu trả lời của trình duyệt thẻ</string>
@@ -116,16 +116,16 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Chạm vào dưới cùng bên trái</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Chạm vào dưới cùng bên phải</string>
     <string name="gestures_shake" maxLength="41">Lắc thiết bị</string>
-    <string name="card_browser_enable_external_context_menu">Menu ‘%s’</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">Menu ‘%s’</string>
     <string name="card_browser_enable_external_context_menu_summary">Bật menu ngữ cảnh ‘%s’ trên toàn cầu</string>
     <string name="double_scrolling_gap" maxLength="41">Bấm phím scrolling (chuột giữa) hai lần</string>
-    <string name="double_scrolling_gap_summ">bấm hai lần chuột giữa với eReader </string>
+    <string name="double_scrolling_gap_summ">bấm hai lần chuột giữa với eReader</string>
     <string name="swipe_sensitivity" maxLength="41">Độ nhạy của chạm vuốt</string>
     <string name="tts" maxLength="41">Văn bản sang tiếng nói</string>
     <string name="tts_summ">Đọc ra câu hỏi và câu trả lời nếu không có tập tin âm thanh nào được kèm theo</string>
     <!-- Sync -->
     <string name="sync_fetch_missing_media" maxLength="41">Tìm nạp phương tiện truyền thông trên đồng bộ</string>
-    <string name="sync_account" maxLength="41">tài khoản AnkiWeb </string>
+    <string name="sync_account" maxLength="41">tài khoản AnkiWeb</string>
     <string name="sync_account_summ_logged_out">Chưa đăng nhập</string>
     <string name="automatic_sync_choice" maxLength="41">Đồng bộ hóa tự động</string>
     <string name="automatic_sync_choice_summ">Đồng bộ hóa tự động khi khởi động / thoát ứng dụng nếu lần đồng bộ hóa cuối cùng nhiều hơn 10         phút trước.</string>
diff --git a/AnkiDroid/src/main/res/values-wo/10-preferences.xml b/AnkiDroid/src/main/res/values-wo/10-preferences.xml
index 0f0b55cad9c9..6744950912bc 100644
--- a/AnkiDroid/src/main/res/values-wo/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-wo/10-preferences.xml
@@ -116,7 +116,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Double scrolling</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>
diff --git a/AnkiDroid/src/main/res/values-xh/10-preferences.xml b/AnkiDroid/src/main/res/values-xh/10-preferences.xml
index 2afb72668806..685d62aa4d39 100644
--- a/AnkiDroid/src/main/res/values-xh/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-xh/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Double scrolling</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>
diff --git a/AnkiDroid/src/main/res/values-yue/10-preferences.xml b/AnkiDroid/src/main/res/values-yue/10-preferences.xml
index 0f0b55cad9c9..6744950912bc 100644
--- a/AnkiDroid/src/main/res/values-yue/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-yue/10-preferences.xml
@@ -116,7 +116,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Double scrolling</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>
diff --git a/AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml b/AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml
index b2cf00f97899..d09523cf0fa0 100644
--- a/AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml
@@ -116,7 +116,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">触摸左下方</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">触摸右下方</string>
     <string name="gestures_shake" maxLength="41">摇动设备</string>
-    <string name="card_browser_enable_external_context_menu">“%s” 菜单</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">“%s” 菜单</string>
     <string name="card_browser_enable_external_context_menu_summary">全局启用 “%s” 上下文菜单</string>
     <string name="double_scrolling_gap" maxLength="41">双滚动</string>
     <string name="double_scrolling_gap_summ">电子阅读器中使用双滚动</string>
@@ -263,7 +263,7 @@
     <string name="key_picker_default_press_key">按下按键</string>
     <string name="binding_add_axis">添加游戏杆/运动控制器</string>
     <string name="axis_picker_move_joystick">移动游戏杆/运动控制器</string>
-    <string name="user_actions" maxLength="41">用户动作 </string>
+    <string name="user_actions" maxLength="41">用户动作</string>
     <string name="user_actions_summary" maxLength="41">从审核屏幕上触发 JavaScript</string>
     <string name="user_action_1" maxLength="28">用户动作 1</string>
     <string name="user_action_2" maxLength="28">用户动作 2</string>
diff --git a/AnkiDroid/src/main/res/values-zh-rTW/01-core.xml b/AnkiDroid/src/main/res/values-zh-rTW/01-core.xml
index dd23c8657c09..05bee10502c4 100644
--- a/AnkiDroid/src/main/res/values-zh-rTW/01-core.xml
+++ b/AnkiDroid/src/main/res/values-zh-rTW/01-core.xml
@@ -91,10 +91,10 @@
     <string name="menu_add_note" maxLength="28">增加筆記</string>
     <string name="menu_my_account" comment="Label of the window in which the user should enter their account. This text can\'t be found in AnkiDroid directly.">同步帳戶</string>
     <string name="menu_dismiss_note" maxLength="41">隐藏/删除</string>
-    <string name="menu_bury_card" maxLength="28">暫時隱藏卡片 </string>
+    <string name="menu_bury_card" maxLength="28">暫時隱藏卡片</string>
     <string name="menu_bury_note" maxLength="28">暫時隱藏筆記</string>
-    <string name="menu_suspend_card" maxLength="28">暫停卡片 </string>
-    <string name="menu_suspend_note" maxLength="28">長久擱置筆記 </string>
+    <string name="menu_suspend_card" maxLength="28">暫停卡片</string>
+    <string name="menu_suspend_note" maxLength="28">長久擱置筆記</string>
     <string name="menu_bury" maxLength="28">埋葬</string>
     <string name="menu_suspend" maxLength="28">擱置</string>
     <string name="menu_delete_note" maxLength="28">刪除筆記</string>
diff --git a/AnkiDroid/src/main/res/values-zh-rTW/10-preferences.xml b/AnkiDroid/src/main/res/values-zh-rTW/10-preferences.xml
index a838eb0574a1..7defa7265934 100644
--- a/AnkiDroid/src/main/res/values-zh-rTW/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-zh-rTW/10-preferences.xml
@@ -116,7 +116,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">輕觸左下方</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">輕觸右下方</string>
     <string name="gestures_shake" maxLength="41">搖晃裝置</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ 選單</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ 選單</string>
     <string name="card_browser_enable_external_context_menu_summary">啟用全域性‘%s’內容選單</string>
     <string name="double_scrolling_gap" maxLength="41">加速捲動</string>
     <string name="double_scrolling_gap_summ">加倍 eReader 的滾動間距</string>
diff --git a/AnkiDroid/src/main/res/values-zu/10-preferences.xml b/AnkiDroid/src/main/res/values-zu/10-preferences.xml
index 2afb72668806..685d62aa4d39 100644
--- a/AnkiDroid/src/main/res/values-zu/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-zu/10-preferences.xml
@@ -117,7 +117,7 @@
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Touch bottom left</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Touch bottom right</string>
     <string name="gestures_shake" maxLength="41">Shake device</string>
-    <string name="card_browser_enable_external_context_menu">‘%s’ Menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menu</string>
     <string name="card_browser_enable_external_context_menu_summary">Enables the ‘%s’ context menu globally</string>
     <string name="double_scrolling_gap" maxLength="41">Double scrolling</string>
     <string name="double_scrolling_gap_summ">Double the scroll gap with eReader</string>

From d3f0a09157a8bbf04342b5c49bb64e48bdbc748d Mon Sep 17 00:00:00 2001
From: Arthur Milchior <arthur@milchior.fr>
Date: Mon, 17 Mar 2025 02:07:07 +0100
Subject: [PATCH 120/200] NF: add a note in 12-dont-translate

I experimented and found that adding a new line at start/stop plus
spaces cause the string to be noted as untranslated.

So I add this note to this logical place to keep track of this information.
---
 AnkiDroid/src/main/res/values/12-dont-translate.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/AnkiDroid/src/main/res/values/12-dont-translate.xml b/AnkiDroid/src/main/res/values/12-dont-translate.xml
index ac5bacf6e717..ed18d62fc449 100644
--- a/AnkiDroid/src/main/res/values/12-dont-translate.xml
+++ b/AnkiDroid/src/main/res/values/12-dont-translate.xml
@@ -16,8 +16,14 @@
 -->
 <!-- This contains strings that are used to test the translation process. They should not be used in actual code -->
 <resources>
+    <!--
+    Adding or removing new line at the start/end of the string cause crowdin to require a new translation. Let's check if a comment before lead to a translation need!
+    -->
   <string
       name="crowdin_test_string_do_not_translate"
       >In order to ensure this string is not shown as untranslated, translate it the way you want. Probably using a single letter, so that it\'s quick. This string will never appear in ankidroid and is present here only to test crowdin feature.</string>
+    <string name="crowdin_second_string_to_test">
+        This will be used to check that changing the order of strings does not require translation.
+    </string>
 </resources>
 

From 01db315671d3c41c49bb890f4285f735bcb391df Mon Sep 17 00:00:00 2001
From: Arthur Milchior <arthur@milchior.fr>
Date: Mon, 17 Mar 2025 02:39:13 +0100
Subject: [PATCH 121/200] NF: changing order of strings

This is a test to ensure that it does not require a new translation!
---
 AnkiDroid/src/main/res/values/12-dont-translate.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/AnkiDroid/src/main/res/values/12-dont-translate.xml b/AnkiDroid/src/main/res/values/12-dont-translate.xml
index ed18d62fc449..6b2fa4dcd943 100644
--- a/AnkiDroid/src/main/res/values/12-dont-translate.xml
+++ b/AnkiDroid/src/main/res/values/12-dont-translate.xml
@@ -18,12 +18,13 @@
 <resources>
     <!--
     Adding or removing new line at the start/end of the string cause crowdin to require a new translation. Let's check if a comment before lead to a translation need!
+    Adding this kind of XML comment does not cause the need for a new translation!
     -->
-  <string
-      name="crowdin_test_string_do_not_translate"
-      >In order to ensure this string is not shown as untranslated, translate it the way you want. Probably using a single letter, so that it\'s quick. This string will never appear in ankidroid and is present here only to test crowdin feature.</string>
     <string name="crowdin_second_string_to_test">
         This will be used to check that changing the order of strings does not require translation.
     </string>
+    <string
+        name="crowdin_test_string_do_not_translate"
+        >In order to ensure this string is not shown as untranslated, translate it the way you want. Probably using a single letter, so that it\'s quick. This string will never appear in ankidroid and is present here only to test crowdin feature.</string>
 </resources>
 

From 6969da51c42acb0821652bba8bba51281e811ef9 Mon Sep 17 00:00:00 2001
From: Aditya <aditya1657s@gmail.com>
Date: Sat, 2 Nov 2024 21:52:26 +0530
Subject: [PATCH 122/200] Manual-Download-link

The user can download the deck manually if download fails.

Fixes #17178

! Steps to reproduce the download failed error:

1. Comment out the downloadFile() function call in the onViewCreated method.
2. Instead, call checkDownloadStatusAndUnregisterReceiver(false, false).

test-added

test-updated

comment-added

xml-updates
---
 .../ichi2/anki/SharedDecksDownloadFragment.kt | 45 ++++++++++++++++++-
 .../layout/fragment_shared_decks_download.xml | 16 +++++++
 AnkiDroid/src/main/res/values/02-strings.xml  |  1 +
 AnkiDroid/src/main/res/values/constants.xml   |  1 +
 .../anki/SharedDecksDownloadFragmentTest.kt   | 43 ++++++++++++++++++
 5 files changed, 105 insertions(+), 1 deletion(-)
 create mode 100644 AnkiDroid/src/test/java/com/ichi2/anki/SharedDecksDownloadFragmentTest.kt

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/SharedDecksDownloadFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/SharedDecksDownloadFragment.kt
index 90f483b67fc3..728e68fbe243 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/SharedDecksDownloadFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/SharedDecksDownloadFragment.kt
@@ -34,12 +34,14 @@ import android.widget.Button
 import android.widget.ProgressBar
 import android.widget.TextView
 import androidx.activity.OnBackPressedCallback
+import androidx.annotation.VisibleForTesting
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
 import androidx.fragment.app.Fragment
 import com.ichi2.anki.SharedDecksActivity.Companion.DOWNLOAD_FILE
 import com.ichi2.anki.snackbar.showSnackbar
+import com.ichi2.anki.utils.openUrl
 import com.ichi2.compat.CompatHelper.Companion.getSerializableCompat
 import com.ichi2.compat.CompatHelper.Companion.registerReceiverCompat
 import com.ichi2.utils.ImportUtils
@@ -70,6 +72,7 @@ class SharedDecksDownloadFragment : Fragment(R.layout.fragment_shared_decks_down
     private lateinit var downloadPercentageText: TextView
     private lateinit var downloadProgressBar: ProgressBar
     private lateinit var checkNetworkInfoText: TextView
+    private lateinit var openInBrowserButton: Button
 
     /**
      * Android's DownloadManager - Used here to manage the functionality of downloading decks, one
@@ -106,6 +109,37 @@ class SharedDecksDownloadFragment : Fragment(R.layout.fragment_shared_decks_down
          * so our FileProvider can actually serve the file!
          */
         const val SHARED_DECKS_DOWNLOAD_FOLDER = "shared_decks"
+
+        private val deckIdRegex = "download-deck/(\\d+)".toRegex()
+
+        /**
+         * Given the URI of a deck's download URL such as
+         * https://ankiweb.net/svc/shared/download-deck/1104981491?t=eyJvcCI6InNkZCIsImlhdCI6MTc0MTUyNjQ0OSwianYiOjF9.hr4a_G-LAqMVBAp5_95l60_2lEtYxodGl4DrJ6dT2WI
+         * returns the deck's id, in this case "1104981491" if it can be found.
+         */
+        @VisibleForTesting
+        fun getDeckIdFromDownloadURL(downloadUrl: String) =
+            deckIdRegex
+                .find(downloadUrl)
+                ?.groups
+                ?.get(1)
+                ?.value
+
+        /**
+         * Given the URI of a deck's download URL such as
+         * https://ankiweb.net/svc/shared/download-deck/1104981491?t=eyJvcCI6InNkZCIsImlhdCI6MTc0MTUyNjQ0OSwianYiOjF9.hr4a_G-LAqMVBAp5_95l60_2lEtYxodGl4DrJ6dT2WI
+         * returns the deck's page URL such as https://ankiweb.net/shared/info/1104981491
+         * If the deck id can't be found, returns the ankiweb's shared deck's main page.
+         */
+        @VisibleForTesting
+        fun Context.getDeckPageUri(deckDownloadURL: String): String {
+            val deckId = getDeckIdFromDownloadURL(deckDownloadURL)
+            return if (deckId != null) {
+                getString(R.string.shared_deck_info) + deckId
+            } else {
+                getString(R.string.shared_decks_url)
+            }
+        }
     }
 
     override fun onViewCreated(
@@ -120,6 +154,7 @@ class SharedDecksDownloadFragment : Fragment(R.layout.fragment_shared_decks_down
         importDeckButton = view.findViewById(R.id.import_shared_deck_button)
         tryAgainButton = view.findViewById(R.id.try_again_deck_download)
         checkNetworkInfoText = view.findViewById(R.id.check_network_info_text)
+        openInBrowserButton = view.findViewById(R.id.download_shared_deck_from_browser)
 
         val fileToBeDownloaded = arguments?.getSerializableCompat<DownloadFile>(DOWNLOAD_FILE)!!
         downloadManager = (activity as SharedDecksActivity).downloadManager
@@ -136,14 +171,21 @@ class SharedDecksDownloadFragment : Fragment(R.layout.fragment_shared_decks_down
             openDownloadedDeck(context)
         }
 
+        openInBrowserButton.setOnClickListener {
+            Timber.i("'Open in Browser' clicked")
+            downloadManager.remove(downloadId)
+            openUrl(Uri.parse(requireContext().getDeckPageUri(fileToBeDownloaded.url)))
+            parentFragmentManager.popBackStack()
+        }
+
         tryAgainButton.setOnClickListener {
             Timber.i("Try again button clicked, retry downloading of deck")
             downloadManager.remove(downloadId)
             downloadFile(fileToBeDownloaded)
             cancelButton.visibility = View.VISIBLE
             tryAgainButton.visibility = View.GONE
+            openInBrowserButton.visibility = View.GONE
         }
-        requireActivity().onBackPressedDispatcher.addCallback(onBackPressedCallback)
     }
 
     /**
@@ -487,6 +529,7 @@ class SharedDecksDownloadFragment : Fragment(R.layout.fragment_shared_decks_down
                 context?.let { showThemedToast(it, R.string.something_wrong, false) }
                 // Update UI if download could not be successful
                 tryAgainButton.visibility = View.VISIBLE
+                openInBrowserButton.visibility = View.VISIBLE
                 cancelButton.visibility = View.GONE
                 downloadPercentageText.text = getString(R.string.download_failed)
                 downloadProgressBar.progress = DOWNLOAD_STARTED_PROGRESS_PERCENTAGE.toInt()
diff --git a/AnkiDroid/src/main/res/layout/fragment_shared_decks_download.xml b/AnkiDroid/src/main/res/layout/fragment_shared_decks_download.xml
index 0990875795c0..0a268d1da77a 100644
--- a/AnkiDroid/src/main/res/layout/fragment_shared_decks_download.xml
+++ b/AnkiDroid/src/main/res/layout/fragment_shared_decks_download.xml
@@ -76,6 +76,22 @@
         app:layout_constraintTop_toBottomOf="@id/download_progress"
         android:visibility="gone" />
 
+    <android.widget.Button
+        android:id="@+id/download_shared_deck_from_browser"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/open_in_browser"
+        style="@style/Widget.MaterialComponents.Button.TextButton"
+        android:textColor="@color/material_blue_500"
+        android:padding="8dp"
+        android:layout_marginBottom="24dp"
+        android:layout_marginStart="24dp"
+        android:layout_marginEnd="24dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/try_again_deck_download"
+        android:visibility="gone" />
+
     <android.widget.Button
         android:id="@+id/cancel_shared_decks_download"
         android:layout_width="match_parent"
diff --git a/AnkiDroid/src/main/res/values/02-strings.xml b/AnkiDroid/src/main/res/values/02-strings.xml
index 0e5b1f8adf03..ada62bdaac83 100644
--- a/AnkiDroid/src/main/res/values/02-strings.xml
+++ b/AnkiDroid/src/main/res/values/02-strings.xml
@@ -260,6 +260,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb's shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Try Again</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>
diff --git a/AnkiDroid/src/main/res/values/constants.xml b/AnkiDroid/src/main/res/values/constants.xml
index 7c3d8bc94f29..66433832cae2 100644
--- a/AnkiDroid/src/main/res/values/constants.xml
+++ b/AnkiDroid/src/main/res/values/constants.xml
@@ -130,6 +130,7 @@
     <string name="link_faq_missing_media" tools:ignore="Typos">https://github.com/ankidroid/Anki-Android/wiki/FAQ#why-doesnt-my-sound-or-image-work-on-ankidroid</string>
     <string name="link_third_party_api_apps">https://github.com/ankidroid/Anki-Android/wiki/Third-Party-Apps</string>
     <string name="shared_decks_url">https://ankiweb.net/shared/decks/</string>
+    <string name="shared_deck_info">https://ankiweb.net/shared/info/</string>
     <string name="shared_decks_login_url">https://ankiweb.net/account/login</string>
     <string name="shared_decks_sign_up_url">https://ankiweb.net/account/signup</string>
     <string name="repair_deck">https://docs.ankiweb.net/#/files?id=corrupt-collections</string>
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/SharedDecksDownloadFragmentTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/SharedDecksDownloadFragmentTest.kt
new file mode 100644
index 000000000000..dc6891d80170
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/SharedDecksDownloadFragmentTest.kt
@@ -0,0 +1,43 @@
+// noinspection MissingCopyrightHeader #17351
+
+package com.ichi2.anki
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.SharedDecksDownloadFragment.Companion.getDeckPageUri
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import kotlin.test.assertNull
+
+@RunWith(AndroidJUnit4::class)
+class SharedDecksDownloadFragmentTest : RobolectricTest() {
+    @Test
+    fun `test getDeckIdFromDownloadURL with valid URL`() {
+        val url = "https://ankiweb.net/svc/shared/download-deck/1104981491?t=some-token"
+        assertEquals("1104981491", SharedDecksDownloadFragment.getDeckIdFromDownloadURL(url))
+    }
+
+    @Test
+    fun `test getDeckIdFromDownloadURL without Query Parameter`() {
+        val url = "https://ankiweb.net/svc/shared/download-deck/1104981491"
+        assertEquals("1104981491", SharedDecksDownloadFragment.getDeckIdFromDownloadURL(url))
+    }
+
+    @Test
+    fun `test getDeckIdFromDownloadURL with invalid URL`() {
+        val url = "https://ankiweb.net/svc/shared/download-deck/"
+        assertNull(SharedDecksDownloadFragment.getDeckIdFromDownloadURL(url), "Expected deckId to be null")
+    }
+
+    @Test
+    fun `test getDeckPageUri with valid deck URL`() {
+        val url = "https://ankiweb.net/svc/shared/download-deck/1104981491?t=some-token"
+        assertEquals("https://ankiweb.net/shared/info/1104981491", targetContext.getDeckPageUri(url))
+    }
+
+    @Test
+    fun `test getDeckPageUri with invalid deck URL`() {
+        val url = "https://ankiweb.net/svc/shared/download-deck/"
+        assertEquals("https://ankiweb.net/shared/decks/", targetContext.getDeckPageUri(url))
+    }
+}

From 57c1c3e98805fa891e654cfd803c6785128ea59d Mon Sep 17 00:00:00 2001
From: Arthur Milchior <arthur@milchior.fr>
Date: Mon, 17 Mar 2025 03:05:05 +0100
Subject: [PATCH 123/200] NF: adding a comment to 12-dont-translate

This is here only to ensure that adding a tag comment don't cause a
need for translation.
---
 AnkiDroid/src/main/res/values/12-dont-translate.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AnkiDroid/src/main/res/values/12-dont-translate.xml b/AnkiDroid/src/main/res/values/12-dont-translate.xml
index 6b2fa4dcd943..aa1fb3eecb32 100644
--- a/AnkiDroid/src/main/res/values/12-dont-translate.xml
+++ b/AnkiDroid/src/main/res/values/12-dont-translate.xml
@@ -20,7 +20,7 @@
     Adding or removing new line at the start/end of the string cause crowdin to require a new translation. Let's check if a comment before lead to a translation need!
     Adding this kind of XML comment does not cause the need for a new translation!
     -->
-    <string name="crowdin_second_string_to_test">
+    <string name="crowdin_second_string_to_test" comment="Changing the order of the strings didn't cause a need for a new translation. Let's add this comment; if it's not removed it means the comment didn't cause a requirement for a new translation!">
         This will be used to check that changing the order of strings does not require translation.
     </string>
     <string

From e412f45b0281ea4d3a5e3b2e7cb8f1ec4ba22b47 Mon Sep 17 00:00:00 2001
From: AnkiDroid Translations <ankidroid@ankidroid.org>
Date: Mon, 17 Mar 2025 02:03:29 +0000
Subject: [PATCH 124/200] Updated strings from Crowdin

---
 AnkiDroid/src/main/res/values-af/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-am/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-ar/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-az/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-be/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-bg/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-bn/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-ca/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-ckb/02-strings.xml    | 1 +
 AnkiDroid/src/main/res/values-cs/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-da/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-de/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-el/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-eo/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-es-rAR/02-strings.xml | 1 +
 AnkiDroid/src/main/res/values-es-rES/02-strings.xml | 1 +
 AnkiDroid/src/main/res/values-et/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-eu/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-fa/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-fi/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-fil/02-strings.xml    | 1 +
 AnkiDroid/src/main/res/values-fr/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-fy/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-ga/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-gl/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-got/02-strings.xml    | 1 +
 AnkiDroid/src/main/res/values-gu/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-heb/02-strings.xml    | 1 +
 AnkiDroid/src/main/res/values-hi/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-hr/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-hu/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-hy/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-ind/02-strings.xml    | 1 +
 AnkiDroid/src/main/res/values-is/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-it/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-iw/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-ja/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-jv/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-ka/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-kk/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-km/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-kn/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-ko/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-ku/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-ky/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-lt/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-lv/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-mk/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-ml/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-mn/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-mr/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-ms/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-my/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-nl/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-nn/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-no/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-or/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-pa/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-pl/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml | 1 +
 AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml | 1 +
 AnkiDroid/src/main/res/values-ro/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-ru/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-sat/02-strings.xml    | 1 +
 AnkiDroid/src/main/res/values-sc/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-sk/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-sl/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-sq/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-sr/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-ss/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-sv/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-sw/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-ta/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-te/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-tg/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-tgl/02-strings.xml    | 1 +
 AnkiDroid/src/main/res/values-th/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-ti/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-tn/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-tr/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-ts/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-tt/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-ug/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-uk/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-ur/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-uz/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-ve/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-vi/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-wo/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-xh/02-strings.xml     | 1 +
 AnkiDroid/src/main/res/values-yue/02-strings.xml    | 1 +
 AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml | 1 +
 AnkiDroid/src/main/res/values-zh-rTW/02-strings.xml | 1 +
 AnkiDroid/src/main/res/values-zu/02-strings.xml     | 1 +
 94 files changed, 94 insertions(+)

diff --git a/AnkiDroid/src/main/res/values-af/02-strings.xml b/AnkiDroid/src/main/res/values-af/02-strings.xml
index b7b4bed39c14..5d9855d9c89d 100644
--- a/AnkiDroid/src/main/res/values-af/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-af/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Laai pak af</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Probeer weer</string>
     <string name="cancel_download">Kanselleer aflaai</string>
     <string name="cancel_download_question_title">Kanselleer aflaai?</string>
diff --git a/AnkiDroid/src/main/res/values-am/02-strings.xml b/AnkiDroid/src/main/res/values-am/02-strings.xml
index c2a6fe35b154..509505f66399 100644
--- a/AnkiDroid/src/main/res/values-am/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-am/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Try Again</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>
diff --git a/AnkiDroid/src/main/res/values-ar/02-strings.xml b/AnkiDroid/src/main/res/values-ar/02-strings.xml
index 565293ed09e6..0166442ed229 100644
--- a/AnkiDroid/src/main/res/values-ar/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ar/02-strings.xml
@@ -265,6 +265,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">تنزيل الرزمة</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">إعادة المحاولة</string>
     <string name="cancel_download">إلغاء التنزيل</string>
     <string name="cancel_download_question_title">هل تريد إلغاء التنزيل؟</string>
diff --git a/AnkiDroid/src/main/res/values-az/02-strings.xml b/AnkiDroid/src/main/res/values-az/02-strings.xml
index 38610f3b019a..5f98aed11090 100644
--- a/AnkiDroid/src/main/res/values-az/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-az/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Try Again</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>
diff --git a/AnkiDroid/src/main/res/values-be/02-strings.xml b/AnkiDroid/src/main/res/values-be/02-strings.xml
index c4a4c981429b..4da515bb0161 100644
--- a/AnkiDroid/src/main/res/values-be/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-be/02-strings.xml
@@ -257,6 +257,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Спампаваць калоду</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Паспрабуйце яшчэ</string>
     <string name="cancel_download">Скасаваць спампоўванне</string>
     <string name="cancel_download_question_title">Скасаваць спампоўванне?</string>
diff --git a/AnkiDroid/src/main/res/values-bg/02-strings.xml b/AnkiDroid/src/main/res/values-bg/02-strings.xml
index c2c06458f33a..d51d70a778dc 100644
--- a/AnkiDroid/src/main/res/values-bg/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-bg/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Изтегляне на тесте</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Опитайте пак</string>
     <string name="cancel_download">Отмяна на изтеглянето</string>
     <string name="cancel_download_question_title">Отменяте ли изтеглянето?</string>
diff --git a/AnkiDroid/src/main/res/values-bn/02-strings.xml b/AnkiDroid/src/main/res/values-bn/02-strings.xml
index 3c5be700e9cd..09eb6153db05 100644
--- a/AnkiDroid/src/main/res/values-bn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-bn/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">ডেক ডাউনলোড করুন</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">আবার চেষ্টা করুন</string>
     <string name="cancel_download">ডাউনলোড বাতিল করুন</string>
     <string name="cancel_download_question_title">ডাউনলোড বাতিল করবেন?</string>
diff --git a/AnkiDroid/src/main/res/values-ca/02-strings.xml b/AnkiDroid/src/main/res/values-ca/02-strings.xml
index 63b078887dc8..4ce9ff33b4e4 100644
--- a/AnkiDroid/src/main/res/values-ca/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ca/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Baixar paquet</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Torneu-ho a provar</string>
     <string name="cancel_download">Cancel·lar baixada</string>
     <string name="cancel_download_question_title">Cancel·lo la baixada?</string>
diff --git a/AnkiDroid/src/main/res/values-ckb/02-strings.xml b/AnkiDroid/src/main/res/values-ckb/02-strings.xml
index 51d87f61a038..52da1ad95684 100644
--- a/AnkiDroid/src/main/res/values-ckb/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ckb/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Try Again</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>
diff --git a/AnkiDroid/src/main/res/values-cs/02-strings.xml b/AnkiDroid/src/main/res/values-cs/02-strings.xml
index 71b0ce8a5ea0..5c7ea0c330da 100644
--- a/AnkiDroid/src/main/res/values-cs/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-cs/02-strings.xml
@@ -257,6 +257,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Stáhnout balíček</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Zkusit znovu</string>
     <string name="cancel_download">Zrušit stahování</string>
     <string name="cancel_download_question_title">Zrušit stahování?</string>
diff --git a/AnkiDroid/src/main/res/values-da/02-strings.xml b/AnkiDroid/src/main/res/values-da/02-strings.xml
index edc52f998108..6475ae4cf783 100644
--- a/AnkiDroid/src/main/res/values-da/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-da/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Try Again</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>
diff --git a/AnkiDroid/src/main/res/values-de/02-strings.xml b/AnkiDroid/src/main/res/values-de/02-strings.xml
index 9a5086c241c2..4b68753a14b5 100644
--- a/AnkiDroid/src/main/res/values-de/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-de/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s %%</string>
     <string name="download_deck">Stapel herunterladen</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Erneut versuchen</string>
     <string name="cancel_download">Herunterladen abbrechen</string>
     <string name="cancel_download_question_title">Herunterladen abbrechen?</string>
diff --git a/AnkiDroid/src/main/res/values-el/02-strings.xml b/AnkiDroid/src/main/res/values-el/02-strings.xml
index 76ee19d7b598..7cc8c8017b6a 100644
--- a/AnkiDroid/src/main/res/values-el/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-el/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Λήψη τράπουλας</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Προσπαθήστε ξανά</string>
     <string name="cancel_download">Ακύρωση λήψης</string>
     <string name="cancel_download_question_title">Ακύρωση λήψης?</string>
diff --git a/AnkiDroid/src/main/res/values-eo/02-strings.xml b/AnkiDroid/src/main/res/values-eo/02-strings.xml
index db3c1392d6ea..0a3d7257afe3 100644
--- a/AnkiDroid/src/main/res/values-eo/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-eo/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Elŝuti kartaron</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Reprovi</string>
     <string name="cancel_download">Rezigni elŝuton</string>
     <string name="cancel_download_question_title">Ĉu rezigni elŝuton?</string>
diff --git a/AnkiDroid/src/main/res/values-es-rAR/02-strings.xml b/AnkiDroid/src/main/res/values-es-rAR/02-strings.xml
index 2384629a2cfa..22ce73cb805f 100644
--- a/AnkiDroid/src/main/res/values-es-rAR/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-es-rAR/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Descargar mazo</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Inténtalo de nuevo</string>
     <string name="cancel_download">Cancelar descarga</string>
     <string name="cancel_download_question_title">¿Cancelar descarga?</string>
diff --git a/AnkiDroid/src/main/res/values-es-rES/02-strings.xml b/AnkiDroid/src/main/res/values-es-rES/02-strings.xml
index 82290c5b3ae8..9ee1842880b0 100644
--- a/AnkiDroid/src/main/res/values-es-rES/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-es-rES/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Descargar mazo</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Inténtalo de nuevo</string>
     <string name="cancel_download">Cancelar descarga</string>
     <string name="cancel_download_question_title">¿Cancelar descarga?</string>
diff --git a/AnkiDroid/src/main/res/values-et/02-strings.xml b/AnkiDroid/src/main/res/values-et/02-strings.xml
index 0abf47c5ef2c..8b6bc87b548b 100644
--- a/AnkiDroid/src/main/res/values-et/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-et/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Try Again</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>
diff --git a/AnkiDroid/src/main/res/values-eu/02-strings.xml b/AnkiDroid/src/main/res/values-eu/02-strings.xml
index c6f1ce3c67e8..a7cd8b76e0fa 100644
--- a/AnkiDroid/src/main/res/values-eu/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-eu/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Try Again</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>
diff --git a/AnkiDroid/src/main/res/values-fa/02-strings.xml b/AnkiDroid/src/main/res/values-fa/02-strings.xml
index 5add67c79d36..d250c38827ad 100644
--- a/AnkiDroid/src/main/res/values-fa/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fa/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">دانلود دسته</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">دوباره تلاش کنید</string>
     <string name="cancel_download">لغو دانلود</string>
     <string name="cancel_download_question_title">لغو دانلود؟</string>
diff --git a/AnkiDroid/src/main/res/values-fi/02-strings.xml b/AnkiDroid/src/main/res/values-fi/02-strings.xml
index 4c8e7c66ed18..c85a86f3b9bf 100644
--- a/AnkiDroid/src/main/res/values-fi/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fi/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Lataa pakka</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Yritä uudelleen</string>
     <string name="cancel_download">Peruuta lataus</string>
     <string name="cancel_download_question_title">Peruutetaanko lataus?</string>
diff --git a/AnkiDroid/src/main/res/values-fil/02-strings.xml b/AnkiDroid/src/main/res/values-fil/02-strings.xml
index d7d3ebf6f779..b58e879fb203 100644
--- a/AnkiDroid/src/main/res/values-fil/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fil/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">I-download ang deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Subukang muli</string>
     <string name="cancel_download">Kanselahin ang Pag-download</string>
     <string name="cancel_download_question_title">Kanselahin ang pag-download?</string>
diff --git a/AnkiDroid/src/main/res/values-fr/02-strings.xml b/AnkiDroid/src/main/res/values-fr/02-strings.xml
index a430034d98cb..e7bd59bf4f2b 100644
--- a/AnkiDroid/src/main/res/values-fr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fr/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s %%</string>
     <string name="download_deck">Télécharger le paquet</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Réessayer</string>
     <string name="cancel_download">Annuler le téléchargement</string>
     <string name="cancel_download_question_title">Annuler le téléchargement ?</string>
diff --git a/AnkiDroid/src/main/res/values-fy/02-strings.xml b/AnkiDroid/src/main/res/values-fy/02-strings.xml
index 6ae640061210..315d7866298b 100644
--- a/AnkiDroid/src/main/res/values-fy/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fy/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Try Again</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>
diff --git a/AnkiDroid/src/main/res/values-ga/02-strings.xml b/AnkiDroid/src/main/res/values-ga/02-strings.xml
index 5fe286b30389..07ee1b8d7617 100644
--- a/AnkiDroid/src/main/res/values-ga/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ga/02-strings.xml
@@ -261,6 +261,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Try Again</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>
diff --git a/AnkiDroid/src/main/res/values-gl/02-strings.xml b/AnkiDroid/src/main/res/values-gl/02-strings.xml
index 1f612c0fd92d..35f3bff39616 100644
--- a/AnkiDroid/src/main/res/values-gl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-gl/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Try Again</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>
diff --git a/AnkiDroid/src/main/res/values-got/02-strings.xml b/AnkiDroid/src/main/res/values-got/02-strings.xml
index 6795a8d34c13..7639768d9c55 100644
--- a/AnkiDroid/src/main/res/values-got/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-got/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Try Again</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>
diff --git a/AnkiDroid/src/main/res/values-gu/02-strings.xml b/AnkiDroid/src/main/res/values-gu/02-strings.xml
index 1e51aa6f1b29..55298b7b52b6 100644
--- a/AnkiDroid/src/main/res/values-gu/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-gu/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">ડેક ડાઉનલોડ કરો</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">ફરીથી પ્રયત્ન કરો</string>
     <string name="cancel_download">ડાઉનલોડ રદ કરો</string>
     <string name="cancel_download_question_title">ડાઉનલોડ રદ કરીએ?</string>
diff --git a/AnkiDroid/src/main/res/values-heb/02-strings.xml b/AnkiDroid/src/main/res/values-heb/02-strings.xml
index 6ae33a3f9ef8..299c8b702455 100644
--- a/AnkiDroid/src/main/res/values-heb/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-heb/02-strings.xml
@@ -257,6 +257,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">הורדת חפיסה</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">נסה שוב</string>
     <string name="cancel_download">בטל הורדה</string>
     <string name="cancel_download_question_title">בטל הורדה?</string>
diff --git a/AnkiDroid/src/main/res/values-hi/02-strings.xml b/AnkiDroid/src/main/res/values-hi/02-strings.xml
index edccb1cc3c29..057e5394147f 100644
--- a/AnkiDroid/src/main/res/values-hi/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-hi/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">डेक डाउनलोड करें</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">पुन: प्रयास करें</string>
     <string name="cancel_download">डाउनलोड रद्द करें</string>
     <string name="cancel_download_question_title">डाउनलोड रद्द करें?</string>
diff --git a/AnkiDroid/src/main/res/values-hr/02-strings.xml b/AnkiDroid/src/main/res/values-hr/02-strings.xml
index cdfb2c18a2a0..525bc25f38bd 100644
--- a/AnkiDroid/src/main/res/values-hr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-hr/02-strings.xml
@@ -253,6 +253,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Try Again</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>
diff --git a/AnkiDroid/src/main/res/values-hu/02-strings.xml b/AnkiDroid/src/main/res/values-hu/02-strings.xml
index 2a2db7ee8081..d69c054d997c 100644
--- a/AnkiDroid/src/main/res/values-hu/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-hu/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Pakli letöltése</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Próbáld újra</string>
     <string name="cancel_download">Letöltés megszakítása</string>
     <string name="cancel_download_question_title">Letöltés megszakítása?</string>
diff --git a/AnkiDroid/src/main/res/values-hy/02-strings.xml b/AnkiDroid/src/main/res/values-hy/02-strings.xml
index f163451aa1ae..0a69ffed1535 100644
--- a/AnkiDroid/src/main/res/values-hy/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-hy/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Try Again</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>
diff --git a/AnkiDroid/src/main/res/values-ind/02-strings.xml b/AnkiDroid/src/main/res/values-ind/02-strings.xml
index dbf325ac3bb0..dca3bd8144c5 100644
--- a/AnkiDroid/src/main/res/values-ind/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ind/02-strings.xml
@@ -245,6 +245,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Unduh dek</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Coba Lagi</string>
     <string name="cancel_download">Batalkan pengunduhan</string>
     <string name="cancel_download_question_title">Batalkan pengunduhan?</string>
diff --git a/AnkiDroid/src/main/res/values-is/02-strings.xml b/AnkiDroid/src/main/res/values-is/02-strings.xml
index c2a6fe35b154..509505f66399 100644
--- a/AnkiDroid/src/main/res/values-is/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-is/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Try Again</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>
diff --git a/AnkiDroid/src/main/res/values-it/02-strings.xml b/AnkiDroid/src/main/res/values-it/02-strings.xml
index 1d6566742efc..e8be82bf11ab 100644
--- a/AnkiDroid/src/main/res/values-it/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-it/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Scarica il mazzo</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Riprova</string>
     <string name="cancel_download">Annulla lo scaricamento</string>
     <string name="cancel_download_question_title">Annullare lo scaricamento?</string>
diff --git a/AnkiDroid/src/main/res/values-iw/02-strings.xml b/AnkiDroid/src/main/res/values-iw/02-strings.xml
index 6ae33a3f9ef8..299c8b702455 100644
--- a/AnkiDroid/src/main/res/values-iw/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-iw/02-strings.xml
@@ -257,6 +257,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">הורדת חפיסה</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">נסה שוב</string>
     <string name="cancel_download">בטל הורדה</string>
     <string name="cancel_download_question_title">בטל הורדה?</string>
diff --git a/AnkiDroid/src/main/res/values-ja/02-strings.xml b/AnkiDroid/src/main/res/values-ja/02-strings.xml
index 8fd0bed3e3fe..63b00606581a 100644
--- a/AnkiDroid/src/main/res/values-ja/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ja/02-strings.xml
@@ -245,6 +245,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">デッキをダウンロード</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">再試行</string>
     <string name="cancel_download">ダウンロードをキャンセル</string>
     <string name="cancel_download_question_title">ダウンロードをキャンセルしますか？</string>
diff --git a/AnkiDroid/src/main/res/values-jv/02-strings.xml b/AnkiDroid/src/main/res/values-jv/02-strings.xml
index 6344ffa4695e..9ef39d948fe4 100644
--- a/AnkiDroid/src/main/res/values-jv/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-jv/02-strings.xml
@@ -245,6 +245,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Try Again</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>
diff --git a/AnkiDroid/src/main/res/values-ka/02-strings.xml b/AnkiDroid/src/main/res/values-ka/02-strings.xml
index 2e2616bc6f28..296af6708cd5 100644
--- a/AnkiDroid/src/main/res/values-ka/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ka/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">დასტის ჩამოტვირთვა</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">ხელახლა სცადეთ</string>
     <string name="cancel_download">ჩამოტვირთვის გაუქმება</string>
     <string name="cancel_download_question_title">გაუქმდეს ჩამოტვირთვა?</string>
diff --git a/AnkiDroid/src/main/res/values-kk/02-strings.xml b/AnkiDroid/src/main/res/values-kk/02-strings.xml
index c2a6fe35b154..509505f66399 100644
--- a/AnkiDroid/src/main/res/values-kk/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-kk/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Try Again</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>
diff --git a/AnkiDroid/src/main/res/values-km/02-strings.xml b/AnkiDroid/src/main/res/values-km/02-strings.xml
index 1efb4edd7665..7bfe15fa7656 100644
--- a/AnkiDroid/src/main/res/values-km/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-km/02-strings.xml
@@ -245,6 +245,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">ទាញយកជាន់</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">ព្យាយាមម្ដងទៀត</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>
diff --git a/AnkiDroid/src/main/res/values-kn/02-strings.xml b/AnkiDroid/src/main/res/values-kn/02-strings.xml
index 38f668f398f0..f7ade3157057 100644
--- a/AnkiDroid/src/main/res/values-kn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-kn/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">ಡೆಕ್ ಅನ್ನು ಡೌನ್‌ಲೋಡ್ ಮಾಡಿ</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">ಮತ್ತೆ ಪ್ರಯತ್ನಿಸು</string>
     <string name="cancel_download">ಡೌನ್‌ಲೋಡ್ ರದ್ದುಮಾಡಿ</string>
     <string name="cancel_download_question_title">ಡೌನ್‌ಲೋಡ್ ರದ್ದು ಮಾಡುವುದೇ?</string>
diff --git a/AnkiDroid/src/main/res/values-ko/02-strings.xml b/AnkiDroid/src/main/res/values-ko/02-strings.xml
index c9a325bae0e8..d1251f2e1070 100644
--- a/AnkiDroid/src/main/res/values-ko/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ko/02-strings.xml
@@ -248,6 +248,7 @@ Context | Request Context    [1]</string>
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">카드 덱 다운로드하기</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">다시 시도하세요.</string>
     <string name="cancel_download">다운로드 취소</string>
     <string name="cancel_download_question_title">다운로드를 취소하시겠습니까?</string>
diff --git a/AnkiDroid/src/main/res/values-ku/02-strings.xml b/AnkiDroid/src/main/res/values-ku/02-strings.xml
index 2dbbc450b133..de86f21d4bb3 100644
--- a/AnkiDroid/src/main/res/values-ku/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ku/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Try Again</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>
diff --git a/AnkiDroid/src/main/res/values-ky/02-strings.xml b/AnkiDroid/src/main/res/values-ky/02-strings.xml
index c2a6fe35b154..509505f66399 100644
--- a/AnkiDroid/src/main/res/values-ky/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ky/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Try Again</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>
diff --git a/AnkiDroid/src/main/res/values-lt/02-strings.xml b/AnkiDroid/src/main/res/values-lt/02-strings.xml
index ddbca877d423..da4784fe9982 100644
--- a/AnkiDroid/src/main/res/values-lt/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-lt/02-strings.xml
@@ -257,6 +257,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Try Again</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>
diff --git a/AnkiDroid/src/main/res/values-lv/02-strings.xml b/AnkiDroid/src/main/res/values-lv/02-strings.xml
index 1411b824e4a9..77293a2f9eda 100644
--- a/AnkiDroid/src/main/res/values-lv/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-lv/02-strings.xml
@@ -253,6 +253,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Try Again</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>
diff --git a/AnkiDroid/src/main/res/values-mk/02-strings.xml b/AnkiDroid/src/main/res/values-mk/02-strings.xml
index c7a86c6cd020..75b196cd586d 100644
--- a/AnkiDroid/src/main/res/values-mk/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-mk/02-strings.xml
@@ -250,6 +250,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Try Again</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>
diff --git a/AnkiDroid/src/main/res/values-ml/02-strings.xml b/AnkiDroid/src/main/res/values-ml/02-strings.xml
index 760926d4599c..2e4323e58bac 100644
--- a/AnkiDroid/src/main/res/values-ml/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ml/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">വീണ്ടും ശ്രമിക്കുക</string>
     <string name="cancel_download">ഡൗൺലോഡ് റദ്ദാക്കുക</string>
     <string name="cancel_download_question_title">ഡൗൺലോഡ് റദ്ദാക്കണോ?</string>
diff --git a/AnkiDroid/src/main/res/values-mn/02-strings.xml b/AnkiDroid/src/main/res/values-mn/02-strings.xml
index 3095a3491ae3..cf7b4fdc08b6 100644
--- a/AnkiDroid/src/main/res/values-mn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-mn/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Багцыг татаж авах</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Дахин оролдох</string>
     <string name="cancel_download">Татан авалтыг цуцлах</string>
     <string name="cancel_download_question_title">Татан авалтыг цуцлах?</string>
diff --git a/AnkiDroid/src/main/res/values-mr/02-strings.xml b/AnkiDroid/src/main/res/values-mr/02-strings.xml
index b998d7c988bb..15ddcf9b33b9 100644
--- a/AnkiDroid/src/main/res/values-mr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-mr/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">डेक डाउनलोड करा</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">पुन्हा प्रयत्न करा</string>
     <string name="cancel_download">डाउनलोड रद्द करा</string>
     <string name="cancel_download_question_title">डाउनलोड रद्द करायचे?</string>
diff --git a/AnkiDroid/src/main/res/values-ms/02-strings.xml b/AnkiDroid/src/main/res/values-ms/02-strings.xml
index 4f1311784eae..452b0d1ccba5 100644
--- a/AnkiDroid/src/main/res/values-ms/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ms/02-strings.xml
@@ -245,6 +245,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Muat turun dek</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Cuba Lagi</string>
     <string name="cancel_download">Batal muat turun</string>
     <string name="cancel_download_question_title">Batal muat turun?</string>
diff --git a/AnkiDroid/src/main/res/values-my/02-strings.xml b/AnkiDroid/src/main/res/values-my/02-strings.xml
index 9d6c7482d644..f45046133624 100644
--- a/AnkiDroid/src/main/res/values-my/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-my/02-strings.xml
@@ -245,6 +245,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Try Again</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>
diff --git a/AnkiDroid/src/main/res/values-nl/02-strings.xml b/AnkiDroid/src/main/res/values-nl/02-strings.xml
index af3d16185798..36224ef3463b 100644
--- a/AnkiDroid/src/main/res/values-nl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-nl/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Set downloaden</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Probeer nogmaals</string>
     <string name="cancel_download">Annuleer download</string>
     <string name="cancel_download_question_title">Annuleer download?</string>
diff --git a/AnkiDroid/src/main/res/values-nn/02-strings.xml b/AnkiDroid/src/main/res/values-nn/02-strings.xml
index 014008444199..efba0894f6f3 100644
--- a/AnkiDroid/src/main/res/values-nn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-nn/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Hent kortleiken</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Prøv igjen</string>
     <string name="cancel_download">Avbryt nedlasting</string>
     <string name="cancel_download_question_title">Avbryt nedlasting?</string>
diff --git a/AnkiDroid/src/main/res/values-no/02-strings.xml b/AnkiDroid/src/main/res/values-no/02-strings.xml
index da30e0b8e142..6d39e644a05e 100644
--- a/AnkiDroid/src/main/res/values-no/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-no/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Prøv igjen</string>
     <string name="cancel_download">Avbryt nedlasting</string>
     <string name="cancel_download_question_title">Avbryt nedlasting?</string>
diff --git a/AnkiDroid/src/main/res/values-or/02-strings.xml b/AnkiDroid/src/main/res/values-or/02-strings.xml
index 77769b81c340..ecd2fd6cc6bd 100644
--- a/AnkiDroid/src/main/res/values-or/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-or/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">ତାସଖଣ୍ଡ ଡାଉନଲୋଡ୍ କରନ୍ତୁ</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">ପୁଣିଥରେ ଚେଷ୍ଟା କରନ୍ତୁ</string>
     <string name="cancel_download">ଡାଉନଲୋଡ୍ ବାତିଲ୍ କରନ୍ତୁ</string>
     <string name="cancel_download_question_title">ଡାଉନଲୋଡ୍ ବାତିଲ୍ କରିବେ କି?</string>
diff --git a/AnkiDroid/src/main/res/values-pa/02-strings.xml b/AnkiDroid/src/main/res/values-pa/02-strings.xml
index 6bbe93d971c5..92a0eab202b7 100644
--- a/AnkiDroid/src/main/res/values-pa/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-pa/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">ਡੇਕ ਨੂੰ ਡਾਊਨਲੋਡ ਕਰੋ</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">ਫਿਰ ਕੋਸ਼ਿਸ਼ ਕਰੋ</string>
     <string name="cancel_download">ਡਾਊਨਲੋਡ ਰੱਦ ਕਰੋ</string>
     <string name="cancel_download_question_title">ਕੀ ਡਾਊਨਲੋਡ ਰੱਦ ਕਰਨਾ ਹੈ?</string>
diff --git a/AnkiDroid/src/main/res/values-pl/02-strings.xml b/AnkiDroid/src/main/res/values-pl/02-strings.xml
index 25366c9d37ee..190548ffba19 100644
--- a/AnkiDroid/src/main/res/values-pl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-pl/02-strings.xml
@@ -257,6 +257,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Pobierz talię</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Spróbuj ponownie</string>
     <string name="cancel_download">Anuluj pobieranie</string>
     <string name="cancel_download_question_title">Anulować pobieranie?</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml b/AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml
index 3c2117a1fbd5..dbc73538903a 100644
--- a/AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Baixar baralho</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Tentar Novamente</string>
     <string name="cancel_download">Cancelar download</string>
     <string name="cancel_download_question_title">Cancelar download?</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml b/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml
index 6147e005271f..f548715472fb 100644
--- a/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Transferir baralho</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Tentar novamente</string>
     <string name="cancel_download">Cancelar transferência</string>
     <string name="cancel_download_question_title">Cancelar transferência?</string>
diff --git a/AnkiDroid/src/main/res/values-ro/02-strings.xml b/AnkiDroid/src/main/res/values-ro/02-strings.xml
index 62e019ab1d42..92591a5a3883 100644
--- a/AnkiDroid/src/main/res/values-ro/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ro/02-strings.xml
@@ -253,6 +253,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Try Again</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>
diff --git a/AnkiDroid/src/main/res/values-ru/02-strings.xml b/AnkiDroid/src/main/res/values-ru/02-strings.xml
index 5d9c11f14e56..407becb0ed5a 100644
--- a/AnkiDroid/src/main/res/values-ru/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ru/02-strings.xml
@@ -257,6 +257,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Скачать колоду</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Попробуйте ещё раз</string>
     <string name="cancel_download">Отменить загрузку</string>
     <string name="cancel_download_question_title">Отменить загрузку?</string>
diff --git a/AnkiDroid/src/main/res/values-sat/02-strings.xml b/AnkiDroid/src/main/res/values-sat/02-strings.xml
index a1cb5ce5adda..bd311f5ef7aa 100644
--- a/AnkiDroid/src/main/res/values-sat/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sat/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">ᱰᱮᱠ ᱰᱟᱩᱱᱞᱳᱰ ᱢᱮ</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">ᱟᱨᱢᱤᱫ ᱫᱷᱟᱣ ᱪᱮᱥᱴᱟᱭ ᱢᱮ</string>
     <string name="cancel_download">ᱰᱟᱩᱱᱞᱳᱰ ᱵᱟᱹᱛᱤᱞ ᱢᱮ</string>
     <string name="cancel_download_question_title">ᱰᱟᱩᱱᱞᱳᱰ ᱵᱟᱹᱛᱤᱞᱟᱢ ?</string>
diff --git a/AnkiDroid/src/main/res/values-sc/02-strings.xml b/AnkiDroid/src/main/res/values-sc/02-strings.xml
index 998638e7a8e6..c360e9e1200a 100644
--- a/AnkiDroid/src/main/res/values-sc/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sc/02-strings.xml
@@ -252,6 +252,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Iscàrriga su matzu</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Torra a proare</string>
     <string name="cancel_download">Annulla s\'iscarrigamentu</string>
     <string name="cancel_download_question_title">Annullare s\'iscarrigamentu?</string>
diff --git a/AnkiDroid/src/main/res/values-sk/02-strings.xml b/AnkiDroid/src/main/res/values-sk/02-strings.xml
index 8384227ef25f..293336a41d17 100644
--- a/AnkiDroid/src/main/res/values-sk/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sk/02-strings.xml
@@ -257,6 +257,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Stiahnuť balíček</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Skúsiť znovu</string>
     <string name="cancel_download">Zrušiť sťahovanie</string>
     <string name="cancel_download_question_title">Zrušiť sťahovanie?</string>
diff --git a/AnkiDroid/src/main/res/values-sl/02-strings.xml b/AnkiDroid/src/main/res/values-sl/02-strings.xml
index 98daf148c909..25f2b99f843d 100644
--- a/AnkiDroid/src/main/res/values-sl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sl/02-strings.xml
@@ -257,6 +257,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Try Again</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>
diff --git a/AnkiDroid/src/main/res/values-sq/02-strings.xml b/AnkiDroid/src/main/res/values-sq/02-strings.xml
index 097abd4b8461..db7381d4d795 100644
--- a/AnkiDroid/src/main/res/values-sq/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sq/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Try Again</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>
diff --git a/AnkiDroid/src/main/res/values-sr/02-strings.xml b/AnkiDroid/src/main/res/values-sr/02-strings.xml
index a94b6227c402..ff220d215e38 100644
--- a/AnkiDroid/src/main/res/values-sr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sr/02-strings.xml
@@ -253,6 +253,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Try Again</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>
diff --git a/AnkiDroid/src/main/res/values-ss/02-strings.xml b/AnkiDroid/src/main/res/values-ss/02-strings.xml
index c2a6fe35b154..509505f66399 100644
--- a/AnkiDroid/src/main/res/values-ss/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ss/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Try Again</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>
diff --git a/AnkiDroid/src/main/res/values-sv/02-strings.xml b/AnkiDroid/src/main/res/values-sv/02-strings.xml
index b7d434fe2f1a..4cf63da0d96d 100644
--- a/AnkiDroid/src/main/res/values-sv/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sv/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Hämta kortlek</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Försök igen</string>
     <string name="cancel_download">Avbryt hämtning</string>
     <string name="cancel_download_question_title">Avbryt hämtning?</string>
diff --git a/AnkiDroid/src/main/res/values-sw/02-strings.xml b/AnkiDroid/src/main/res/values-sw/02-strings.xml
index c2a6fe35b154..509505f66399 100644
--- a/AnkiDroid/src/main/res/values-sw/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sw/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Try Again</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>
diff --git a/AnkiDroid/src/main/res/values-ta/02-strings.xml b/AnkiDroid/src/main/res/values-ta/02-strings.xml
index 1104b65d84f5..d200c96aed65 100644
--- a/AnkiDroid/src/main/res/values-ta/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ta/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">டவுன்லோட் டெக்</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">மீண்டும் முயற்சிக்கவும்</string>
     <string name="cancel_download">பதிவிறக்கத்தை ரத்துசெய்</string>
     <string name="cancel_download_question_title">பதிவிறக்கத்தை ரத்துசெய்யவா?</string>
diff --git a/AnkiDroid/src/main/res/values-te/02-strings.xml b/AnkiDroid/src/main/res/values-te/02-strings.xml
index aafbfe70d69e..2c0a1727d606 100644
--- a/AnkiDroid/src/main/res/values-te/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-te/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">డౌన్‌లోడ్ డెక్</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">మళ్లీ ప్రయత్నించండి</string>
     <string name="cancel_download">డౌన్‌లోడ్ రద్దు చేయండి</string>
     <string name="cancel_download_question_title">డౌన్‌లోడ్ రద్దు చేయండి?</string>
diff --git a/AnkiDroid/src/main/res/values-tg/02-strings.xml b/AnkiDroid/src/main/res/values-tg/02-strings.xml
index c2a6fe35b154..509505f66399 100644
--- a/AnkiDroid/src/main/res/values-tg/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tg/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Try Again</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>
diff --git a/AnkiDroid/src/main/res/values-tgl/02-strings.xml b/AnkiDroid/src/main/res/values-tgl/02-strings.xml
index 62b563d5e627..29d8d31cbb88 100644
--- a/AnkiDroid/src/main/res/values-tgl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tgl/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Try Again</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>
diff --git a/AnkiDroid/src/main/res/values-th/02-strings.xml b/AnkiDroid/src/main/res/values-th/02-strings.xml
index 102711af4063..13fe654e2012 100644
--- a/AnkiDroid/src/main/res/values-th/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-th/02-strings.xml
@@ -245,6 +245,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Try Again</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>
diff --git a/AnkiDroid/src/main/res/values-ti/02-strings.xml b/AnkiDroid/src/main/res/values-ti/02-strings.xml
index c2a6fe35b154..509505f66399 100644
--- a/AnkiDroid/src/main/res/values-ti/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ti/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Try Again</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>
diff --git a/AnkiDroid/src/main/res/values-tn/02-strings.xml b/AnkiDroid/src/main/res/values-tn/02-strings.xml
index c2a6fe35b154..509505f66399 100644
--- a/AnkiDroid/src/main/res/values-tn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tn/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Try Again</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>
diff --git a/AnkiDroid/src/main/res/values-tr/02-strings.xml b/AnkiDroid/src/main/res/values-tr/02-strings.xml
index 2f72abab36a1..eacacbdef374 100644
--- a/AnkiDroid/src/main/res/values-tr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tr/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Deste indir</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Tekrar dene</string>
     <string name="cancel_download">İndirmeyi iptal et</string>
     <string name="cancel_download_question_title">İndirmeyi iptal et?</string>
diff --git a/AnkiDroid/src/main/res/values-ts/02-strings.xml b/AnkiDroid/src/main/res/values-ts/02-strings.xml
index c2a6fe35b154..509505f66399 100644
--- a/AnkiDroid/src/main/res/values-ts/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ts/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Try Again</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>
diff --git a/AnkiDroid/src/main/res/values-tt/02-strings.xml b/AnkiDroid/src/main/res/values-tt/02-strings.xml
index 43081719cf60..35a62dc1d33a 100644
--- a/AnkiDroid/src/main/res/values-tt/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tt/02-strings.xml
@@ -246,6 +246,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Янәдән тырышып карагыз</string>
     <string name="cancel_download">Йөкләүдән баш тарту</string>
     <string name="cancel_download_question_title">Йөкләүдән баш тартырга телисезме?</string>
diff --git a/AnkiDroid/src/main/res/values-ug/02-strings.xml b/AnkiDroid/src/main/res/values-ug/02-strings.xml
index 67e701419e03..8c3d21686006 100644
--- a/AnkiDroid/src/main/res/values-ug/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ug/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">دەستە چۈشۈر</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">قايتا سىنا</string>
     <string name="cancel_download">چۈشۈرۈشتىن ۋاز كەچ</string>
     <string name="cancel_download_question_title">چۈشۈرۈشتىن ۋاز كېچەمدۇ؟</string>
diff --git a/AnkiDroid/src/main/res/values-uk/02-strings.xml b/AnkiDroid/src/main/res/values-uk/02-strings.xml
index bc1656cbec5e..b85212bbb496 100644
--- a/AnkiDroid/src/main/res/values-uk/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-uk/02-strings.xml
@@ -257,6 +257,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Завантажити колоду</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Спробувати ще раз</string>
     <string name="cancel_download">Скасувати завантаження</string>
     <string name="cancel_download_question_title">Скасувати завантаження?</string>
diff --git a/AnkiDroid/src/main/res/values-ur/02-strings.xml b/AnkiDroid/src/main/res/values-ur/02-strings.xml
index 6e983fa898b4..1fea5c281be0 100644
--- a/AnkiDroid/src/main/res/values-ur/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ur/02-strings.xml
@@ -250,6 +250,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">ڈیک ڈاؤن لوڈ کریں۔</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">دوبارہ کوشش کریں</string>
     <string name="cancel_download">ڈاؤن لوڈ منسوخ کریں۔</string>
     <string name="cancel_download_question_title">ڈاؤن لوڈ منسوخ کریں؟</string>
diff --git a/AnkiDroid/src/main/res/values-uz/02-strings.xml b/AnkiDroid/src/main/res/values-uz/02-strings.xml
index 23dfdbdf156c..0d3a9683f043 100644
--- a/AnkiDroid/src/main/res/values-uz/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-uz/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Try Again</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>
diff --git a/AnkiDroid/src/main/res/values-ve/02-strings.xml b/AnkiDroid/src/main/res/values-ve/02-strings.xml
index c2a6fe35b154..509505f66399 100644
--- a/AnkiDroid/src/main/res/values-ve/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ve/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Try Again</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>
diff --git a/AnkiDroid/src/main/res/values-vi/02-strings.xml b/AnkiDroid/src/main/res/values-vi/02-strings.xml
index 8cf810a5f5d4..ad37c9459025 100644
--- a/AnkiDroid/src/main/res/values-vi/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-vi/02-strings.xml
@@ -245,6 +245,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Tải bộ thẻ xuống</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Thử lại</string>
     <string name="cancel_download">Hủy tải xuống</string>
     <string name="cancel_download_question_title">Hủy tải xuống?</string>
diff --git a/AnkiDroid/src/main/res/values-wo/02-strings.xml b/AnkiDroid/src/main/res/values-wo/02-strings.xml
index 9d6c7482d644..f45046133624 100644
--- a/AnkiDroid/src/main/res/values-wo/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-wo/02-strings.xml
@@ -245,6 +245,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Try Again</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>
diff --git a/AnkiDroid/src/main/res/values-xh/02-strings.xml b/AnkiDroid/src/main/res/values-xh/02-strings.xml
index c2a6fe35b154..509505f66399 100644
--- a/AnkiDroid/src/main/res/values-xh/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-xh/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Try Again</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>
diff --git a/AnkiDroid/src/main/res/values-yue/02-strings.xml b/AnkiDroid/src/main/res/values-yue/02-strings.xml
index 34c98ec442be..3fa0e9477af6 100644
--- a/AnkiDroid/src/main/res/values-yue/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-yue/02-strings.xml
@@ -245,6 +245,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Try Again</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>
diff --git a/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml b/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml
index c5ffeae6e451..6ba0ee5eb9a6 100644
--- a/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml
@@ -245,6 +245,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">下载牌组</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">再试一次</string>
     <string name="cancel_download">取消下载</string>
     <string name="cancel_download_question_title">是否取消下载？</string>
diff --git a/AnkiDroid/src/main/res/values-zh-rTW/02-strings.xml b/AnkiDroid/src/main/res/values-zh-rTW/02-strings.xml
index 9b2bf8d97327..56e734c01076 100644
--- a/AnkiDroid/src/main/res/values-zh-rTW/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-zh-rTW/02-strings.xml
@@ -245,6 +245,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">下載牌組</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">再試一次</string>
     <string name="cancel_download">取消下載</string>
     <string name="cancel_download_question_title">取消下載？</string>
diff --git a/AnkiDroid/src/main/res/values-zu/02-strings.xml b/AnkiDroid/src/main/res/values-zu/02-strings.xml
index c2a6fe35b154..509505f66399 100644
--- a/AnkiDroid/src/main/res/values-zu/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-zu/02-strings.xml
@@ -249,6 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
     <string name="try_again">Try Again</string>
     <string name="cancel_download">Cancel download</string>
     <string name="cancel_download_question_title">Cancel download?</string>

From 084fc11207b7002fbf4e35dc677b78e3ba4bb2e5 Mon Sep 17 00:00:00 2001
From: Arthur Milchior <arthur@milchior.fr>
Date: Sun, 16 Mar 2025 16:15:17 +0100
Subject: [PATCH 125/200] NF: rename `modelId` to `noteTypeId`

It's done everywhere except in the key of intents
---
 .../java/com/ichi2/anki/CardTemplateEditor.kt | 20 +++++++++----------
 .../com/ichi2/anki/CardTemplateNotetype.kt    |  2 +-
 .../main/java/com/ichi2/anki/NoteEditor.kt    |  4 ++--
 .../impl/MultimediaEditableNote.kt            |  2 +-
 .../ichi2/anki/servicelayer/NoteService.kt    |  8 ++++----
 .../main/java/com/ichi2/libanki/Notetypes.kt  | 12 +++++------
 .../java/com/ichi2/anki/api/AddContentApi.kt  | 10 +++++-----
 7 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateEditor.kt b/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateEditor.kt
index a8f52ef2f896..5d65dff94f9e 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateEditor.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateEditor.kt
@@ -128,7 +128,7 @@ open class CardTemplateEditor :
     var tempModel: CardTemplateNotetype? = null
         private set
     private var fieldNames: List<String>? = null
-    private var modelId: NoteTypeId = 0
+    private var noteTypeId: NoteTypeId = 0
     private var noteId: NoteId = 0
 
     // the position of the cursor in the editor view
@@ -170,8 +170,8 @@ open class CardTemplateEditor :
         // Load the args either from the intent or savedInstanceState bundle
         if (savedInstanceState == null) {
             // get model id
-            modelId = intent.getLongExtra(EDITOR_NOTE_TYPE_ID, NOT_FOUND_NOTE_TYPE)
-            if (modelId == NOT_FOUND_NOTE_TYPE) {
+            noteTypeId = intent.getLongExtra(EDITOR_NOTE_TYPE_ID, NOT_FOUND_NOTE_TYPE)
+            if (noteTypeId == NOT_FOUND_NOTE_TYPE) {
                 Timber.e("CardTemplateEditor :: no model ID was provided")
                 finish()
                 return
@@ -183,7 +183,7 @@ open class CardTemplateEditor :
             tabToCursorPosition[0] = 0
             tabToViewId[0] = R.id.front_edit
         } else {
-            modelId = savedInstanceState.getLong(EDITOR_NOTE_TYPE_ID)
+            noteTypeId = savedInstanceState.getLong(EDITOR_NOTE_TYPE_ID)
             noteId = savedInstanceState.getLong(EDITOR_NOTE_ID)
             startingOrdId = savedInstanceState.getInt(EDITOR_START_ORD_ID)
             tabToCursorPosition = savedInstanceState.getSerializableCompat<HashMap<Int, Int?>>(TAB_TO_CURSOR_POSITION_KEY)!!
@@ -244,7 +244,7 @@ open class CardTemplateEditor :
     public override fun onSaveInstanceState(outState: Bundle) {
         with(outState) {
             tempModel?.let { putAll(it.toBundle()) }
-            putLong(EDITOR_NOTE_TYPE_ID, modelId)
+            putLong(EDITOR_NOTE_TYPE_ID, noteTypeId)
             putLong(EDITOR_NOTE_ID, noteId)
             putInt(EDITOR_START_ORD_ID, startingOrdId)
             putSerializable(TAB_TO_VIEW_ID, tabToViewId)
@@ -273,7 +273,7 @@ open class CardTemplateEditor :
         // The first time the activity loads it has a model id but no edits yet, so no edited model
         // take the passed model id load it up for editing
         if (tempModel == null) {
-            tempModel = CardTemplateNotetype(NotetypeJson(col.notetypes.get(modelId).toString()))
+            tempModel = CardTemplateNotetype(NotetypeJson(col.notetypes.get(noteTypeId).toString()))
             // Timber.d("onCollectionLoaded() model is %s", mTempModel.getModel().toString(2));
         }
         fieldNames = tempModel!!.notetype.fieldsNames
@@ -289,7 +289,7 @@ open class CardTemplateEditor :
             it.subtitle = tempModel!!.notetype.optString("name")
         }
         // Close collection opening dialog if needed
-        Timber.i("CardTemplateEditor:: Card template editor successfully started for model id %d", modelId)
+        Timber.i("CardTemplateEditor:: Card template editor successfully started for model id %d", noteTypeId)
 
         // Set the tab to the current template if an ord id was provided
         Timber.d("Setting starting tab to %d", startingOrdId)
@@ -299,7 +299,7 @@ open class CardTemplateEditor :
     }
 
     fun modelHasChanged(): Boolean {
-        val oldModel: NotetypeJson? = getColUnsafe.notetypes.get(modelId)
+        val oldModel: NotetypeJson? = getColUnsafe.notetypes.get(noteTypeId)
         return tempModel != null && tempModel!!.notetype.toString() != oldModel.toString()
     }
 
@@ -890,7 +890,7 @@ open class CardTemplateEditor :
 
         @NeedsTest("Notetype is restored to stock kind")
         private suspend fun restoreNotetypeToStock(kind: StockNotetype.Kind? = null) {
-            val nid = notetypeId { ntid = tempModel.modelId }
+            val nid = notetypeId { ntid = tempModel.noteTypeId }
             undoableOp { restoreNotetypeToStock(nid, kind) }
             onModelSaved()
             showThemedToast(
@@ -1129,7 +1129,7 @@ open class CardTemplateEditor :
             // pending deletes could orphan cards
             if (!CardTemplateNotetype.isOrdinalPendingAdd(tempModel!!, position)) {
                 val currentDeletes = tempModel.getDeleteDbOrds(position)
-                val cardIds = withCol { notetypes.getCardIdsForModel(tempModel.modelId, currentDeletes) }
+                val cardIds = withCol { notetypes.getCardIdsForModel(tempModel.noteTypeId, currentDeletes) }
                 if (cardIds == null) {
                     // It is possible but unlikely that a user has an in-memory template addition that would
                     // generate cards making the deletion safe, but we don't handle that. All users who do
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateNotetype.kt b/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateNotetype.kt
index d03c1def563f..811513e56ecc 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateNotetype.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateNotetype.kt
@@ -70,7 +70,7 @@ class CardTemplateNotetype(
     val templateCount: Int
         get() = notetype.tmpls.length()
 
-    val modelId: NoteTypeId
+    val noteTypeId: NoteTypeId
         get() = notetype.getLong("id")
 
     fun updateCss(css: String?) {
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt b/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt
index 28eec339fc11..834117521336 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt
@@ -2587,8 +2587,8 @@ class NoteEditor :
     private val currentlySelectedNotetype: NotetypeJson?
         get() =
             noteTypeSpinner?.selectedItemPosition?.let { position ->
-                allModelIds?.get(position)?.let { modelId ->
-                    getColUnsafe.notetypes.get(modelId)
+                allModelIds?.get(position)?.let { noteTypeId ->
+                    getColUnsafe.notetypes.get(noteTypeId)
                 }
             }
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/impl/MultimediaEditableNote.kt b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/impl/MultimediaEditableNote.kt
index 6d8658c921dd..20fccadcc47c 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/impl/MultimediaEditableNote.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/impl/MultimediaEditableNote.kt
@@ -34,7 +34,7 @@ class MultimediaEditableNote : IMultimediaEditableNote {
     override var isModified = false
         private set
     private var fields: ArrayList<IField?>? = null
-    var modelId: NoteTypeId = 0
+    var noteTypeId: NoteTypeId = 0
 
     /**
      * Field values in the note editor, before any editing has taken place
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/NoteService.kt b/AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/NoteService.kt
index 9ebd67b25bd7..41f03de28203 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/NoteService.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/NoteService.kt
@@ -66,7 +66,7 @@ object NoteService {
                     }
                 note.setField(i, uiTextField)
             }
-            note.modelId = model.getLong("id")
+            note.noteTypeId = model.getLong("id")
         } catch (e: JSONException) {
             Timber.w(e, "Error parsing model: %s", model)
             // Return note with default/empty fields
@@ -77,7 +77,7 @@ object NoteService {
     fun updateMultimediaNoteFromFields(
         col: Collection,
         fields: Array<String>,
-        modelId: NoteTypeId,
+        noteTypeId: NoteTypeId,
         mmNote: MultimediaEditableNote,
     ) {
         for (i in fields.indices) {
@@ -95,7 +95,7 @@ object NoteService {
             field.setFormattedString(col, value)
             mmNote.setField(i, field)
         }
-        mmNote.modelId = modelId
+        mmNote.noteTypeId = noteTypeId
         mmNote.freezeInitialFieldValues()
         // TODO: set current id of the note as well
     }
@@ -112,7 +112,7 @@ object NoteService {
         editorNoteDst: Note,
     ) {
         if (noteSrc is MultimediaEditableNote) {
-            if (noteSrc.modelId != editorNoteDst.noteTypeId) {
+            if (noteSrc.noteTypeId != editorNoteDst.noteTypeId) {
                 throw RuntimeException("Source and Destination Note ID do not match.")
             }
             val totalFields: Int = noteSrc.numberOfFields
diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/Notetypes.kt b/AnkiDroid/src/main/java/com/ichi2/libanki/Notetypes.kt
index 118de2c42ff2..946b054869c0 100644
--- a/AnkiDroid/src/main/java/com/ichi2/libanki/Notetypes.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/libanki/Notetypes.kt
@@ -659,30 +659,30 @@ class Notetypes(
      * This method will either give you all the card ids for the ordinals sent in related to the model sent in *or*
      * it will return null if the result of deleting the ordinals is unsafe because it would leave notes with no cards
      *
-     * @param modelId long id of the JSON model
+     * @param noteTypeId long id of the JSON model
      * @param ords array of ints, each one is the ordinal a the card template in the given model
      * @return null if deleting ords would orphan notes, long[] of related card ids to delete if it is safe
      */
     @Suppress("ktlint:standard:max-line-length")
     fun getCardIdsForModel(
-        modelId: NoteTypeId,
+        noteTypeId: NoteTypeId,
         ords: IntArray,
     ): List<Long>? {
         val cardIdsToDeleteSql =
             "select c2.id from cards c2, notes n2 where c2.nid=n2.id and n2.mid = ? and c2.ord  in ${Utils.ids2str(ords)}"
-        val cids: List<Long> = col.db.queryLongList(cardIdsToDeleteSql, modelId)
+        val cids: List<Long> = col.db.queryLongList(cardIdsToDeleteSql, noteTypeId)
         // Timber.d("cardIdsToDeleteSql was ' %s' and got %s", cardIdsToDeleteSql, Utils.ids2str(cids));
-        Timber.d("getCardIdsForModel found %s cards to delete for model %s and ords %s", cids.size, modelId, Utils.ids2str(ords))
+        Timber.d("getCardIdsForModel found %s cards to delete for model %s and ords %s", cids.size, noteTypeId, Utils.ids2str(ords))
 
         // all notes with this template must have at least two cards, or we could end up creating orphaned notes
         val noteCountPreDeleteSql = "select count(distinct(nid)) from cards where nid in (select id from notes where mid = ?)"
-        val preDeleteNoteCount: Int = col.db.queryScalar(noteCountPreDeleteSql, modelId)
+        val preDeleteNoteCount: Int = col.db.queryScalar(noteCountPreDeleteSql, noteTypeId)
         Timber.d("noteCountPreDeleteSql was '%s'", noteCountPreDeleteSql)
         Timber.d("preDeleteNoteCount is %s", preDeleteNoteCount)
         val noteCountPostDeleteSql =
             "select count(distinct(nid)) from cards where nid in (select id from notes where mid = ?) and ord not in ${Utils.ids2str(ords)}"
         Timber.d("noteCountPostDeleteSql was '%s'", noteCountPostDeleteSql)
-        val postDeleteNoteCount: Int = col.db.queryScalar(noteCountPostDeleteSql, modelId)
+        val postDeleteNoteCount: Int = col.db.queryScalar(noteCountPostDeleteSql, noteTypeId)
         Timber.d("postDeleteNoteCount would be %s", postDeleteNoteCount)
         if (preDeleteNoteCount != postDeleteNoteCount) {
             Timber.d("There will be orphan notes if these cards are deleted.")
diff --git a/api/src/main/java/com/ichi2/anki/api/AddContentApi.kt b/api/src/main/java/com/ichi2/anki/api/AddContentApi.kt
index 0ce9670eb14d..0a0fddbcc469 100644
--- a/api/src/main/java/com/ichi2/anki/api/AddContentApi.kt
+++ b/api/src/main/java/com/ichi2/anki/api/AddContentApi.kt
@@ -154,14 +154,14 @@ public class AddContentApi(
      *
      * Example usage:
      * ```
-     *     Long modelId = getModelId(); // implementation can be seen in api sample app
+     *     Long noteTypeId = getModelId(); // implementation can be seen in api sample app
      *     Long deckId = getDeckId(); // as above
      *     Set<String> tags = getTags(); // as above
      *     Uri fileUri = ... // this will be returned by a File Picker activity where we select an image file
      *     String addedImageFileName = mApi.addMediaFromUri(fileUri, "My_Image_File", "image");
      *
      *     String[] fields = new String[] {"text on front of card", "text on back of card " + addedImageFileName};
-     *     mApi.addNote(modelId, deckId, fields, tags)
+     *     mApi.addNote(noteTypeId, deckId, fields, tags)
      * ```
      *
      * @param fileUri   Uri for the file to be added, required.
@@ -480,13 +480,13 @@ public class AddContentApi(
         val models: MutableMap<Long, String> = HashMap()
         allModelsQuery.use { allModelsCursor ->
             while (allModelsCursor.moveToNext()) {
-                val modelId = allModelsCursor.getLong(allModelsCursor.getColumnIndex(Model._ID))
+                val noteTypeId = allModelsCursor.getLong(allModelsCursor.getColumnIndex(Model._ID))
                 val name = allModelsCursor.getString(allModelsCursor.getColumnIndex(Model.NAME))
                 val flds =
                     allModelsCursor.getString(allModelsCursor.getColumnIndex(Model.FIELD_NAMES))
                 val numFlds: Int = Utils.splitFields(flds).size
                 if (numFlds >= minNumFields) {
-                    models[modelId] = name
+                    models[noteTypeId] = name
                 }
             }
         }
@@ -626,7 +626,7 @@ public class AddContentApi(
         /**
          * Query all notes for a given model
          * @param modelId the model ID to limit query to
-         * @return a cursor with all notes matching modelId
+         * @return a cursor with all notes matching noteTypeId
          */
         fun queryNotes(modelId: Long): Cursor?
 

From 7631a1da696d8dfb577178b10e6905b58f420f71 Mon Sep 17 00:00:00 2001
From: Arthur Milchior <arthur@milchior.fr>
Date: Sun, 16 Mar 2025 15:42:39 +0100
Subject: [PATCH 126/200] NF: Rename model to note type in unit tests

---
 .../java/com/ichi2/anki/DeckPickerTest.kt      |  2 +-
 .../java/com/ichi2/anki/PagesTest.kt           |  4 ++--
 .../com/ichi2/anki/ReviewerFragmentTest.kt     |  4 ++--
 .../java/com/ichi2/anki/ReviewerTest.kt        |  4 ++--
 ...est.kt => NoteTypeEditorContextMenuTest.kt} | 10 +++++-----
 .../ichi2/anki/tests/ContentProviderTest.kt    |  2 +-
 .../com/ichi2/anki/tests/InstrumentedTest.kt   | 12 ++++++------
 .../ichi2/anki/tests/libanki/NotetypeTest.kt   | 10 +++++-----
 .../java/com/ichi2/anki/ModelFieldEditor.kt    | 18 +++++++++---------
 ...extMenu.kt => NoteTypeEditorContextMenu.kt} | 10 +++++-----
 10 files changed, 38 insertions(+), 38 deletions(-)
 rename AnkiDroid/src/androidTest/java/com/ichi2/anki/dialogs/{ModelEditorContextMenuTest.kt => NoteTypeEditorContextMenuTest.kt} (87%)
 rename AnkiDroid/src/main/java/com/ichi2/anki/dialogs/{ModelEditorContextMenu.kt => NoteTypeEditorContextMenu.kt} (85%)

diff --git a/AnkiDroid/src/androidTest/java/com/ichi2/anki/DeckPickerTest.kt b/AnkiDroid/src/androidTest/java/com/ichi2/anki/DeckPickerTest.kt
index 0ce9bdbc0f6a..1c274932ee4c 100644
--- a/AnkiDroid/src/androidTest/java/com/ichi2/anki/DeckPickerTest.kt
+++ b/AnkiDroid/src/androidTest/java/com/ichi2/anki/DeckPickerTest.kt
@@ -49,7 +49,7 @@ class DeckPickerTest : InstrumentedTest() {
 
     @Before
     fun before() {
-        addNoteUsingBasicModel()
+        addNoteUsingBasicNoteType()
         disableIntroductionSlide()
         discardPreliminaryViews()
     }
diff --git a/AnkiDroid/src/androidTest/java/com/ichi2/anki/PagesTest.kt b/AnkiDroid/src/androidTest/java/com/ichi2/anki/PagesTest.kt
index 755d96c36352..c33c5611f3be 100644
--- a/AnkiDroid/src/androidTest/java/com/ichi2/anki/PagesTest.kt
+++ b/AnkiDroid/src/androidTest/java/com/ichi2/anki/PagesTest.kt
@@ -86,13 +86,13 @@ class PagesTest : InstrumentedTest() {
 fun PagesTest.getStatistics(context: Context): Intent = Statistics.getIntent(context)
 
 fun PagesTest.getCardInfo(context: Context): Intent =
-    addNoteUsingBasicModel().firstCard(col).let { card ->
+    addNoteUsingBasicNoteType().firstCard(col).let { card ->
         this.card = card
         CardInfoDestination(card.id).toIntent(context)
     }
 
 fun PagesTest.getCongratsPage(context: Context): Intent =
-    addNoteUsingBasicModel().firstCard(col).let { card ->
+    addNoteUsingBasicNoteType().firstCard(col).let { card ->
         this.card = card
         CardInfoDestination(card.id).toIntent(context)
     }
diff --git a/AnkiDroid/src/androidTest/java/com/ichi2/anki/ReviewerFragmentTest.kt b/AnkiDroid/src/androidTest/java/com/ichi2/anki/ReviewerFragmentTest.kt
index 20fc46f998c8..56ec6373566a 100644
--- a/AnkiDroid/src/androidTest/java/com/ichi2/anki/ReviewerFragmentTest.kt
+++ b/AnkiDroid/src/androidTest/java/com/ichi2/anki/ReviewerFragmentTest.kt
@@ -69,7 +69,7 @@ class ReviewerFragmentTest : InstrumentedTest() {
             states.good.normal.review.scheduledDays = 123;
             customData.good.c += 1;
             """
-        val note = addNoteUsingBasicModel("foo", "bar")
+        val note = addNoteUsingBasicNoteType("foo", "bar")
         val card = note.firstCard(col)
         val deck = col.decks.get(note.notetype.did)!!
         card.moveToReviewQueue()
@@ -107,7 +107,7 @@ class ReviewerFragmentTest : InstrumentedTest() {
         setNewReviewer()
         // Issue 15035 - runtime errors weren't handled
         col.cardStateCustomizer = "states.this_is_not_defined.normal.review = 12;"
-        addNoteUsingBasicModel()
+        addNoteUsingBasicNoteType()
 
         closeGetStartedScreenIfExists()
         closeBackupCollectionDialogIfExists()
diff --git a/AnkiDroid/src/androidTest/java/com/ichi2/anki/ReviewerTest.kt b/AnkiDroid/src/androidTest/java/com/ichi2/anki/ReviewerTest.kt
index 1bdd2dc5ed62..8461c64e5d66 100755
--- a/AnkiDroid/src/androidTest/java/com/ichi2/anki/ReviewerTest.kt
+++ b/AnkiDroid/src/androidTest/java/com/ichi2/anki/ReviewerTest.kt
@@ -88,7 +88,7 @@ class ReviewerTest : InstrumentedTest() {
             states.good.normal.review.scheduledDays = 123;
             customData.good.c += 1;
             """
-        val note = addNoteUsingBasicModel("foo", "bar")
+        val note = addNoteUsingBasicNoteType("foo", "bar")
         val card = note.firstCard(col)
         val deck = col.decks.get(note.notetype.did)!!
         card.moveToReviewQueue()
@@ -136,7 +136,7 @@ class ReviewerTest : InstrumentedTest() {
     fun testCustomSchedulerWithRuntimeError() {
         // Issue 15035 - runtime errors weren't handled
         col.cardStateCustomizer = "states.this_is_not_defined.normal.review = 12;"
-        addNoteUsingBasicModel()
+        addNoteUsingBasicNoteType()
 
         closeGetStartedScreenIfExists()
         closeBackupCollectionDialogIfExists()
diff --git a/AnkiDroid/src/androidTest/java/com/ichi2/anki/dialogs/ModelEditorContextMenuTest.kt b/AnkiDroid/src/androidTest/java/com/ichi2/anki/dialogs/NoteTypeEditorContextMenuTest.kt
similarity index 87%
rename from AnkiDroid/src/androidTest/java/com/ichi2/anki/dialogs/ModelEditorContextMenuTest.kt
rename to AnkiDroid/src/androidTest/java/com/ichi2/anki/dialogs/NoteTypeEditorContextMenuTest.kt
index f6149ad3a911..ec1d11419ae2 100644
--- a/AnkiDroid/src/androidTest/java/com/ichi2/anki/dialogs/ModelEditorContextMenuTest.kt
+++ b/AnkiDroid/src/androidTest/java/com/ichi2/anki/dialogs/NoteTypeEditorContextMenuTest.kt
@@ -23,25 +23,25 @@ import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.R
-import com.ichi2.anki.dialogs.ModelEditorContextMenu.ModelEditorContextMenuAction
+import com.ichi2.anki.dialogs.NoteTypeEditorContextMenu.NoteTypeEditorContextMenuAction
 import com.ichi2.anki.tests.InstrumentedTest
 import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
-class ModelEditorContextMenuTest : InstrumentedTest() {
+class NoteTypeEditorContextMenuTest : InstrumentedTest() {
     private val testDialogTitle = "test editor title"
 
     @Test
     @Ignore("flaky")
     fun showsAllOptions() {
         launchFragment(
-            fragmentArgs = bundleOf(ModelEditorContextMenu.KEY_LABEL to testDialogTitle),
+            fragmentArgs = bundleOf(NoteTypeEditorContextMenu.KEY_LABEL to testDialogTitle),
             themeResId = R.style.Theme_Light,
-        ) { ModelEditorContextMenu() }
+        ) { NoteTypeEditorContextMenu() }
         onView(withText(testDialogTitle)).check(matches(isDisplayed()))
-        ModelEditorContextMenuAction.entries.forEach {
+        NoteTypeEditorContextMenuAction.entries.forEach {
             onView(withText(it.actionTextId)).check(matches(isDisplayed()))
         }
     }
diff --git a/AnkiDroid/src/androidTest/java/com/ichi2/anki/tests/ContentProviderTest.kt b/AnkiDroid/src/androidTest/java/com/ichi2/anki/tests/ContentProviderTest.kt
index 2b4b1349d0f8..c76c3423fbaa 100644
--- a/AnkiDroid/src/androidTest/java/com/ichi2/anki/tests/ContentProviderTest.kt
+++ b/AnkiDroid/src/androidTest/java/com/ichi2/anki/tests/ContentProviderTest.kt
@@ -1308,7 +1308,7 @@ class ContentProviderTest : InstrumentedTest() {
         val invalid3 = "[anki:play:a:text]" // string instead of text
 
         val back = "$invalid1$invalid2$invalid3"
-        val note = addNoteUsingBasicModel("Hello$sound", back)
+        val note = addNoteUsingBasicNoteType("Hello$sound", back)
         val ord = 0
 
         val noteUri =
diff --git a/AnkiDroid/src/androidTest/java/com/ichi2/anki/tests/InstrumentedTest.kt b/AnkiDroid/src/androidTest/java/com/ichi2/anki/tests/InstrumentedTest.kt
index 4af9273f3404..8977d15d463a 100644
--- a/AnkiDroid/src/androidTest/java/com/ichi2/anki/tests/InstrumentedTest.kt
+++ b/AnkiDroid/src/androidTest/java/com/ichi2/anki/tests/InstrumentedTest.kt
@@ -158,22 +158,22 @@ abstract class InstrumentedTest {
     }
 
     @DuplicatedCode("This is copied from RobolectricTest. This will be refactored into a shared library later")
-    internal fun addNoteUsingBasicModel(
+    internal fun addNoteUsingBasicNoteType(
         front: String = "Front",
         back: String = "Back",
-    ): Note = addNoteUsingModelName("Basic", front, back)
+    ): Note = addNoteUsingNoteTypeName("Basic", front, back)
 
     @DuplicatedCode("This is copied from RobolectricTest. This will be refactored into a shared library later")
-    private fun addNoteUsingModelName(
+    private fun addNoteUsingNoteTypeName(
         name: String,
         vararg fields: String,
     ): Note {
-        val model =
+        val noteType =
             col.notetypes.byName(name)
-                ?: throw IllegalArgumentException("Could not find model '$name'")
+                ?: throw IllegalArgumentException("Could not find note type '$name'")
         // PERF: if we modify newNote(), we can return the card and return a Pair<Note, Card> here.
         // Saves a database trip afterwards.
-        val n = col.newNote(model)
+        val n = col.newNote(noteType)
         for ((i, field) in fields.withIndex()) {
             n.setField(i, field)
         }
diff --git a/AnkiDroid/src/androidTest/java/com/ichi2/anki/tests/libanki/NotetypeTest.kt b/AnkiDroid/src/androidTest/java/com/ichi2/anki/tests/libanki/NotetypeTest.kt
index 60b51a628153..498f9b2036e5 100644
--- a/AnkiDroid/src/androidTest/java/com/ichi2/anki/tests/libanki/NotetypeTest.kt
+++ b/AnkiDroid/src/androidTest/java/com/ichi2/anki/tests/libanki/NotetypeTest.kt
@@ -41,8 +41,8 @@ class NotetypeTest : InstrumentedTest() {
             "This test is flaky on API29, ignoring",
             Build.VERSION.SDK_INT != Build.VERSION_CODES.Q,
         )
-        val models = testCol.notetypes
-        val model = models.all()[0]
+        val noteTypes = testCol.notetypes
+        val noteType = noteTypes.all()[0]
         val testString = "test"
         val size = testString.length * 1024 * 1024
         val buf = StringBuilder((size * 1.01).toInt())
@@ -50,12 +50,12 @@ class NotetypeTest : InstrumentedTest() {
         for (i in 0 until 1024 * 1024) {
             buf.append(testString)
         }
-        model.put(testString, buf.toString())
+        noteType.put(testString, buf.toString())
         // Buf should be more than 4MB, so at least two chunks from database.
 
         // Reload models
         testCol.load()
-        val newModel = models.all()[0]
-        assertEquals(newModel, model)
+        val newNoteType = noteTypes.all()[0]
+        assertEquals(newNoteType, noteType)
     }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ModelFieldEditor.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ModelFieldEditor.kt
index 32c52cfab191..d492789a27b3 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ModelFieldEditor.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ModelFieldEditor.kt
@@ -34,8 +34,8 @@ import com.ichi2.anki.CollectionManager.withCol
 import com.ichi2.anki.dialogs.ConfirmationDialog
 import com.ichi2.anki.dialogs.LocaleSelectionDialog
 import com.ichi2.anki.dialogs.LocaleSelectionDialog.LocaleSelectionDialogHandler
-import com.ichi2.anki.dialogs.ModelEditorContextMenu.Companion.newInstance
-import com.ichi2.anki.dialogs.ModelEditorContextMenu.ModelEditorContextMenuAction
+import com.ichi2.anki.dialogs.NoteTypeEditorContextMenu.Companion.newInstance
+import com.ichi2.anki.dialogs.NoteTypeEditorContextMenu.NoteTypeEditorContextMenuAction
 import com.ichi2.anki.servicelayer.LanguageHintService.setLanguageHintForField
 import com.ichi2.anki.snackbar.showSnackbar
 import com.ichi2.anki.utils.ext.dismissAllDialogFragments
@@ -501,14 +501,14 @@ class ModelFieldEditor :
         finish()
     }
 
-    fun handleAction(contextMenuAction: ModelEditorContextMenuAction) {
+    fun handleAction(contextMenuAction: NoteTypeEditorContextMenuAction) {
         when (contextMenuAction) {
-            ModelEditorContextMenuAction.Sort -> sortByField()
-            ModelEditorContextMenuAction.Reposition -> repositionFieldDialog()
-            ModelEditorContextMenuAction.Delete -> deleteFieldDialog()
-            ModelEditorContextMenuAction.Rename -> renameFieldDialog()
-            ModelEditorContextMenuAction.ToggleSticky -> toggleStickyField()
-            ModelEditorContextMenuAction.AddLanguageHint -> localeHintDialog()
+            NoteTypeEditorContextMenuAction.Sort -> sortByField()
+            NoteTypeEditorContextMenuAction.Reposition -> repositionFieldDialog()
+            NoteTypeEditorContextMenuAction.Delete -> deleteFieldDialog()
+            NoteTypeEditorContextMenuAction.Rename -> renameFieldDialog()
+            NoteTypeEditorContextMenuAction.ToggleSticky -> toggleStickyField()
+            NoteTypeEditorContextMenuAction.AddLanguageHint -> localeHintDialog()
         }
     }
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/ModelEditorContextMenu.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/NoteTypeEditorContextMenu.kt
similarity index 85%
rename from AnkiDroid/src/main/java/com/ichi2/anki/dialogs/ModelEditorContextMenu.kt
rename to AnkiDroid/src/main/java/com/ichi2/anki/dialogs/NoteTypeEditorContextMenu.kt
index a386cd380679..d776bb30f034 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/ModelEditorContextMenu.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/NoteTypeEditorContextMenu.kt
@@ -18,11 +18,11 @@ import timber.log.Timber
 /**
  * Note: the class is declared as open only to support testing.
  */
-open class ModelEditorContextMenu : AnalyticsDialogFragment() {
+open class NoteTypeEditorContextMenu : AnalyticsDialogFragment() {
     @SuppressLint("CheckResult")
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         super.onCreate(savedInstanceState)
-        val availableItems = ModelEditorContextMenuAction.entries.sortedBy { it.order }
+        val availableItems = NoteTypeEditorContextMenuAction.entries.sortedBy { it.order }
 
         return AlertDialog.Builder(requireActivity()).create {
             setTitle(requireArguments().getString(KEY_LABEL))
@@ -33,7 +33,7 @@ open class ModelEditorContextMenu : AnalyticsDialogFragment() {
         }
     }
 
-    enum class ModelEditorContextMenuAction(
+    enum class NoteTypeEditorContextMenuAction(
         val order: Int,
         @StringRes val actionTextId: Int,
     ) {
@@ -49,8 +49,8 @@ open class ModelEditorContextMenu : AnalyticsDialogFragment() {
         @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
         const val KEY_LABEL = "key_label"
 
-        fun newInstance(label: String): ModelEditorContextMenu =
-            ModelEditorContextMenu().apply {
+        fun newInstance(label: String): NoteTypeEditorContextMenu =
+            NoteTypeEditorContextMenu().apply {
                 arguments = bundleOf(KEY_LABEL to label)
             }
     }

From b95dbf3843cec98391eb38272a7badbc3fdadd63 Mon Sep 17 00:00:00 2001
From: rahul31124 <rdass87871@gmail.com>
Date: Fri, 14 Mar 2025 22:41:12 +0530
Subject: [PATCH 127/200] Move file deletion to background thread using
 coroutines and added a TODO comment

Added Comments

Added TODO comments and Used AnkiDroidApp.applicationScope
---
 .../main/java/com/ichi2/anki/IntentHandler.kt | 56 +++++++++++--------
 1 file changed, 34 insertions(+), 22 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/IntentHandler.kt b/AnkiDroid/src/main/java/com/ichi2/anki/IntentHandler.kt
index 70ce3e6fac71..74a32e2998de 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/IntentHandler.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/IntentHandler.kt
@@ -45,6 +45,8 @@ import com.ichi2.utils.Permissions
 import com.ichi2.utils.Permissions.hasLegacyStorageAccessPermission
 import com.ichi2.utils.copyToClipboard
 import com.ichi2.utils.trimToLength
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import timber.log.Timber
 import java.io.File
 import kotlin.math.max
@@ -214,21 +216,28 @@ class IntentHandler : AbstractIntentHandler() {
     }
 
     private fun deleteImportedDeck(path: String?) {
-        try {
-            val file = File(path!!)
-            val fileUri =
-                applicationContext?.let {
-                    FileProvider.getUriForFile(
-                        it,
-                        it.applicationContext?.packageName + ".apkgfileprovider",
-                        File(it.getExternalFilesDir(FileUtil.getDownloadDirectory()), file.name),
-                    )
-                }
-            // TODO move the file deletion on a background thread
-            contentResolver.delete(fileUri!!, null, null)
-            Timber.i("onCreate() import successful and downloaded file deleted")
-        } catch (e: Exception) {
-            Timber.w(e, "onCreate() import successful and cannot delete file")
+        // TODO improve the handling of the imported temporary files
+        // Launching this scope without tying it to a lifecycle since ,
+        // IntentHandler finishes quickly, but deletion may still be in progress
+        AnkiDroidApp.applicationScope.launch(Dispatchers.IO) {
+            try {
+                val file = File(path!!)
+                val fileUri =
+                    applicationContext?.let {
+                        FileProvider.getUriForFile(
+                            it,
+                            it.applicationContext?.packageName + ".apkgfileprovider",
+                            File(
+                                it.getExternalFilesDir(FileUtil.getDownloadDirectory()),
+                                file.name,
+                            ),
+                        )
+                    }
+                contentResolver.delete(fileUri!!, null, null)
+                Timber.i("onCreate() import successful and downloaded file deleted")
+            } catch (e: Exception) {
+                Timber.w(e, "onCreate() import successful and cannot delete file")
+            }
         }
     }
 
@@ -255,13 +264,16 @@ class IntentHandler : AbstractIntentHandler() {
             Timber.i("onCreate: downloaded a shared deck but uri was null when trying to delete its file")
             return
         }
-
-        try {
-            // TODO move the file deletion on a background thread
-            contentResolver.delete(sharedDeckUri, null, null)
-            Timber.i("onCreate: downloaded shared deck deleted")
-        } catch (e: Exception) {
-            Timber.w(e, "onCreate: failed to delete downloaded shared deck")
+        // TODO improve the handling of the imported temporary files
+        // Launching this scope without tying it to a lifecycle since ,
+        // IntentHandler finishes quickly, but deletion may still be in progress
+        AnkiDroidApp.applicationScope.launch(Dispatchers.IO) {
+            try {
+                contentResolver.delete(sharedDeckUri, null, null)
+                Timber.i("onCreate: downloaded shared deck deleted")
+            } catch (e: Exception) {
+                Timber.w(e, "onCreate: failed to delete downloaded shared deck")
+            }
         }
     }
 

From 7dff87a048355f48457f3cabd7e82c90782d7fd5 Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Sun, 2 Mar 2025 08:48:54 -0300
Subject: [PATCH 128/200] refactor(libanki): remove com.ichi2.anki.Flag
 dependency

---
 .../java/com/ichi2/anki/AnkiDroidJsAPI.kt     |  2 +-
 .../src/main/java/com/ichi2/anki/Reviewer.kt  | 10 +++---
 .../anki/browser/CardBrowserViewModel.kt      |  3 +-
 .../anki/previewer/PreviewerViewModel.kt      |  6 ++--
 .../ui/windows/reviewer/ReviewerViewModel.kt  |  4 ++-
 .../java/com/ichi2/anki/utils/ext/Card.kt     |  9 ++---
 .../com/ichi2/anki/utils/ext/Collection.kt    | 28 +++++++++++++++
 .../src/main/java/com/ichi2/libanki/Card.kt   |  8 ++---
 .../main/java/com/ichi2/libanki/Collection.kt | 21 ++---------
 .../AbstractFlashcardViewerCommandTest.kt     |  7 ++--
 .../java/com/ichi2/anki/AnkiDroidJsAPITest.kt |  2 +-
 .../java/com/ichi2/anki/CardBrowserTest.kt    |  2 +-
 .../java/com/ichi2/anki/utils/ext/CardExt.kt  | 28 +++++++++++++++
 .../test/java/com/ichi2/libanki/FlagTest.kt   | 35 ++++++++++---------
 14 files changed, 103 insertions(+), 62 deletions(-)
 rename AnkiDroid/src/{test => main}/java/com/ichi2/anki/utils/ext/Card.kt (86%)
 create mode 100644 AnkiDroid/src/main/java/com/ichi2/anki/utils/ext/Collection.kt
 create mode 100644 AnkiDroid/src/test/java/com/ichi2/anki/utils/ext/CardExt.kt

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidJsAPI.kt b/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidJsAPI.kt
index 8a8fe531da01..a188ec9968d6 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidJsAPI.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidJsAPI.kt
@@ -270,7 +270,7 @@ open class AnkiDroidJsAPI(
                 convertToByteArray(apiContract, true)
             }
             "cardMark" -> convertToByteArray(apiContract, currentCard.note(getColUnsafe).hasTag(getColUnsafe, "marked"))
-            "cardFlag" -> convertToByteArray(apiContract, currentCard.userFlag().code)
+            "cardFlag" -> convertToByteArray(apiContract, currentCard.userFlag())
             "cardReps" -> convertToByteArray(apiContract, currentCard.reps)
             "cardInterval" -> convertToByteArray(apiContract, currentCard.ivl)
             "cardFactor" -> convertToByteArray(apiContract, currentCard.factor)
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.kt b/AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.kt
index e802da862551..5aa140d77cfd 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.kt
@@ -94,6 +94,8 @@ import com.ichi2.anki.servicelayer.NoteService.toggleMark
 import com.ichi2.anki.snackbar.showSnackbar
 import com.ichi2.anki.ui.internationalization.toSentenceCase
 import com.ichi2.anki.ui.windows.reviewer.ReviewerFragment
+import com.ichi2.anki.utils.ext.flag
+import com.ichi2.anki.utils.ext.setUserFlagForCards
 import com.ichi2.anki.utils.ext.showDialogFragment
 import com.ichi2.anki.utils.navBarNeedsScrim
 import com.ichi2.anki.utils.remainingTime
@@ -256,7 +258,7 @@ open class Reviewer :
     protected val flagToDisplay: Flag
         get() {
             return FlagToDisplay(
-                currentCard!!.userFlag(),
+                currentCard!!.flag,
                 actionButtons.findMenuItem(ActionButtons.RES_FLAG)?.isActionButton ?: true,
                 prefFullscreenReview,
             ).get()
@@ -307,7 +309,7 @@ open class Reviewer :
             return
         }
         launchCatchingTask {
-            card.setUserFlag(flag)
+            card.setUserFlag(flag.code)
             undoableOp(this@Reviewer) {
                 setUserFlagForCards(listOf(card.id), flag)
             }
@@ -736,7 +738,7 @@ open class Reviewer :
         val flagIcon = menu.findItem(R.id.action_flag)
         if (flagIcon != null) {
             if (currentCard != null) {
-                val flag = currentCard!!.userFlag()
+                val flag = currentCard!!.flag
                 flagIcon.setIcon(flag.drawableRes)
                 if (flag == Flag.NONE && actionButtons.status.flagsIsOverflown()) {
                     val flagColor = ThemeUtils.getThemeAttrColor(this, android.R.attr.colorControlNormal)
@@ -1326,7 +1328,7 @@ open class Reviewer :
     }
 
     private fun toggleFlag(flag: Flag) {
-        if (currentCard!!.userFlag() == flag) {
+        if (currentCard!!.flag == flag) {
             Timber.i("Toggle flag: unsetting flag")
             onFlag(currentCard, Flag.NONE)
         } else {
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserViewModel.kt b/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserViewModel.kt
index a37c4bb68221..19f626226101 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserViewModel.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserViewModel.kt
@@ -50,6 +50,7 @@ import com.ichi2.anki.model.SortType
 import com.ichi2.anki.pages.CardInfoDestination
 import com.ichi2.anki.preferences.SharedPreferencesProvider
 import com.ichi2.anki.utils.ext.normalizeForSearch
+import com.ichi2.anki.utils.ext.setUserFlagForCards
 import com.ichi2.annotations.NeedsTest
 import com.ichi2.libanki.Card
 import com.ichi2.libanki.CardId
@@ -931,7 +932,7 @@ class CardBrowserViewModel(
 
     suspend fun updateSelectedCardsFlag(flag: Flag): List<CardId> {
         val idsToChange = queryAllSelectedCardIds()
-        withCol { setUserFlag(flag, cids = idsToChange) }
+        undoableOp { setUserFlagForCards(cids = idsToChange, flag = flag) }
         return idsToChange
     }
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/previewer/PreviewerViewModel.kt b/AnkiDroid/src/main/java/com/ichi2/anki/previewer/PreviewerViewModel.kt
index 294412f6458c..881f1cd4f96f 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/previewer/PreviewerViewModel.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/previewer/PreviewerViewModel.kt
@@ -33,6 +33,8 @@ import com.ichi2.anki.pages.AnkiServer
 import com.ichi2.anki.reviewer.CardSide
 import com.ichi2.anki.servicelayer.MARKED_TAG
 import com.ichi2.anki.servicelayer.NoteService
+import com.ichi2.anki.utils.ext.flag
+import com.ichi2.anki.utils.ext.setUserFlagForCards
 import com.ichi2.annotations.NeedsTest
 import com.ichi2.libanki.Card
 import com.ichi2.libanki.undoableOp
@@ -126,7 +128,7 @@ class PreviewerViewModel(
         launchCatchingIO {
             val card = currentCard.await()
             undoableOp {
-                setUserFlagForCards(listOf(card.id), flag)
+                setUserFlagForCards(cids = listOf(card.id), flag = flag)
             }
             this.flag.emit(flag)
         }
@@ -213,7 +215,7 @@ class PreviewerViewModel(
     }
 
     private suspend fun updateFlagIcon() {
-        flag.emit(currentCard.await().userFlag())
+        flag.emit(currentCard.await().flag)
     }
 
     private suspend fun updateMarkIcon() {
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModel.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModel.kt
index 7b9637a0a39c..bbb19058ea6a 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModel.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModel.kt
@@ -44,6 +44,8 @@ import com.ichi2.anki.servicelayer.NoteService
 import com.ichi2.anki.servicelayer.isBuryNoteAvailable
 import com.ichi2.anki.servicelayer.isSuspendNoteAvailable
 import com.ichi2.anki.ui.windows.reviewer.autoadvance.AutoAdvance
+import com.ichi2.anki.utils.ext.flag
+import com.ichi2.anki.utils.ext.setUserFlagForCards
 import com.ichi2.libanki.ChangeManager
 import com.ichi2.libanki.redo
 import com.ichi2.libanki.sched.Counts
@@ -445,7 +447,7 @@ class ReviewerViewModel(
         showQuestion()
         loadAndPlaySounds(CardSide.QUESTION)
         updateMarkedStatus()
-        flagFlow.emit(card.userFlag())
+        flagFlow.emit(card.flag)
         canBuryNoteFlow.emit(isBuryNoteAvailable(card))
         canSuspendNoteFlow.emit(isSuspendNoteAvailable(card))
         countsFlow.emit(state.counts to state.countsIndex)
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/utils/ext/Card.kt b/AnkiDroid/src/main/java/com/ichi2/anki/utils/ext/Card.kt
similarity index 86%
rename from AnkiDroid/src/test/java/com/ichi2/anki/utils/ext/Card.kt
rename to AnkiDroid/src/main/java/com/ichi2/anki/utils/ext/Card.kt
index 4c479179c3c7..1fd9852fea4a 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/utils/ext/Card.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/utils/ext/Card.kt
@@ -15,12 +15,7 @@
  */
 package com.ichi2.anki.utils.ext
 
+import com.ichi2.anki.Flag
 import com.ichi2.libanki.Card
 
-/**
- * Set flags to [flag].
- * Should only be used for testing.
- */
-fun Card.setFlag(flag: Int) {
-    flags = flag
-}
+val Card.flag: Flag get() = Flag.fromCode(userFlag())
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/utils/ext/Collection.kt b/AnkiDroid/src/main/java/com/ichi2/anki/utils/ext/Collection.kt
new file mode 100644
index 000000000000..45589c89c696
--- /dev/null
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/utils/ext/Collection.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2025 Brayan Oliveira <brayandso.dev@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.ichi2.anki.utils.ext
+
+import androidx.annotation.CheckResult
+import anki.collection.OpChangesWithCount
+import com.ichi2.anki.Flag
+import com.ichi2.libanki.Collection
+
+/** Change the flag color of the specified cards. */
+@CheckResult
+fun Collection.setUserFlagForCards(
+    cids: Iterable<Long>,
+    flag: Flag,
+): OpChangesWithCount = setUserFlagForCards(cids, flag.code)
diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/Card.kt b/AnkiDroid/src/main/java/com/ichi2/libanki/Card.kt
index 7df9a3499bb5..20ee0a2cb122 100644
--- a/AnkiDroid/src/main/java/com/ichi2/libanki/Card.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/libanki/Card.kt
@@ -19,7 +19,6 @@ package com.ichi2.libanki
 
 import androidx.annotation.VisibleForTesting
 import anki.cards.FsrsMemoryState
-import com.ichi2.anki.Flag
 import com.ichi2.anki.utils.ext.ifZero
 import com.ichi2.annotations.NeedsTest
 import com.ichi2.libanki.TemplateManager.TemplateRenderContext.TemplateRenderOutput
@@ -325,9 +324,8 @@ open class Card : Cloneable {
     }
 
     // upstream's function returns an int between 0 and 7 (included).
-    // We return an enum entry for the sake of improving the typing.
     @LibAnkiAlias("user_flag")
-    fun userFlag() = Flag.fromCode(flags and 0b111)
+    fun userFlag() = flags and 0b111
 
     /**
      * Set the first three bits of [flags] to [flag]. Don't change the other ones.
@@ -336,8 +334,8 @@ open class Card : Cloneable {
     // We take a flag for the sake of typing clarity.
     @RustCleanup("deprecated in Anki: use col.set_user_flag_for_cards() instead")
     @LibAnkiAlias("set_user_flag")
-    fun setUserFlag(flag: Flag) {
-        flags = setFlagInInt(flags, flag.code)
+    fun setUserFlag(flag: Int) {
+        flags = setFlagInInt(flags, flag)
     }
 
     companion object {
diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/Collection.kt b/AnkiDroid/src/main/java/com/ichi2/libanki/Collection.kt
index 5ec1219e3a36..4ebee4853098 100644
--- a/AnkiDroid/src/main/java/com/ichi2/libanki/Collection.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/libanki/Collection.kt
@@ -40,7 +40,6 @@ import anki.search.BrowserRow
 import anki.search.SearchNode
 import anki.sync.SyncAuth
 import anki.sync.SyncStatusResponse
-import com.ichi2.anki.Flag
 import com.ichi2.libanki.Utils.ids2str
 import com.ichi2.libanki.backend.model.toBackendNote
 import com.ichi2.libanki.backend.model.toProtoBuf
@@ -562,22 +561,6 @@ class Collection(
         return resp.changes
     }
 
-    /**
-     * Card Flags *****************************************************************************************************
-     */
-    fun setUserFlag(
-        flag: Flag,
-        cids: List<Long>,
-    ) {
-        db.execute(
-            "update cards set flags = (flags & ~?) | ?, usn=?, mod=? where id in ${ids2str(cids)}",
-            7,
-            flag.code,
-            usn(),
-            TimeManager.time.intTime(),
-        )
-    }
-
     lateinit var notetypes: Notetypes
         protected set
 
@@ -609,8 +592,8 @@ class Collection(
     @CheckResult
     fun setUserFlagForCards(
         cids: Iterable<Long>,
-        flag: Flag,
-    ): OpChangesWithCount = backend.setFlag(cardIds = cids, flag = flag.code)
+        flag: Int,
+    ): OpChangesWithCount = backend.setFlag(cardIds = cids, flag = flag)
 
     fun getEmptyCards(): EmptyCardsReport = backend.getEmptyCards()
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/AbstractFlashcardViewerCommandTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/AbstractFlashcardViewerCommandTest.kt
index 689f14770f11..1192e8b6a2a2 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/AbstractFlashcardViewerCommandTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/AbstractFlashcardViewerCommandTest.kt
@@ -26,6 +26,7 @@ import com.ichi2.anki.cardviewer.ViewerCommand.TOGGLE_FLAG_RED
 import com.ichi2.anki.cardviewer.ViewerCommand.TOGGLE_FLAG_TURQUOISE
 import com.ichi2.anki.cardviewer.ViewerCommand.UNSET_FLAG
 import com.ichi2.anki.cardviewer.ViewerRefresh
+import com.ichi2.anki.utils.ext.flag
 import com.ichi2.libanki.Card
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
@@ -216,8 +217,8 @@ class AbstractFlashcardViewerCommandTest : RobolectricTest() {
         @Suppress("SameParameterValue") flag: Flag,
     ): Card {
         val c = mock(Card::class.java)
-        val flags = arrayOf<Flag>(flag)
-        whenever(c.userFlag()).then { flags[0] }
+        val flags = arrayOf(flag.code)
+        whenever(c.flag).then { flags[0] }
         doAnswer { invocation: InvocationOnMock ->
             flags[0] = invocation.getArgument(0)
         }.whenever(c).setUserFlag(anyOrNull())
@@ -246,7 +247,7 @@ class AbstractFlashcardViewerCommandTest : RobolectricTest() {
             flag: Flag,
         ) {
             lastFlag = flag
-            currentCard!!.setUserFlag(flag)
+            currentCard!!.setUserFlag(flag.code)
         }
     }
 }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/AnkiDroidJsAPITest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/AnkiDroidJsAPITest.kt
index 437342db8d5c..6b77a29b500b 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/AnkiDroidJsAPITest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/AnkiDroidJsAPITest.kt
@@ -21,7 +21,7 @@ package com.ichi2.anki
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.AnkiDroidJsAPI.Companion.SUCCESS_KEY
 import com.ichi2.anki.AnkiDroidJsAPI.Companion.VALUE_KEY
-import com.ichi2.anki.utils.ext.setFlag
+import com.ichi2.anki.utils.ext.CardExt.setFlag
 import com.ichi2.libanki.CardType
 import com.ichi2.libanki.utils.TimeManager
 import com.ichi2.utils.BASIC_MODEL_NAME
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt
index 9b8c4f998ff8..20a36b919090 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt
@@ -1669,7 +1669,7 @@ fun TestClass.flagCardForNote(
     flag: Flag,
 ) {
     n.firstCard().update {
-        setUserFlag(flag)
+        setUserFlag(flag.code)
     }
 }
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/utils/ext/CardExt.kt b/AnkiDroid/src/test/java/com/ichi2/anki/utils/ext/CardExt.kt
new file mode 100644
index 000000000000..06ce4d03dfc6
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/utils/ext/CardExt.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2025 Brayan Oliveira <brayandso.dev@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.ichi2.anki.utils.ext
+
+import com.ichi2.libanki.Card
+
+/**
+ * Set flags to [flag].
+ * Should only be used for testing.
+ */
+object CardExt {
+    fun Card.setFlag(flag: Int) {
+        flags = flag
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/libanki/FlagTest.kt b/AnkiDroid/src/test/java/com/ichi2/libanki/FlagTest.kt
index cfd9a36677bc..43747c20ff44 100644
--- a/AnkiDroid/src/test/java/com/ichi2/libanki/FlagTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/libanki/FlagTest.kt
@@ -15,20 +15,21 @@
  */
 package com.ichi2.libanki
 
+import android.annotation.SuppressLint
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ichi2.anki.Flag
-import com.ichi2.anki.utils.ext.setFlag
+import com.ichi2.anki.utils.ext.CardExt.setFlag
 import com.ichi2.testutils.JvmTest
 import com.ichi2.testutils.ext.addNote
-import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
+import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
 class FlagTest : JvmTest() {
     /*****************
      ** Flags        *
      *****************/
+    @SuppressLint("CheckResult")
     @Test
     fun test_flags() {
         val n = col.newNote()
@@ -41,36 +42,36 @@ class FlagTest : JvmTest() {
         val origBits = 0b101 shl 3
         c.update { setFlag(origBits) }
         // no flags to start with
-        assertEquals(Flag.NONE, c.userFlag())
+        assertEquals(0, c.userFlag())
         assertEquals(1, col.findCards("flag:0").size)
         assertEquals(0, col.findCards("flag:1").size)
         // set flag 2
-        col.setUserFlag(Flag.ORANGE, listOf(c.id))
+        col.setUserFlagForCards(listOf(c.id), 2)
         c.load()
-        assertEquals(Flag.ORANGE, c.userFlag())
+        assertEquals(2, c.userFlag())
         // assertEquals(origBits, c.flags & origBits);TODO: create direct access to real flag value
         assertEquals(0, col.findCards("flag:0").size)
         assertEquals(1, col.findCards("flag:2").size)
         assertEquals(0, col.findCards("flag:3").size)
         // change to 3
-        col.setUserFlag(Flag.GREEN, listOf(c.id))
+        col.setUserFlagForCards(listOf(c.id), 3)
         c.load()
-        assertEquals(Flag.GREEN, c.userFlag())
+        assertEquals(3, c.userFlag())
         // unset
-        col.setUserFlag(Flag.NONE, listOf(c.id))
+        col.setUserFlagForCards(listOf(c.id), 0)
         c.load()
-        assertEquals(Flag.NONE, c.userFlag())
+        assertEquals(0, c.userFlag())
 
         // should work with Cards method as well
-        c.setUserFlag(Flag.ORANGE)
-        assertEquals(Flag.ORANGE, c.userFlag())
-        c.setUserFlag(Flag.GREEN)
-        assertEquals(Flag.GREEN, c.userFlag())
-        c.setUserFlag(Flag.NONE)
-        assertEquals(Flag.NONE, c.userFlag())
+        c.setUserFlag(2)
+        assertEquals(2, c.userFlag())
+        c.setUserFlag(3)
+        assertEquals(3, c.userFlag())
+        c.setUserFlag(0)
+        assertEquals(0, c.userFlag())
 
         // test new flags
-        col.setUserFlag(Flag.PURPLE, listOf(c.id))
+        col.setUserFlagForCards(listOf(c.id), 7)
         assertEquals(1, col.findCards("flag:7").size)
     }
 }

From 1f58b7789fbbde6c7b0bd2c0348900d390bd1115 Mon Sep 17 00:00:00 2001
From: AnkiDroid Translations <ankidroid@ankidroid.org>
Date: Tue, 18 Mar 2025 18:06:56 +0000
Subject: [PATCH 129/200] Updated strings from Crowdin

---
 .../src/main/res/values-be/03-dialogs.xml     |  8 ++++----
 .../src/main/res/values-ca/03-dialogs.xml     |  4 ++--
 .../src/main/res/values-ca/10-preferences.xml |  2 +-
 .../src/main/res/values-de/02-strings.xml     |  2 +-
 .../src/main/res/values-fa/02-strings.xml     | 20 +++++++++----------
 .../src/main/res/values-fa/09-backup.xml      |  2 +-
 AnkiDroid/src/main/res/values-gu/01-core.xml  |  2 +-
 .../src/main/res/values-hi/10-preferences.xml |  6 +++---
 .../src/main/res/values-hu/03-dialogs.xml     |  2 +-
 .../src/main/res/values-ka/02-strings.xml     |  2 +-
 .../src/main/res/values-ko/03-dialogs.xml     |  2 +-
 .../src/main/res/values-ko/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-mr/01-core.xml  |  2 +-
 .../src/main/res/values-nl/02-strings.xml     |  2 +-
 .../src/main/res/values-nl/03-dialogs.xml     |  4 ++--
 .../src/main/res/values-or/03-dialogs.xml     |  2 +-
 .../src/main/res/values-pl/03-dialogs.xml     |  2 +-
 .../src/main/res/values-pt-rBR/01-core.xml    |  2 +-
 .../src/main/res/values-pt-rBR/03-dialogs.xml |  2 +-
 AnkiDroid/src/main/res/values-ru/01-core.xml  |  2 +-
 .../src/main/res/values-ru/02-strings.xml     |  4 ++--
 .../src/main/res/values-ru/03-dialogs.xml     |  2 +-
 .../src/main/res/values-ru/10-preferences.xml |  2 +-
 .../src/main/res/values-sat/02-strings.xml    | 12 +++++------
 .../src/main/res/values-sat/03-dialogs.xml    |  4 ++--
 .../main/res/values-sat/10-preferences.xml    |  6 +++---
 .../src/main/res/values-sc/02-strings.xml     |  2 +-
 .../src/main/res/values-sc/03-dialogs.xml     |  4 ++--
 .../src/main/res/values-ug/10-preferences.xml |  2 +-
 .../src/main/res/values-vi/02-strings.xml     |  2 +-
 .../src/main/res/values-vi/03-dialogs.xml     |  2 +-
 .../src/main/res/values-zh-rCN/02-strings.xml |  2 +-
 32 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/AnkiDroid/src/main/res/values-be/03-dialogs.xml b/AnkiDroid/src/main/res/values-be/03-dialogs.xml
index 4166443e7a9b..36f9edf446d3 100644
--- a/AnkiDroid/src/main/res/values-be/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-be/03-dialogs.xml
@@ -72,8 +72,8 @@
     <string name="repair_deck_dialog">Вы сапраўды хочаце аднавіць базу даных?\n\nПерад спробай па яе аднаўленні, будзе створана копія ў  падпапцы \'%s\'.</string>
     <string name="intent_aedict_empty">Катэгорыя “default” нічога не змяшчае</string>
     <string name="intent_aedict_category">Для таго, каб дадаць карткі ў AnkiDroid, выдаліце ўсе катэгорыі Notepad або дадайце катэгорыю з назвай \"default\"</string>
-    <string name="custom_study_new_extend">Павялічыць/паменшыць (“-3”) абмежаванні новых картак на сёння </string>
-    <string name="custom_study_rev_extend">Павялічыць/паменшыць (“-3”) абмежаванні паўтарэння новых картак на сёння </string>
+    <string name="custom_study_new_extend">Павялічыць/паменшыць (“-3”) абмежаванні новых картак на сёння</string>
+    <string name="custom_study_rev_extend">Павялічыць/паменшыць (“-3”) абмежаванні паўтарэння новых картак на сёння</string>
     <string name="custom_study_forgotten">Паўтарыць забытыя карткі за апошнія некалькі дзён:</string>
     <string name="custom_study_ahead">Вывучыць на некалькі дзён наперад:</string>
     <string name="custom_study_preview">Прагледзець новыя карткі, якія дадзены за апошнія некалькі дзён:</string>
@@ -133,7 +133,7 @@
     <string name="multimedia_editor_audio_permission_denied">Адхілены доступ да запісу гуку</string>
     <!-- Database Integrity Check -->
     <string name="integrity_check_startup_title">Праграма AnkiDroid абноўленая</string>
-    <string name="integrity_check_startup_content">Праграма AnkiDroid абноўленая. Дадзенае абнаўленне змяшчае выпраўленні магчымых праблем з базай даных і мы раім вам запусціць яе праверку. </string>
+    <string name="integrity_check_startup_content">Праграма AnkiDroid абноўленая. Дадзенае абнаўленне змяшчае выпраўленні магчымых праблем з базай даных і мы раім вам запусціць яе праверку.</string>
     <string name="integrity_check_continue_anyway">Усё роўна працягнуць</string>
     <string name="integrity_check_insufficient_space">Праверка базы даных патрабуе вялікай колькасці часовага сховішча.\n\nВельмі пажадана мець прынамсі %s свабоднага месца на прыладзе для таго, каб паспяхова выканаць гэту аперацыю.</string>
     <string name="integrity_check_insufficient_space_extra_content">\n\nУ цяперашні час у вас %s вольнага месца.</string>
@@ -224,7 +224,7 @@
     <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
     <string name="deck_already_exists">Калода ўжо існуе</string>
     <string name="empty_deck_name">Калода не можа быць пустой</string>
-    <string name="create_deck_numeric_hint">Калі ў вас ёсць праблемы з парадкам калод (напрыклад, ‘10’  калода стаіць перад ‘2’), замяніце ‘2’ на ‘02’ </string>
+    <string name="create_deck_numeric_hint">Калі ў вас ёсць праблемы з парадкам калод (напрыклад, ‘10’  калода стаіць перад ‘2’), замяніце ‘2’ на ‘02’</string>
     <!-- Set Due Date -->
     <string name="set_due_date_match_interval" comment="when setting a card\'s due date, this checkbox also changes the interval of the card">Задаць інтэрвал на тое ж самае значэнне</string>
     <plurals name="set_due_date_single_day_label" comment="a date control is provided afterwards">
diff --git a/AnkiDroid/src/main/res/values-ca/03-dialogs.xml b/AnkiDroid/src/main/res/values-ca/03-dialogs.xml
index 0043277a3fec..e8ee99ae2888 100644
--- a/AnkiDroid/src/main/res/values-ca/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ca/03-dialogs.xml
@@ -76,7 +76,7 @@
     <string name="storage_full_title">No queda espai al disc</string>
     <string name="storage_almost_full_title">El disc està gairebé ple</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">Sense espai</string>
-    <string name="no_space_to_downgrade_content" tools:ignore="UnusedResources">AnkiDroid necessita %s d\'espai lliure per continuar. Allibereu una mica d\'espai si us plau </string>
+    <string name="no_space_to_downgrade_content" tools:ignore="UnusedResources">AnkiDroid necessita %s d\'espai lliure per continuar. Allibereu una mica d\'espai si us plau</string>
     <string name="restore_backup_title">Restaurar la còpia de seguretat?</string>
     <string name="restore_backup">La seva col·lecció serà replaçada per una còpia anterior. Tots els canvis fets després de desar es perdran.</string>
     <string name="restore_backup_choose_another">Trieu-ne un altre</string>
@@ -148,7 +148,7 @@
     <string name="error_deleting_image">Error esborrant imatge</string>
     <string name="failed_to_apply_background_image">Error al aplicar la imatge de fons %s</string>
     <string name="background_image_too_large">La imatge de fons del selector de paquets és massa gran</string>
-    <string name="image_max_size_allowed">Mida màxima de la imatge: %d MB </string>
+    <string name="image_max_size_allowed">Mida màxima de la imatge: %d MB</string>
     <string name="image_dimensions_too_large">Image dimensions are too large (%1$d × %2$d)</string>
     <!-- Global Intent handler -->
     <!-- Also used by Card Browser, not renaming to save translators effort -->
diff --git a/AnkiDroid/src/main/res/values-ca/10-preferences.xml b/AnkiDroid/src/main/res/values-ca/10-preferences.xml
index 4d9738623789..b7aff2d6dcc7 100644
--- a/AnkiDroid/src/main/res/values-ca/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ca/10-preferences.xml
@@ -158,7 +158,7 @@
     <string name="safe_display_summ">Desactiveu totes les animacions i utilitzeu un mètode més segur per dibuixar cartes. Els dispositius de tinta electrònica poden requerir-ho.</string>
     <string name="disable_extended_text_ui" maxLength="41">Desactiva mode d\'edició d\'un sol camp</string>
     <!--See: multimedia_editor_popup_cloze. We can\'t use format strings as this is auto-generated-->
-    <string name="disable_extended_text_ui_summ">Permet el menú \'Supressió Parcial\' quan som en mode apaisat </string>
+    <string name="disable_extended_text_ui_summ">Permet el menú \'Supressió Parcial\' quan som en mode apaisat</string>
     <string name="vertical_centering" maxLength="41">Alinear al centre</string>
     <string name="vertical_centering_summ">Centra verticalment el contingut de cartes</string>
     <string name="pref_double_tap_time_interval" maxLength="41">Interval de doble tacte (milisegons)</string>
diff --git a/AnkiDroid/src/main/res/values-de/02-strings.xml b/AnkiDroid/src/main/res/values-de/02-strings.xml
index 4b68753a14b5..dd1f105713f1 100644
--- a/AnkiDroid/src/main/res/values-de/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-de/02-strings.xml
@@ -249,7 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s %%</string>
     <string name="download_deck">Stapel herunterladen</string>
-    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Im Browser öffnen</string>
     <string name="try_again">Erneut versuchen</string>
     <string name="cancel_download">Herunterladen abbrechen</string>
     <string name="cancel_download_question_title">Herunterladen abbrechen?</string>
diff --git a/AnkiDroid/src/main/res/values-fa/02-strings.xml b/AnkiDroid/src/main/res/values-fa/02-strings.xml
index d250c38827ad..688d579fa4c9 100644
--- a/AnkiDroid/src/main/res/values-fa/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fa/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">پس زمینه</string>
     <string name="choose_an_image" maxLength="41">انتخاب تصویر</string>
-    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">حذف نسخه های پشتیبان</string>
     <string name="remove_background_image">حذف پس‌زمینه؟</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">بازنشانی پیش‌فرض</string>
@@ -233,9 +233,9 @@
     <string name="note_editor_image_too_large">عکس زیادی بزرگ است، لطفا عکس را دستی وارد کنید</string>
     <string name="note_editor_video_too_large">فایل ویدیو زیادی بزرگ است، لطفا ویدیو را دستی وارد کنید</string>
     <string name="note_editor_audio_too_large">فایل صدا زیادی بزرگ است، لطفا صدا را دستی وارد کنید</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">پشتیبان گیری اندروید درحال انجام شدن هست. لطفا دوباره تلاش کنید</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">شما به iManager نیاز دارید تا به AnkiDroid اجازه اضافه کردن میانبر بدهید</string>
-    <string name="create_shortcut_failed" comment="home screen == launcher">صفحه اصلی شما به AnkiDroid اجازه میانبور اضافه کردن نمیدهد </string>
+    <string name="create_shortcut_failed" comment="home screen == launcher">صفحه اصلی شما به AnkiDroid اجازه میانبور اضافه کردن نمیدهد</string>
     <string name="create_shortcut_error">خطا در افزودن میانبُر: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">جملات را با حروف بزرگ بنویس</string>
     <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">پیمایش نوار ابزار</string>
@@ -249,7 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">دانلود دسته</string>
-    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">باز کردن در مرورگر</string>
     <string name="try_again">دوباره تلاش کنید</string>
     <string name="cancel_download">لغو دانلود</string>
     <string name="cancel_download_question_title">لغو دانلود؟</string>
@@ -306,14 +306,14 @@
     <string name="browser_options_dialog_heading">تنظیمات مرورگر</string>
     <string name="audio_saved">مورد ضبط شده ذخیره شد</string>
     <string name="deleting_selected_notes">در حال حذف یادداشت های انتخاب شده</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">برای شنیدن رو صدا کلیک کنید</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">صدا باید قبل از استفاده نصب شود</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">به هر حال استفاده کن</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">خطای متن به گفتار (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">اینترنت</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">نصب شود</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">باز کردن تنظیمات متن به گفتار ناموفق بود</string>
     <string name="shared_decks_login_required">لطفا وارد حساب کاربری خود شوید که دسته های بیشتری را دانلود کنید</string>
     <string name="deck_description_field_hint">توضیحات</string>
     <string name="failed_to_copy">کپی کردن ناموفق بود</string>
diff --git a/AnkiDroid/src/main/res/values-fa/09-backup.xml b/AnkiDroid/src/main/res/values-fa/09-backup.xml
index 220183c780d4..a48a0b9b3b20 100644
--- a/AnkiDroid/src/main/res/values-fa/09-backup.xml
+++ b/AnkiDroid/src/main/res/values-fa/09-backup.xml
@@ -60,7 +60,7 @@
     <string name="backup_repair_deck_progress">در حال تعمیر پایگاه داده&#8230;</string>
     <string name="backup_invalid_file_error">فایل پشتیبان انتخاب شده معتبر نبود</string>
     <string name="backup_restore_select_title">نسخه پشتیبان را جهت بازیابی انتخاب کنید</string>
-    <string name="backup_restore_no_backups">هیچ نسخه پشتیبانی برای این مجموعه در این دستگاه وجود ندارد.اگر در رایانه خود فایل پشتیبان دارید، آن را به صورت دستی در پوشه آنکی دروید کپی کنید </string>
+    <string name="backup_restore_no_backups">هیچ نسخه پشتیبانی برای این مجموعه در این دستگاه وجود ندارد.اگر در رایانه خود فایل پشتیبان دارید، آن را به صورت دستی در پوشه آنکی دروید کپی کنید</string>
     <string name="open_collection_failed_title">مجموعه باز نشد</string>
     <string name="corrupt_db_message">مجموعه شما خراب شده است.\n\n برای بازیابی از نسخه پشتیبان، روی \"گزینه ها\" ضربه بزنید، یا اگر این کار نمی کند، دستورالعمل‌های زیر را برای تعمیر دستی پایگاه داده ببینید:\n%1$s</string>
     <string name="access_collection_failed_message">موقع دستیابی به مجموعه فلش کارتها خطایی رخ داد. این ممکن است به خاطر یک نقص بی ضرر به وجود آمده باشد یا یک مشکلي داشته باشد.\n\n لطفا بررسی پایگاه داده را اجرا کنید یا با استفاده از دکمه گزینه ها از فایل های پشتیبان برای بازیابی کمک بگیرید. اگر این پیام مستمرا نمایش داده شد لطفا گزارش اشکال را ارسال کنید\n%1$s</string>
diff --git a/AnkiDroid/src/main/res/values-gu/01-core.xml b/AnkiDroid/src/main/res/values-gu/01-core.xml
index 8f955c44578e..dd9a8257c4b9 100644
--- a/AnkiDroid/src/main/res/values-gu/01-core.xml
+++ b/AnkiDroid/src/main/res/values-gu/01-core.xml
@@ -96,7 +96,7 @@
     <string name="menu_bury_card" maxLength="28">કાર્ડ કાઢો</string>
     <string name="menu_bury_note" maxLength="28">નોંધ કાઢો</string>
     <string name="menu_suspend_card" maxLength="28">કાર્ડ સસ્પેન્ડ કરો</string>
-    <string name="menu_suspend_note" maxLength="28">નોંધ સસ્પેન્ડ કરો </string>
+    <string name="menu_suspend_note" maxLength="28">નોંધ સસ્પેન્ડ કરો</string>
     <string name="menu_bury" maxLength="28">કાઢો</string>
     <string name="menu_suspend" maxLength="28">સસ્પેન્ડ</string>
     <string name="menu_delete_note" maxLength="28">નોંધ કાયમ માટે કાઢી નાખો</string>
diff --git a/AnkiDroid/src/main/res/values-hi/10-preferences.xml b/AnkiDroid/src/main/res/values-hi/10-preferences.xml
index 761161ea5a36..dbbd7206bca6 100644
--- a/AnkiDroid/src/main/res/values-hi/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-hi/10-preferences.xml
@@ -100,7 +100,7 @@
     <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">फुल स्क्रीन नेविगेशन दराज</string>
     <string name="gestures_fullscreen_nav_drawer_summary">स्क्रीन पर कहीं से भी स्वाइप किए जाने पर नेविगेशन दराज खोलें</string>
-    <string name="gestures_none" maxLength="41" comment="No gestures">कोई नहीं </string>
+    <string name="gestures_none" maxLength="41" comment="No gestures">कोई नहीं</string>
     <string name="gestures_swipe_up" maxLength="41">ऊपर की ओर स्वाइप</string>
     <string name="gestures_swipe_down" maxLength="41">निचे की ओर स्वाइप</string>
     <string name="gestures_swipe_left" maxLength="41">बाएं स्वाइप करें</string>
@@ -130,7 +130,7 @@
     <string name="sync_account_summ_logged_out">लॉगिन नहीं हैं</string>
     <string name="automatic_sync_choice" maxLength="41">स्वचालित सिंक्रनाइज़ेशन</string>
     <string name="automatic_sync_choice_summ">यदि अंतिम सिंक्रनाइज़ेशन 10 मिनट पहले से अधिक था, तो अनुप्रयोग प्रारंभ/निकास पर स्वचालित रूप से सिंक्रनाइज़ करें ।</string>
-    <string name="sync_media_always" comment="Option to always fetch media when syncing">हमेशा </string>
+    <string name="sync_media_always" comment="Option to always fetch media when syncing">हमेशा</string>
     <string name="sync_media_only_unmetered">केवल बिना जांचे गए कनेक्शन पर</string>
     <string name="sync_media_never">कभीं नहीं</string>
     <string name="sync_status_badge" maxLength="41">सिंक्रनाइज़ेशन स्थिति को दिखाएं</string>
@@ -139,7 +139,7 @@
     <string name="metered_sync_summary">यदि अक्षम है, तो मीटर वाले कनेक्शन पर सिंक करने का प्रयास करने पर आपको चेतावनी दी जाएगी</string>
     <string name="backup_limits_frequency">फ्रीक्वेंसी</string>
     <string name="backup_limits_lifetime">समय सीमा</string>
-    <string name="app_theme" maxLength="41">थीम </string>
+    <string name="app_theme" maxLength="41">थीम</string>
     <string name="day_theme" maxLength="41">दिवस थीम</string>
     <string name="night_theme" maxLength="41">रात विषय</string>
     <string name="language" maxLength="41">भाषा</string>
diff --git a/AnkiDroid/src/main/res/values-hu/03-dialogs.xml b/AnkiDroid/src/main/res/values-hu/03-dialogs.xml
index 0ef081125c30..7bcbed5274d3 100644
--- a/AnkiDroid/src/main/res/values-hu/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-hu/03-dialogs.xml
@@ -148,7 +148,7 @@
     <string name="error_deleting_image">Hiba a kép törlése közben</string>
     <string name="failed_to_apply_background_image">Hiba a  %s háttérkép feltevése közben</string>
     <string name="background_image_too_large">A Pakli Választó háttérkép túl nagy méretű</string>
-    <string name="image_max_size_allowed"> A maximum képméret %d MB</string>
+    <string name="image_max_size_allowed">A maximum képméret %d MB</string>
     <string name="image_dimensions_too_large">Image dimensions are too large (%1$d × %2$d)</string>
     <!-- Global Intent handler -->
     <!-- Also used by Card Browser, not renaming to save translators effort -->
diff --git a/AnkiDroid/src/main/res/values-ka/02-strings.xml b/AnkiDroid/src/main/res/values-ka/02-strings.xml
index 296af6708cd5..b352b12049ac 100644
--- a/AnkiDroid/src/main/res/values-ka/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ka/02-strings.xml
@@ -205,7 +205,7 @@
     <string name="reviewer_invalid_api_version_visit_documentation">ხედი</string>
     <string name="anki_js_error_code">(შეცდომის კოდი: %d)</string>
     <!-- About AnkiDroid screen -->
-    <string name="about_ankidroid_successfully_copied_debug_info"> დაკოპირდა გაცვლის ბუფერზე</string>
+    <string name="about_ankidroid_successfully_copied_debug_info">დაკოპირდა გაცვლის ბუფერზე</string>
     <string name="about_ankidroid_error_copy_debug_info">შეცდომა გამართვის ინფორმაციის გაცვლის ბუფერზე დაკოპირებისას</string>
     <!-- Card Viewer -->
     <string name="card_viewer_could_not_find_image">ბარათის შიგთავსის შეცდომა: „%s“ ვერ ჩაიტვირთა</string>
diff --git a/AnkiDroid/src/main/res/values-ko/03-dialogs.xml b/AnkiDroid/src/main/res/values-ko/03-dialogs.xml
index d4099b47b2fe..4a608249315d 100644
--- a/AnkiDroid/src/main/res/values-ko/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ko/03-dialogs.xml
@@ -230,7 +230,7 @@
     <!-- Instant Note Editor -->
     <string name="cloze_note_required">Cloze 타입 노트 필요</string>
     <string name="cloze_not_found_message">Cloze 타입 노트 없음. 노트 에디터를 열거나 Cloze 타입 노트를 추가한 후 다시 시도하세요.</string>
-    <string name="open">열기 </string>
+    <string name="open">열기</string>
     <string name="change_cloze_number">Cloze 수 바꾸기</string>
     <string name="cloze_number">Cloze 수:</string>
     <string name="change_editor_mode">에디터 모드 바꾸기</string>
diff --git a/AnkiDroid/src/main/res/values-ko/10-preferences.xml b/AnkiDroid/src/main/res/values-ko/10-preferences.xml
index 00c07d5067fc..0b16f1dacf3b 100644
--- a/AnkiDroid/src/main/res/values-ko/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ko/10-preferences.xml
@@ -137,7 +137,7 @@
     <string name="metered_sync_title" maxLength="41">과금 연결에서 동기화 허용</string>
     <string name="metered_sync_summary">비활성화하면 과금 인터넷에서 동기화를 시도할 때 경고가 표시됩니다.</string>
     <string name="backup_limits_frequency">빈도</string>
-    <string name="backup_limits_lifetime">보관기간 </string>
+    <string name="backup_limits_lifetime">보관기간</string>
     <string name="app_theme" maxLength="41">테마</string>
     <string name="day_theme" maxLength="41">주간 테마</string>
     <string name="night_theme" maxLength="41">야간 테마</string>
diff --git a/AnkiDroid/src/main/res/values-mr/01-core.xml b/AnkiDroid/src/main/res/values-mr/01-core.xml
index b122001dc9ba..a622e481b42f 100644
--- a/AnkiDroid/src/main/res/values-mr/01-core.xml
+++ b/AnkiDroid/src/main/res/values-mr/01-core.xml
@@ -98,7 +98,7 @@
     <string name="menu_suspend_card" maxLength="28">निलंबन कार्ड</string>
     <string name="menu_suspend_note" maxLength="28">निलंबित नोट</string>
     <string name="menu_bury" maxLength="28">दफन</string>
-    <string name="menu_suspend" maxLength="28"> निलंबित करा</string>
+    <string name="menu_suspend" maxLength="28">निलंबित करा</string>
     <string name="menu_delete_note" maxLength="28">टीप हटवा</string>
     <string name="menu_flag" maxLength="41">झेंडा</string>
     <string name="rename_flag">ध्वजांचे नाव बदला</string>
diff --git a/AnkiDroid/src/main/res/values-nl/02-strings.xml b/AnkiDroid/src/main/res/values-nl/02-strings.xml
index 36224ef3463b..40740f02073d 100644
--- a/AnkiDroid/src/main/res/values-nl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-nl/02-strings.xml
@@ -275,7 +275,7 @@
     <string name="search_card_js_api_no_results">Zoekopdracht heeft geen resultaten opgeleverd</string>
     <!--  JS Addons  -->
     <string name="not_valid_js_addon_package">%s is geen geldig JavaScript-addon-pakket</string>
-    <string name="could_not_create_dir">Kon de map %s niet creëeren </string>
+    <string name="could_not_create_dir">Kon de map %s niet creëeren</string>
     <string name="malicious_archive_entry_outside">Schadelijk archief. Bevat item buiten de doelmap: %s</string>
     <string name="malicious_archive_exceeds_limit">Schadelijk archief. Grootte overschrijdt %1$s of bevat meer dan %2$d bestanden</string>
     <string name="file_extract_exceeds_storage_space">Bestand extract overschrijdt opslagruimte</string>
diff --git a/AnkiDroid/src/main/res/values-nl/03-dialogs.xml b/AnkiDroid/src/main/res/values-nl/03-dialogs.xml
index 422af28848e6..023491bc4142 100644
--- a/AnkiDroid/src/main/res/values-nl/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-nl/03-dialogs.xml
@@ -180,8 +180,8 @@
     <string name="help_item_facebook">Facebook</string>
     <string name="help_item_twitter">Twitter</string>
     <string name="help_title_privacy">Privacy</string>
-    <string name="help_item_ankidroid_privacy_policy">Ankidroid Privacybeleid </string>
-    <string name="help_item_ankiweb_privacy_policy">AnkiWeb Privacybeleid </string>
+    <string name="help_item_ankidroid_privacy_policy">Ankidroid Privacybeleid</string>
+    <string name="help_item_ankiweb_privacy_policy">AnkiWeb Privacybeleid</string>
     <string name="help_item_ankiweb_terms_and_conditions">AnkiWeb Voorwaarden</string>
     <string name="help_title_send_exception">Stuur probleemoplossingsrapport</string>
     <string name="help_dialog_exception_report_debounce">Rapport is al ingediend</string>
diff --git a/AnkiDroid/src/main/res/values-or/03-dialogs.xml b/AnkiDroid/src/main/res/values-or/03-dialogs.xml
index f2d91aaa43ba..4261f80e4296 100644
--- a/AnkiDroid/src/main/res/values-or/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-or/03-dialogs.xml
@@ -96,7 +96,7 @@
     <string name="dialog_positive_overwrite">ନବଲିଖନ କରନ୍ତୁ</string>
     <string name="dialog_positive_repair">ସଜାଡନ୍ତୁ</string>
     <string name="dialog_positive_replace">ପ୍ରତିସ୍ଥାପନ</string>
-    <string name="dialog_collection_path_not_dir">ନିର୍ଦ୍ଦିଷ୍ଟ ପଥ ଏକ ବୈଧ ନିର୍ଦେଶିକା ନୁହେଁ </string>
+    <string name="dialog_collection_path_not_dir">ନିର୍ଦ୍ଦିଷ୍ଟ ପଥ ଏକ ବୈଧ ନିର୍ଦେଶିକା ନୁହେଁ</string>
     <string name="dialog_invalid_custom_certificate">The provided text does not resolve to a valid PEM-encoded X509 certificate</string>
     <string name="dialog_invalid_custom_certificate_title">Error parsing certificate</string>
     <string name="dialog_updated_custom_certificate">Certificate updated</string>
diff --git a/AnkiDroid/src/main/res/values-pl/03-dialogs.xml b/AnkiDroid/src/main/res/values-pl/03-dialogs.xml
index eb514411715f..5a7d5c288d2c 100644
--- a/AnkiDroid/src/main/res/values-pl/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-pl/03-dialogs.xml
@@ -154,7 +154,7 @@
     <string name="error_deleting_image">Błąd podczas usuwania obrazu</string>
     <string name="failed_to_apply_background_image">Nie udało się ustawić obrazu w tle%s</string>
     <string name="background_image_too_large">Tło ekranu wyboru talii zbyt duże</string>
-    <string name="image_max_size_allowed">Maksymalny dozwolony rozmiar obrazu: %d MB </string>
+    <string name="image_max_size_allowed">Maksymalny dozwolony rozmiar obrazu: %d MB</string>
     <string name="image_dimensions_too_large">Rozmiary obrazu są zbyt duże (%1$d × %2$d)</string>
     <!-- Global Intent handler -->
     <!-- Also used by Card Browser, not renaming to save translators effort -->
diff --git a/AnkiDroid/src/main/res/values-pt-rBR/01-core.xml b/AnkiDroid/src/main/res/values-pt-rBR/01-core.xml
index 3e14a7429cac..2e87028cd98f 100644
--- a/AnkiDroid/src/main/res/values-pt-rBR/01-core.xml
+++ b/AnkiDroid/src/main/res/values-pt-rBR/01-core.xml
@@ -149,7 +149,7 @@
     <string name="card_template_editor_styling" maxLength="28">Estilo</string>
     <string name="card_template_editor_menu_card_browser_appearance" maxLength="28">Aparência do navegador de cartões</string>
     <string name="card_template_editor_deck_override" maxLength="28">Substituição de baralho</string>
-    <string name="card_template_editor_insert_field" maxLength="28">Inserir campo </string>
+    <string name="card_template_editor_insert_field" maxLength="28">Inserir campo</string>
     <string name="card_template_editor_select_field">Selecionar campo</string>
     <string name="card_template_editor_cant_delete">Ao menos um tipo de cartão é necessário.</string>
     <plurals name="card_template_editor_confirm_add">
diff --git a/AnkiDroid/src/main/res/values-pt-rBR/03-dialogs.xml b/AnkiDroid/src/main/res/values-pt-rBR/03-dialogs.xml
index c19cd630f9e3..c53d89ba13a0 100644
--- a/AnkiDroid/src/main/res/values-pt-rBR/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-pt-rBR/03-dialogs.xml
@@ -158,7 +158,7 @@
     <string name="boot_service_too_many_notifications">Muitos lembretes programados. Alguns não aparecerão</string>
     <!-- Locale Selection Dialog -->
     <string name="locale_selection_dialog_title_new">Definir Idioma</string>
-    <string name="locale_selection_dialog_summary">Alguns teclados multilíngues, como GBoard suportam alterar o idioma ao editar o texto\n\nPor favor, solicite o recurso \"setImeHintLocales\" do seu fabricante de teclado se o seu teclado não alterar o idioma. </string>
+    <string name="locale_selection_dialog_summary">Alguns teclados multilíngues, como GBoard suportam alterar o idioma ao editar o texto\n\nPor favor, solicite o recurso \"setImeHintLocales\" do seu fabricante de teclado se o seu teclado não alterar o idioma.</string>
     <!-- Help Dialog -->
     <string name="help_title_using_ankidroid">Usando o AnkiDroid</string>
     <string name="help_item_ankidroid_manual">Manual do AnkiDroid</string>
diff --git a/AnkiDroid/src/main/res/values-ru/01-core.xml b/AnkiDroid/src/main/res/values-ru/01-core.xml
index 3fc81d2661d0..fcb90ea7f09e 100644
--- a/AnkiDroid/src/main/res/values-ru/01-core.xml
+++ b/AnkiDroid/src/main/res/values-ru/01-core.xml
@@ -202,7 +202,7 @@
     <string name="create_new_collection">Создать новую коллекцию</string>
     <string name="new_unsafe_collection">Новая коллекция будет удалена с вашего телефона, если вы удалите AnkiDroid</string>
     <!-- Permissions screen -->
-    <string name="permissions_screen_headline">AnkiDroid требует дополнительных разрешений для работы </string>
+    <string name="permissions_screen_headline">AnkiDroid требует дополнительных разрешений для работы</string>
     <string name="storage_access_title">Доступ к хранилищу</string>
     <string name="storage_access_summary">Сохраняет вашу коллекцию в безопасном месте, чтобы она не исчезла при удалении приложения</string>
     <string name="all_files_access_title" comment="Name of the “All files access” permission from Android 10 and after">Доступ ко всем файлам</string>
diff --git a/AnkiDroid/src/main/res/values-ru/02-strings.xml b/AnkiDroid/src/main/res/values-ru/02-strings.xml
index 407becb0ed5a..dc0afc2cc443 100644
--- a/AnkiDroid/src/main/res/values-ru/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ru/02-strings.xml
@@ -52,7 +52,7 @@
     <string name="CardEditorModel">Тип:</string>
     <string name="CardEditorTags">Метки: %1$s</string>
     <string name="CardEditorCards">Карточки: %1$s</string>
-    <string name="edit_occlusions"> Править скрытие</string>
+    <string name="edit_occlusions">Править скрытие</string>
     <string name="tag_name">Название метки</string>
     <string name="add_new_filter_tags">Добавить/отфильтровать метки</string>
     <string name="add_tag" maxLength="28">Добавить метку</string>
@@ -314,7 +314,7 @@
     <string name="toggle_cards_notes">Карточки — записи</string>
     <string name="truncate_content_help">Показывать в списке только первые 3 строки</string>
     <string name="browser_options_dialog_heading">Параметры списка карточек</string>
-    <string name="audio_saved">Запись сохранена </string>
+    <string name="audio_saved">Запись сохранена</string>
     <string name="deleting_selected_notes">Выбранные записи удаляются</string>
     <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
     <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
diff --git a/AnkiDroid/src/main/res/values-ru/03-dialogs.xml b/AnkiDroid/src/main/res/values-ru/03-dialogs.xml
index 73e021187d09..3465ca9cb204 100644
--- a/AnkiDroid/src/main/res/values-ru/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ru/03-dialogs.xml
@@ -251,7 +251,7 @@
     <string name="set_due_date_range_end" comment="\'Set Due Date\' may change the due date of a card to a random number of days in the future. This labels the \'maximum\' value of this range (inclusive)">До</string>
     <!-- Instant Note Editor -->
     <string name="cloze_note_required">Нужен тип записи с пропусками</string>
-    <string name="cloze_not_found_message">Записей с пропусками не найдено, откройте редактор записей или попробуйте снова после добавления карточки с пропусками. </string>
+    <string name="cloze_not_found_message">Записей с пропусками не найдено, откройте редактор записей или попробуйте снова после добавления карточки с пропусками.</string>
     <string name="open">Открыть</string>
     <string name="change_cloze_number">Количество пропусков</string>
     <string name="cloze_number">Количество пропусков:</string>
diff --git a/AnkiDroid/src/main/res/values-ru/10-preferences.xml b/AnkiDroid/src/main/res/values-ru/10-preferences.xml
index 40b4e05cbf79..083bf30fc881 100644
--- a/AnkiDroid/src/main/res/values-ru/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ru/10-preferences.xml
@@ -118,7 +118,7 @@
     <string name="gestures_corner_tap_middle_center" maxLength="41">Касание в центре экрана</string>
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Касание внизу в левом углу</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Касание внизу в правом углу</string>
-    <string name="gestures_shake" maxLength="41">Потрясти устройство </string>
+    <string name="gestures_shake" maxLength="41">Потрясти устройство</string>
     <string name="card_browser_enable_external_context_menu" maxLength="41">Пункт «%s» в меню</string>
     <string name="card_browser_enable_external_context_menu_summary">Добавляет пункт «%s» в контекстное меню системы</string>
     <string name="double_scrolling_gap" maxLength="41">Двойная прокрутка</string>
diff --git a/AnkiDroid/src/main/res/values-sat/02-strings.xml b/AnkiDroid/src/main/res/values-sat/02-strings.xml
index bd311f5ef7aa..c279b10c0fa5 100644
--- a/AnkiDroid/src/main/res/values-sat/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sat/02-strings.xml
@@ -45,11 +45,11 @@
 -->
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Navigation drawer strings -->
-    <string name="drawer_open">ᱰᱨᱚᱣᱟᱹᱨ ᱠᱷᱩᱞᱟᱹᱭ ᱢᱮ </string>
+    <string name="drawer_open">ᱰᱨᱚᱣᱟᱹᱨ ᱠᱷᱩᱞᱟᱹᱭ ᱢᱮ</string>
     <string name="drawer_close">ᱰᱨᱚᱣᱟᱹᱨ ᱵᱚᱸᱫᱚᱭ ᱢᱮ</string>
-    <string name="CardEditorCardDeck">ᱠᱟᱰ ᱰᱮᱠᱺ </string>
-    <string name="CardEditorNoteDeck">ᱰᱮᱠᱺ </string>
-    <string name="CardEditorModel">ᱯᱨᱚᱠᱟᱨᱺ </string>
+    <string name="CardEditorCardDeck">ᱠᱟᱰ ᱰᱮᱠᱺ</string>
+    <string name="CardEditorNoteDeck">ᱰᱮᱠᱺ</string>
+    <string name="CardEditorModel">ᱯᱨᱚᱠᱟᱨᱺ</string>
     <string name="CardEditorTags">ᱴᱮᱜᱥᱺ%1$s</string>
     <string name="CardEditorCards">ᱠᱟᱰᱺ%1$s</string>
     <string name="edit_occlusions">ᱚᱠᱥᱩᱞᱤᱥᱚᱱ ᱥᱟᱯᱲᱟᱣ ᱢᱮ</string>
@@ -64,7 +64,7 @@
     <string name="save_whiteboard" maxLength="28">ᱯᱩᱸᱰ ᱵᱚᱰ ᱥᱟᱱᱪᱟᱣ ᱢᱮ</string>
     <string name="enable_stylus" maxLength="28">ᱥᱴᱟᱭᱞᱩᱥ ᱚᱞᱚᱜ ᱮᱱᱮᱡ ᱢᱮ</string>
     <string name="disable_stylus">ᱥᱴᱟᱭᱞᱩᱥ ᱚᱞᱚᱜ ᱵᱚᱫᱚᱞ ᱢᱮ</string>
-    <string name="enable_whiteboard" maxLength="28">ᱥᱤᱠᱮᱴ ᱞᱟᱜᱩᱭ ᱢᱮ </string>
+    <string name="enable_whiteboard" maxLength="28">ᱥᱤᱠᱮᱴ ᱞᱟᱜᱩᱭ ᱢᱮ</string>
     <string name="disable_whiteboard">ᱥᱤᱠᱮᱴ ᱵᱚᱱᱫ ᱢᱮ</string>
     <string name="show_whiteboard">ᱥᱤᱠᱮᱴ ᱫᱮᱠᱷᱟᱣ ᱢᱮ</string>
     <string name="hide_whiteboard" maxLength="28">ᱥᱤᱠᱮᱴ ᱩᱠᱩᱭ ᱢᱮ</string>
@@ -73,7 +73,7 @@
     <string name="leech_suspend_notification">ᱠᱟᱰ ᱫᱚ leech ᱟᱨ ᱵᱚᱸᱫ ᱛᱮ ᱢᱟᱨᱠ ᱮᱱᱟ</string>
     <string name="leech_notification">ᱠᱟᱰ ᱫᱚ leech ᱛᱮ ᱢᱟᱨᱠ ᱮᱱᱟ</string>
     <string name="webview_crash_unknown">ᱵᱟᱝᱵᱟᱰᱟᱭᱟᱜ ᱵᱷᱩᱞ</string>
-    <string name="webview_crash_unknwon_detailed">ᱱᱚᱶᱟ ᱫᱚ WebView ᱨᱮ ᱤᱱᱴᱚᱨᱱᱟᱞ ᱵᱷᱩᱞ ᱠᱷᱟᱛᱤᱨ ᱛᱮ </string>
+    <string name="webview_crash_unknwon_detailed">ᱱᱚᱶᱟ ᱫᱚ WebView ᱨᱮ ᱤᱱᱴᱚᱨᱱᱟᱞ ᱵᱷᱩᱞ ᱠᱷᱟᱛᱤᱨ ᱛᱮ</string>
     <string name="webview_crash_oom">Out of Memory</string>
     <string name="webview_crash_oom_details">ᱥᱤᱥᱴᱚᱢ ᱫᱚ Webview ᱵᱚᱸᱫ ᱠᱮᱜᱼᱟᱭ ᱾ ᱱᱚᱶᱟ ᱫᱚ ᱡᱟᱹᱥᱛᱤ ᱢᱟᱨᱟᱝ ᱯᱷᱚᱱᱴᱥ ᱟᱨ ᱢᱤᱰᱭᱟ  ᱠᱷᱟᱹᱛᱤᱨ ᱟᱣᱩᱴ ᱚᱯᱷ ᱢᱮᱢᱚᱨᱤ ᱫᱮᱠᱷᱟᱣ ᱮᱫ ᱟᱭ ᱾</string>
     <string name="webview_crash_nonfatal">WebView ᱨᱮᱱᱰᱚᱨᱚᱨ ᱠᱨᱟᱥ ᱮᱱᱟ ᱾ ᱠᱟᱨᱚᱬ:%s</string>
diff --git a/AnkiDroid/src/main/res/values-sat/03-dialogs.xml b/AnkiDroid/src/main/res/values-sat/03-dialogs.xml
index 9e405972f8f0..e4f0dbc558f6 100644
--- a/AnkiDroid/src/main/res/values-sat/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sat/03-dialogs.xml
@@ -194,7 +194,7 @@
     <string name="metered_sync_data_warning">ᱟᱢᱟᱜ ᱤᱱᱴᱟᱨᱱᱮᱴ ᱯᱨᱚᱵᱷᱟᱭᱰᱟᱨ ᱰᱮᱴᱟ ᱵᱮᱵᱷᱟᱨ ᱞᱟᱹᱜᱤᱫ ᱴᱟᱠᱟ ᱦᱟᱛᱟᱣᱟ</string>
     <string name="deck_picker_new">ᱱᱚᱣᱟ ᱰᱮᱠᱨᱮ ᱛᱮᱦᱮᱧ ᱧᱮᱞ ᱞᱟᱹᱜᱤᱫ ᱱᱟᱣᱟ ᱠᱟᱰ ᱨᱮᱭᱟᱜ ᱮᱞ</string>
     <string name="deck_picker_rev">ᱱᱚᱣᱟ ᱰᱮᱠ ᱨᱮ ᱛᱮᱦᱮᱧ ᱞᱟᱹᱜᱤᱫ ᱢᱮᱱᱟᱜ ᱱᱟᱣᱟ ᱮᱞ</string>
-    <string name="deck_picker_lrn">ᱱᱚᱣᱟ ᱰᱮᱠ ᱨᱮᱭᱟᱜ ᱥᱮᱪᱮᱫ ᱠᱟᱰ  ᱮᱞ </string>
+    <string name="deck_picker_lrn">ᱱᱚᱣᱟ ᱰᱮᱠ ᱨᱮᱭᱟᱜ ᱥᱮᱪᱮᱫ ᱠᱟᱰ  ᱮᱞ</string>
     <!-- This description is valid fos
     sched V2. For V1, it was counting the number of repetitions of cards in learning. This approximation is acceptable
     for the sake of simplicity and because V1 will leave.-->
@@ -233,7 +233,7 @@
     </plurals>
     <string name="range_delimiter" comment="Placed between two input boxes to denote a range">–</string>
     <string name="set_due_date_range_start" comment="\'Set Due Date\' may change the due date of a card to a random number of days in the future. This labels the \'minimum\' value of this range (inclusive)">ᱠᱷᱚᱱ</string>
-    <string name="set_due_date_range_end" comment="\'Set Due Date\' may change the due date of a card to a random number of days in the future. This labels the \'maximum\' value of this range (inclusive)"> ᱛᱮ</string>
+    <string name="set_due_date_range_end" comment="\'Set Due Date\' may change the due date of a card to a random number of days in the future. This labels the \'maximum\' value of this range (inclusive)">ᱛᱮ</string>
     <!-- Instant Note Editor -->
     <string name="cloze_note_required">ᱠᱞᱳᱡ ᱴᱟᱭᱤᱯ ᱱᱳᱴ ᱞᱟᱹᱠᱛᱤ ᱠᱟᱱᱟ</string>
     <string name="cloze_not_found_message">Cloze ᱞᱮᱠᱟᱱ ᱱᱳᱴ ᱵᱟᱝ ᱧᱟᱢ ᱞᱮᱱᱟ, ᱱᱳᱴ ᱮᱰᱤᱴᱚᱨ ᱮᱛᱦᱚᱵ ᱢᱮ ᱟᱨ ᱵᱟᱝ Cloze ᱞᱮᱠᱟᱱ ᱱᱳᱴ ᱥᱮᱞᱮᱫ ᱠᱟᱛᱮ ᱟᱨᱦᱚᱸ ᱯᱨᱚᱵᱷᱟᱣ ᱢᱮ ᱾</string>
diff --git a/AnkiDroid/src/main/res/values-sat/10-preferences.xml b/AnkiDroid/src/main/res/values-sat/10-preferences.xml
index 6dcd46751e9d..4fe179f6b92d 100644
--- a/AnkiDroid/src/main/res/values-sat/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sat/10-preferences.xml
@@ -148,14 +148,14 @@
     <string name="notification_pref_title" maxLength="41">ᱚᱠᱟ ᱡᱷᱟᱚᱜ ᱤᱰᱞᱟᱹᱭ</string>
     <string name="never_notify">ᱛᱤᱥᱦᱚᱸ ᱵᱟᱝ ᱤᱛᱞᱟᱹᱭ</string>
     <string name="notify_when_pending">ᱢᱟᱲᱟᱝᱟ ᱠᱷᱚᱵᱚᱨ ᱥᱟᱨᱮᱡ ᱢᱮᱱᱟᱜᱼᱟ</string>
-    <string name="notification_minimum_cards_due"> %d ᱠᱦᱚᱱ ᱡᱟᱹᱥᱛᱤ ᱠᱟᱰᱥ ᱥᱟᱨᱮᱡ</string>
+    <string name="notification_minimum_cards_due">%d ᱠᱦᱚᱱ ᱡᱟᱹᱥᱛᱤ ᱠᱟᱰᱥ ᱥᱟᱨᱮᱡ</string>
     <string name="notification_minimum_cards_due_vibrate" maxLength="41">ᱛᱷᱟᱨᱼᱛᱷᱟᱨᱟᱣ</string>
     <string name="notification_minimum_cards_due_blink" maxLength="41">ᱫᱷᱩᱯᱼᱫᱷᱟᱯ ᱟᱨᱥᱟᱞ</string>
     <string name="select_locale_title">ᱟᱲᱟᱝ ᱵᱟᱪᱷᱟᱣ</string>
-    <string name="software_render" maxLength="41">ᱠᱟᱰ ᱦᱟᱰᱣᱮᱨ ᱥᱤᱡᱚᱱᱤᱭᱟᱹ ᱴᱷᱟᱠᱮᱫ ᱮᱢᱮ </string>
+    <string name="software_render" maxLength="41">ᱠᱟᱰ ᱦᱟᱰᱣᱮᱨ ᱥᱤᱡᱚᱱᱤᱭᱟᱹ ᱴᱷᱟᱠᱮᱫ ᱮᱢᱮ</string>
     <string name="software_render_summ">ᱦᱟᱰᱣᱮᱨ ᱵᱮᱱᱟᱣ ᱩᱥᱟᱹᱨᱟ ᱜᱮᱭᱟ ᱢᱮᱱᱠᱟᱷᱟᱱ ᱵᱤᱥᱮᱥ ᱞᱮᱠᱟᱛᱮ Android 8/8.1. ᱮᱴᱠᱮᱴᱚᱬᱮ ᱦᱩᱭᱫᱟᱲᱮᱟᱫ-ᱟ।ᱡᱩᱫᱤ ᱟᱢ ᱤᱸᱴᱚᱨᱯᱷᱮᱥ  ᱠᱟᱰ ᱨᱤᱵᱷᱭᱩ ᱟᱜ ᱵᱟᱢ ᱧᱮᱞᱧᱟᱢᱮᱫ-ᱟ, ᱮᱱᱠᱷᱟᱱ ᱥᱮᱴᱤᱝ ᱨᱮ ᱪᱮᱥᱴᱟᱭᱢᱮ</string>
     <string name="safe_display" maxLength="41">ᱡᱟᱹᱯᱛᱤ ᱚᱵᱚᱥᱛᱷᱟ ᱩᱫᱩᱜᱽ ᱢᱚᱰ</string>
-    <string name="safe_display_summ">ᱡᱷᱚᱛᱚ ᱮᱱᱤᱢᱮᱥᱚᱱ ᱵᱚᱱᱫᱽ ᱠᱟᱛᱮ ᱟᱨ ᱴᱷᱤᱠ ᱛᱚᱨᱤᱠᱟ ᱛᱮ ᱠᱟᱰ ᱤᱫᱤ ᱢᱮ ᱾ ᱤᱼᱠᱟᱲᱤ ᱰᱤᱵᱷᱟᱤᱥ ᱫᱚᱨᱠᱟᱨ ᱯᱟᱲᱟᱣ ᱜᱮᱭᱟ ᱾ </string>
+    <string name="safe_display_summ">ᱡᱷᱚᱛᱚ ᱮᱱᱤᱢᱮᱥᱚᱱ ᱵᱚᱱᱫᱽ ᱠᱟᱛᱮ ᱟᱨ ᱴᱷᱤᱠ ᱛᱚᱨᱤᱠᱟ ᱛᱮ ᱠᱟᱰ ᱤᱫᱤ ᱢᱮ ᱾ ᱤᱼᱠᱟᱲᱤ ᱰᱤᱵᱷᱟᱤᱥ ᱫᱚᱨᱠᱟᱨ ᱯᱟᱲᱟᱣ ᱜᱮᱭᱟ ᱾</string>
     <string name="disable_extended_text_ui" maxLength="41">ᱢᱤᱫᱴᱟᱹᱝ ᱡᱟᱭᱜᱟ ᱥᱟᱯᱰᱟᱣ ᱢᱚᱰ ᱵᱸᱫᱚ</string>
     <!--See: multimedia_editor_popup_cloze. We can\'t use format strings as this is auto-generated-->
     <string name="disable_extended_text_ui_summ">\'ᱠᱞᱚᱡ ᱢᱮᱴᱟᱣ\' ᱠᱚᱱᱴᱮᱠᱥᱴ ᱢᱮᱱᱩ ᱚᱛᱱᱚᱜ ᱧᱮᱸᱞ ᱢᱚᱰ ᱨᱮ ᱵᱟᱛᱟᱣ ᱢᱮ ᱾.</string>
diff --git a/AnkiDroid/src/main/res/values-sc/02-strings.xml b/AnkiDroid/src/main/res/values-sc/02-strings.xml
index c360e9e1200a..9fba136f1daf 100644
--- a/AnkiDroid/src/main/res/values-sc/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sc/02-strings.xml
@@ -280,7 +280,7 @@
     <string name="not_valid_js_addon_package">%s no est unu pachete de estensione JavaScript vàlidu</string>
     <string name="could_not_create_dir">No at fatu a creare sa cartella %s</string>
     <string name="malicious_archive_entry_outside">Archìviu malu. Cuntenet un\'intrada a foras de sa cartella de obietivu: %s</string>
-    <string name="malicious_archive_exceeds_limit">Archìviu malu. Sa mannària bàrigat sos %1$s o cuntenet prus de %2$d documentos </string>
+    <string name="malicious_archive_exceeds_limit">Archìviu malu. Sa mannària bàrigat sos %1$s o cuntenet prus de %2$d documentos</string>
     <string name="file_extract_exceeds_storage_space">S\'estratzione de su documentu bàrigat sa capatzidade de archiviatzione</string>
     <!--  Hierarchical Tags  -->
     <string name="expand_tag">Ismànnia s\'eticheta \'%s\'</string>
diff --git a/AnkiDroid/src/main/res/values-sc/03-dialogs.xml b/AnkiDroid/src/main/res/values-sc/03-dialogs.xml
index 8b00e12f9b6a..70692ae903dc 100644
--- a/AnkiDroid/src/main/res/values-sc/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sc/03-dialogs.xml
@@ -205,7 +205,7 @@
         <item quantity="one">In %d segundu diat pòdere incumintzare una sincronizatzione automàtica</item>
         <item quantity="other">In %d segundos diat pòdere incumintzare una sincronizatzione automàtica</item>
     </plurals>
-    <string name="metered_sync_data_warning">Su frunidore de ìnternet tuo ti diat pòdere fàghere pagare dinare pro s\'impreu de datos </string>
+    <string name="metered_sync_data_warning">Su frunidore de ìnternet tuo ti diat pòdere fàghere pagare dinare pro s\'impreu de datos</string>
     <string name="deck_picker_new">Nùmeru de cartas noas de pompiare oe in custu matzu.</string>
     <string name="deck_picker_rev">Nùmeru de cartas chi iscadint oe in custu matzu.</string>
     <string name="deck_picker_lrn">Nùmeru de cartas de imparare in custu matzu.</string>
@@ -222,7 +222,7 @@
     <string name="backup_your_collection">Faghe una còpia de seguresa de sa colletzione tua</string>
     <string name="backup_collection_message">No as fatu una còpia de seguresa de sa colletzione tua dae unu pagu de tempus. Lu dias dèpere fàghere como pro prevènnere pèrdidas de datos</string>
     <string name="button_backup" maxLength="41">Faghe una còpia</string>
-    <string name="button_disable_reminder">Disabìlita su promemòria </string>
+    <string name="button_disable_reminder">Disabìlita su promemòria</string>
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Prus a tardu</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Non lu torres a mustrare</string>
     <string name="dismiss_backup_warning_title">Avisu de pèrdida de datos</string>
diff --git a/AnkiDroid/src/main/res/values-ug/10-preferences.xml b/AnkiDroid/src/main/res/values-ug/10-preferences.xml
index b75ba655ca97..3d20edd3019a 100644
--- a/AnkiDroid/src/main/res/values-ug/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ug/10-preferences.xml
@@ -161,7 +161,7 @@
     <!--See: multimedia_editor_popup_cloze. We can\'t use format strings as this is auto-generated-->
     <string name="disable_extended_text_ui_summ">توغرىسىغا ھالەتتە مەزمۇن تىزىملىكىدە «بوش ئورۇن تولدۇرۇش» قا يول قويىدۇ.</string>
     <string name="vertical_centering" maxLength="41">ئۇتتۇرىغا توغرىلا</string>
-    <string name="vertical_centering_summ">كارتا مەزمۇنىنى بويىغا ئوتتۇرىغا توغرىلايدۇ </string>
+    <string name="vertical_centering_summ">كارتا مەزمۇنىنى بويىغا ئوتتۇرىغا توغرىلايدۇ</string>
     <string name="pref_double_tap_time_interval" maxLength="41">ۋاقىت ئارىلىقى قوش چېكىلىدۇ (مىللىسېكۇنت)</string>
     <string name="pref_double_tap_time_interval_summary">ئەگەر بۇ ۋاقىت ئۆتۈپ كەتمىگەن بولسا، جاۋاب توپچىنىڭ ئىككىنچى قېتىم چېكىلىشى نەزەردىن ساقىت قىلىنىدۇ. بۇ تاسادىپىي قوش چېكىشنىڭ ئالدىنى ئالىدۇ</string>
     <string name="pref_show_answer_long_press_time" maxLength="41">«جاۋابنى كۆرسەت» نىڭ ئۇزۇن بېسىش ۋاقتى</string>
diff --git a/AnkiDroid/src/main/res/values-vi/02-strings.xml b/AnkiDroid/src/main/res/values-vi/02-strings.xml
index ad37c9459025..47bbfbee8676 100644
--- a/AnkiDroid/src/main/res/values-vi/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-vi/02-strings.xml
@@ -75,7 +75,7 @@
     <string name="webview_crash_unknown">Lỗi không xác định</string>
     <string name="webview_crash_unknwon_detailed">Lỗi nội bộ trong webview</string>
     <string name="webview_crash_oom">Không đủ bộ nhớ</string>
-    <string name="webview_crash_oom_details">WebView đã bị ngắt bởi hệ thống. Việc này thường xảy ra khi ứng dụng hết bộ nhớ vì font chữ hoặc file media quá lớn. </string>
+    <string name="webview_crash_oom_details">WebView đã bị ngắt bởi hệ thống. Việc này thường xảy ra khi ứng dụng hết bộ nhớ vì font chữ hoặc file media quá lớn.</string>
     <string name="webview_crash_nonfatal">Trình kết xuất WebView bị lỗi. Nguyên nhân: %s</string>
     <string name="webview_crash_fatal">Lỗi nghiêm trọng: Trình kết xuất WebView bị lỗi. Nguyên nhân: %s</string>
     <string name="webview_crash_loop_dialog_title">Hệ thống hiển thị WebView không thành công</string>
diff --git a/AnkiDroid/src/main/res/values-vi/03-dialogs.xml b/AnkiDroid/src/main/res/values-vi/03-dialogs.xml
index d559fa3ae4e5..6e5540395715 100644
--- a/AnkiDroid/src/main/res/values-vi/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-vi/03-dialogs.xml
@@ -77,7 +77,7 @@
     <string name="no_space_to_downgrade_content" tools:ignore="UnusedResources">AnkiDroid needs %s free storage space to continue. Please clear some space</string>
     <string name="restore_backup_title">Khôi phục sao lưu?</string>
     <string name="restore_backup">Bộ sưu tập sẽ được thay bằng bản sao cũ hơn. Bất kỳ tiến trình nào chưa lưu sẽ bị mất.</string>
-    <string name="restore_backup_choose_another">Chọn cái khác </string>
+    <string name="restore_backup_choose_another">Chọn cái khác</string>
     <string name="dialog_cancel">Huỷ</string>
     <string name="dialog_ok">OK</string>
     <string name="dialog_confirm" tools:ignore="UnusedResources">Xác nhận</string>
diff --git a/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml b/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml
index 6ba0ee5eb9a6..ffa1022b79ef 100644
--- a/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml
@@ -245,7 +245,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">下载牌组</string>
-    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">在浏览器中打开</string>
     <string name="try_again">再试一次</string>
     <string name="cancel_download">取消下载</string>
     <string name="cancel_download_question_title">是否取消下载？</string>

From ea9c06931a96cdcc75ae7eec3c3b5c0bc82d000f Mon Sep 17 00:00:00 2001
From: AnkiDroid Translations <ankidroid@ankidroid.org>
Date: Tue, 18 Mar 2025 18:59:31 +0000
Subject: [PATCH 130/200] Updated strings from Crowdin

---
 AnkiDroid/src/main/res/values-be/03-dialogs.xml          | 2 +-
 AnkiDroid/src/main/res/values-fil/02-strings.xml         | 2 +-
 AnkiDroid/src/main/res/values-hy/07-cardbrowser.xml      | 2 +-
 AnkiDroid/src/main/res/values-ko/01-core.xml             | 4 ++--
 AnkiDroid/src/main/res/values-or/07-cardbrowser.xml      | 4 ++--
 AnkiDroid/src/main/res/values-sat/18-standard-models.xml | 2 +-
 AnkiDroid/src/main/res/values-uk/01-core.xml             | 2 +-
 AnkiDroid/src/main/res/values-uk/07-cardbrowser.xml      | 2 +-
 AnkiDroid/src/main/res/values-uk/18-standard-models.xml  | 2 +-
 AnkiDroid/src/main/res/values-vi/01-core.xml             | 2 +-
 AnkiDroid/src/main/res/values-vi/07-cardbrowser.xml      | 2 +-
 11 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/AnkiDroid/src/main/res/values-be/03-dialogs.xml b/AnkiDroid/src/main/res/values-be/03-dialogs.xml
index 36f9edf446d3..e9afdc145435 100644
--- a/AnkiDroid/src/main/res/values-be/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-be/03-dialogs.xml
@@ -228,7 +228,7 @@
     <!-- Set Due Date -->
     <string name="set_due_date_match_interval" comment="when setting a card\'s due date, this checkbox also changes the interval of the card">Задаць інтэрвал на тое ж самае значэнне</string>
     <plurals name="set_due_date_single_day_label" comment="a date control is provided afterwards">
-        <item quantity="one">Паказваць картку за </item>
+        <item quantity="one">Паказваць картку за</item>
         <item quantity="few">Паказваць карткі за</item>
         <item quantity="many">Паказваць карткі за</item>
         <item quantity="other">Паказваць карткі за</item>
diff --git a/AnkiDroid/src/main/res/values-fil/02-strings.xml b/AnkiDroid/src/main/res/values-fil/02-strings.xml
index b58e879fb203..a8d479266693 100644
--- a/AnkiDroid/src/main/res/values-fil/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fil/02-strings.xml
@@ -111,7 +111,7 @@
     </plurals>
     <!-- minutes used in \'[studied in] x minutes\' context, causing inflexion in some languages -->
     <plurals name="in_minutes">
-        <item quantity="one">%1$d minuto </item>
+        <item quantity="one">%1$d minuto</item>
         <item quantity="other">%1$d minuto</item>
     </plurals>
     <string name="fact_adder_intent_title" comment="Label of the \'Add Note\' window. This title can\'t be seen in AnkiDroid directly.">AnkiDroid kard</string>
diff --git a/AnkiDroid/src/main/res/values-hy/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-hy/07-cardbrowser.xml
index cea4904136ee..9bfdb8cba2b9 100644
--- a/AnkiDroid/src/main/res/values-hy/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-hy/07-cardbrowser.xml
@@ -46,7 +46,7 @@
 <resources>
     <!-- CardBrowser -->
     <plurals name="card_browser_subtitle">
-        <item quantity="one">%d քարտ է ցուցադրված </item>
+        <item quantity="one">%d քարտ է ցուցադրված</item>
         <item quantity="other">%d քարտ է ցուցադրված</item>
     </plurals>
     <plurals name="card_browser_subtitle_notes_mode">
diff --git a/AnkiDroid/src/main/res/values-ko/01-core.xml b/AnkiDroid/src/main/res/values-ko/01-core.xml
index e4cc16bfb286..68d4877c4ebb 100644
--- a/AnkiDroid/src/main/res/values-ko/01-core.xml
+++ b/AnkiDroid/src/main/res/values-ko/01-core.xml
@@ -115,11 +115,11 @@
     grant AnkiDroid the \'Storage\' permission. This needs to be a fairly generic message as implementations
     of the permissions/app info screen will differ between devices. -->
     <string name="startup_no_storage_permission">계속하기 위해서는 AnkiDroid에 \'저장소\'권한이 필요합니다.</string>
-    <string name="rebuild_filtered_deck">필터링된 덱을 재구성하는 중&#8230; </string>
+    <string name="rebuild_filtered_deck">필터링된 덱을 재구성하는 중&#8230;</string>
     <string name="rebuild_cram_label" maxLength="28">재생성</string>
     <string name="empty_cram_label" maxLength="28">비우기</string>
     <string name="create_subdeck">하위 뭉치 만들기</string>
-    <string name="empty_filtered_deck">필터링된 덱을 비우는 중&#8230; </string>
+    <string name="empty_filtered_deck">필터링된 덱을 비우는 중&#8230;</string>
     <string name="custom_study_deck_name">맞춤 학습 세션</string>
     <string name="custom_study_deck_exists">기존의 맞춤 학습 덱의 이름을 먼저 변경하세요.</string>
     <string name="search_deck" comment="Deck search for selecting it">덱 검색하기</string>
diff --git a/AnkiDroid/src/main/res/values-or/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-or/07-cardbrowser.xml
index d3531829f192..89b20ea00e87 100644
--- a/AnkiDroid/src/main/res/values-or/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-or/07-cardbrowser.xml
@@ -83,9 +83,9 @@
         <item>ସୃଷ୍ଟି ସମୟ ଅନୁସାରେ</item>
         <item>ନୋଟ୍ ସଂଶୋଧନ ସମୟ ଅନୁସାରେ</item>
         <item>ପତ୍ର ସଂଶୋଧନ ସମୟ ଅନୁସାରେ</item>
-        <item>ଦେୟ ସମୟ ଅନୁସାରେ </item>
+        <item>ଦେୟ ସମୟ ଅନୁସାରେ</item>
         <item>ଅନ୍ତରାଳ ଅନୁସାରେ</item>
-        <item>ସହଜତା ଅନୁସାରେ </item>
+        <item>ସହଜତା ଅନୁସାରେ</item>
         <item>ସମୀକ୍ଷା ଅନୁସାରେ</item>
         <item>ଲାପ୍ସ ଅନୁସାରେ</item>
     </string-array>
diff --git a/AnkiDroid/src/main/res/values-sat/18-standard-models.xml b/AnkiDroid/src/main/res/values-sat/18-standard-models.xml
index 316c2ec94d10..9b57a2e625fb 100644
--- a/AnkiDroid/src/main/res/values-sat/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-sat/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">ᱥᱟᱢᱟᱝ</string>
-    <string name="back_field_name" maxLength="28">ᱛᱟᱭᱚᱢ </string>
+    <string name="back_field_name" maxLength="28">ᱛᱟᱭᱚᱢ</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-uk/01-core.xml b/AnkiDroid/src/main/res/values-uk/01-core.xml
index 575f7bd2d3df..e6615e6d3b07 100644
--- a/AnkiDroid/src/main/res/values-uk/01-core.xml
+++ b/AnkiDroid/src/main/res/values-uk/01-core.xml
@@ -66,7 +66,7 @@
         <item quantity="one">Залишилася %1$d година %2$d</item>
         <item quantity="few">Залишилося %1$d годин %2$d</item>
         <item quantity="many">Залишилося %1$d годин %2$d</item>
-        <item quantity="other">Залишилося %1$d годин %2$d </item>
+        <item quantity="other">Залишилося %1$d годин %2$d</item>
     </plurals>
     <plurals name="reviewer_window_title_days_new">
         <item quantity="one">Залишився %1$d день %2$d година</item>
diff --git a/AnkiDroid/src/main/res/values-uk/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-uk/07-cardbrowser.xml
index ad94a230f350..3d02b709462b 100644
--- a/AnkiDroid/src/main/res/values-uk/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-uk/07-cardbrowser.xml
@@ -85,7 +85,7 @@
     <string name="card_details_tags">Теги</string>
     <string-array name="card_browser_order_labels">
         <item>Без сортування (швидше)</item>
-        <item>За полем сортування </item>
+        <item>За полем сортування</item>
         <item>За часом створення</item>
         <item>За часом зміни запису</item>
         <item>За часом зміни картки</item>
diff --git a/AnkiDroid/src/main/res/values-uk/18-standard-models.xml b/AnkiDroid/src/main/res/values-uk/18-standard-models.xml
index 1e2b6cd66cc2..7640de8217b7 100644
--- a/AnkiDroid/src/main/res/values-uk/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-uk/18-standard-models.xml
@@ -26,6 +26,6 @@
  
 <resources>
     <!--Fields-->
-    <string name="front_field_name" maxLength="28"> Лицьовий бік</string>
+    <string name="front_field_name" maxLength="28">Лицьовий бік</string>
     <string name="back_field_name" maxLength="28">Зворотній бік</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-vi/01-core.xml b/AnkiDroid/src/main/res/values-vi/01-core.xml
index 7b42969917b3..4806571985a6 100644
--- a/AnkiDroid/src/main/res/values-vi/01-core.xml
+++ b/AnkiDroid/src/main/res/values-vi/01-core.xml
@@ -63,7 +63,7 @@
         <item quantity="other">Còn %1$d giờ %2$d</item>
     </plurals>
     <plurals name="reviewer_window_title_days_new">
-        <item quantity="other">Còn %1$d ngày %2$d giờ </item>
+        <item quantity="other">Còn %1$d ngày %2$d giờ</item>
     </plurals>
     <string name="no_cards_placeholder_title">Bộ sưu tập đang trống</string>
     <string name="no_cards_placeholder_description">Hãy thêm thẻ\nbằng biểu tượng +</string>
diff --git a/AnkiDroid/src/main/res/values-vi/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-vi/07-cardbrowser.xml
index c502940cbd00..914faf89d663 100644
--- a/AnkiDroid/src/main/res/values-vi/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-vi/07-cardbrowser.xml
@@ -80,7 +80,7 @@
         <item>Bằng thời gian tạo ra</item>
         <item>Theo thời gian sửa đổi ghi chú</item>
         <item>Theo thời gian sửa đổi thẻ</item>
-        <item>Bởi thời gian hết hạn </item>
+        <item>Bởi thời gian hết hạn</item>
         <item>Bởi khoảng thời gian</item>
         <item>Bởi dễ dàng</item>
         <item>Bởi ôn tập</item>

From c2faf97fc1c6aa16a5b90dd0675890f76a6b080c Mon Sep 17 00:00:00 2001
From: Mike Hardy <github@mikehardy.net>
Date: Fri, 21 Mar 2025 10:27:25 -0500
Subject: [PATCH 131/200] fix(deps): use SearchPreference-2.7.0 as jitpack
 error workaround

unsure what is going on with this dependency, but 2.7.1 (theoretically
the current version) is no longer being served by jitpack

Per the maintainer, 2.7.0 was the same code as 2.7.1 so this should work
fine

See https://github.com/ByteHamster/SearchPreference/issues/41
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f594258de7e2..f4cfa30cb9c1 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -100,7 +100,7 @@ okhttp = "4.12.0"
 protobufKotlinLite = "4.29.3"
 # ../AnkiDroid/robolectricDownload.gradle may need changes - read instructions in that file
 robolectric = "4.14.1"
-searchpreference = "2.7.1"
+searchpreference = "2.7.0"
 seismic = "1.0.3"
 sharedPreferencesMock = "1.2.4"
 slackKeeper = "0.16.1"

From d78b0d58ef8b8b39f210ee9ab925050f345ccc40 Mon Sep 17 00:00:00 2001
From: Mike Hardy <github@mikehardy.net>
Date: Fri, 21 Mar 2025 10:53:26 -0500
Subject: [PATCH 132/200] test: ignore failing flagsAreShownInBigDecksTest test
 locally

it was blocking local testing even, not just CI
---
 AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt
index 20a36b919090..d203473e0068 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt
@@ -403,6 +403,7 @@ class CardBrowserTest : RobolectricTest() {
         }
 
     @Test
+    @Ignore("Fails locally as well on macOS, not just CI. Blocks testing.")
     @Flaky(os = OS.ALL, message = "Fails mostly on Mac and occasionally Windows")
     fun flagsAreShownInBigDecksTest() =
         runTest {

From 3ceda1bba964025b30e2a3105d6bbf69ff2c5485 Mon Sep 17 00:00:00 2001
From: lukstbit <52494258+lukstbit@users.noreply.github.com>
Date: Fri, 21 Mar 2025 14:55:15 +0200
Subject: [PATCH 133/200] Remove unused code from BackupManager

The delete code was only used in tests.
---
 .../main/java/com/ichi2/anki/BackupManager.kt | 354 ------------------
 .../com/ichi2/anki/BackupManagerSimpleTest.kt | 189 ----------
 .../java/com/ichi2/anki/BackupManagerTest.kt  | 131 -------
 3 files changed, 674 deletions(-)
 delete mode 100644 AnkiDroid/src/test/java/com/ichi2/anki/BackupManagerTest.kt

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/BackupManager.kt b/AnkiDroid/src/main/java/com/ichi2/anki/BackupManager.kt
index 012efbdfa6ff..7f3e5a0eb916 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/BackupManager.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/BackupManager.kt
@@ -16,211 +16,24 @@
 
 package com.ichi2.anki
 
-import android.content.SharedPreferences
 import android.text.format.DateFormat
-import androidx.annotation.VisibleForTesting
-import androidx.core.content.edit
-import anki.config.Preferences.BackupLimits
-import anki.config.PreferencesKt.backupLimits
-import anki.config.copy
-import com.ichi2.anki.preferences.sharedPrefs
-import com.ichi2.compat.CompatHelper
 import com.ichi2.libanki.Collection
 import com.ichi2.libanki.Utils
 import com.ichi2.libanki.utils.Time
 import com.ichi2.libanki.utils.Time.Companion.utcOffset
 import com.ichi2.libanki.utils.TimeManager
 import com.ichi2.utils.FileUtil.getFreeDiskSpace
-import okio.use
 import timber.log.Timber
-import java.io.BufferedOutputStream
 import java.io.File
-import java.io.FileOutputStream
 import java.io.IOException
 import java.text.ParseException
 import java.text.SimpleDateFormat
-import java.time.LocalDate
-import java.time.temporal.ChronoUnit
-import java.util.Calendar
 import java.util.Date
 import java.util.Locale
-import java.util.UnknownFormatConversionException
-import java.util.zip.ZipEntry
-import java.util.zip.ZipOutputStream
 
 open class BackupManager {
-    /**
-     * Attempts to create a backup in a background thread. Returns `true` if the process is started.
-     *
-     * Returns false:
-     * * If backups are disabled
-     * * If the frequency between backups set by the user in preferences wasn't respected(see preferences key "minutes_between_automatic_backups")
-     * * If the filename creation failed
-     * * If the backup already exists
-     * * If the user has insufficient space
-     * * If the collection is too small to be valid
-     *
-     * @param colPath The path of the collection file
-     *
-     * @return Whether a thread was started to create a backup
-     */
-    @Suppress("PMD.NPathComplexity")
-    fun performBackupInBackground(
-        colPath: String,
-        time: Time,
-    ): Boolean {
-        val prefs = AnkiDroidApp.instance.baseContext.sharedPrefs()
-        if (hasDisabledBackups(prefs)) {
-            Timber.w("backups are disabled")
-            return false
-        }
-        val colFile = File(colPath)
-        val colBackups = getBackups(colFile)
-        if (isBackupUnnecessary(colFile, colBackups)) {
-            Timber.d("performBackup: No backup necessary due to no collection changes")
-            return false
-        }
-        // the frequency(in minutes) allowed for backups(default is 30 minutes)
-        val frequency = prefs.getInt("minutes_between_automatic_backups", 30)
-        // Abort backup if one was already made less than the allowed frequency
-        val lastBackupDate = getLastBackupDate(colBackups)
-        if (lastBackupDate != null && lastBackupDate.time + frequency * 60_000L > time.intTimeMS()) {
-            Timber.d(
-                "performBackup: No backup created. Last backup younger than the frequency " +
-                    "allowed from preferences (currently set to $frequency minutes)",
-            )
-            return false
-        }
-        val backupFilename = getNameForNewBackup(time) ?: return false
-
-        // Abort backup if destination already exists (extremely unlikely)
-        val backupFile = getBackupFile(colFile, backupFilename)
-        if (backupFile.exists()) {
-            Timber.d("performBackup: No new backup created. File already exists")
-            return false
-        }
-
-        // Abort backup if not enough free space
-        if (!hasFreeDiscSpace(colFile)) {
-            Timber.e("performBackup: Not enough space on sd card to backup.")
-            prefs.edit { putBoolean("noSpaceLeft", true) }
-            return false
-        }
-
-        // Don't bother trying to do backup if the collection is too small to be valid
-        if (collectionIsTooSmallToBeValid(colFile)) {
-            Timber.d("performBackup: No backup created as the collection is too small to be valid")
-            return false
-        }
-
-        // TODO: Probably not a good idea to do the backup while the collection is open
-        if (CollectionManager.isOpenUnsafe()) {
-            Timber.w("Collection is already open during backup... we probably shouldn't be doing this")
-        }
-
-        // Backup collection as Anki package in new thread
-        performBackupInNewThread(colFile, backupFile)
-        return true
-    }
-
-    fun isBackupUnnecessary(
-        colFile: File,
-        colBackups: Array<File>,
-    ): Boolean {
-        val len = colBackups.size
-
-        // If have no backups, then a backup is necessary
-        return if (len <= 0) {
-            false
-        } else {
-            colBackups[len - 1].lastModified() == colFile.lastModified()
-        }
-
-        // no collection changes means we don't need a backup
-    }
-
-    /**
-     * @return last date in parsable file names or null if all names can't be parsed
-     * Expects a sorted array of backups, as returned by getBackups()
-     */
-    fun getLastBackupDate(files: Array<File>): Date? =
-        files.lastOrNull()?.let {
-            getBackupDate(it.name)
-        }
-
-    fun getBackupFile(
-        colFile: File,
-        backupFilename: String,
-    ): File = File(getBackupDirectory(colFile.parentFile!!), backupFilename)
-
-    fun performBackupInNewThread(
-        colFile: File,
-        backupFile: File,
-    ) {
-        Timber.i("Launching new thread to backup %s to %s", colFile.absolutePath, backupFile.path)
-        val thread: Thread =
-            object : Thread() {
-                override fun run() {
-                    performBackup(colFile, backupFile)
-                }
-            }
-        thread.start()
-    }
-
-    private fun performBackup(
-        colFile: File,
-        backupFile: File,
-    ): Boolean {
-        val colPath = colFile.absolutePath
-        // Save collection file as zip archive
-        return try {
-            ZipOutputStream(BufferedOutputStream(FileOutputStream(backupFile))).use { zos ->
-                val ze = ZipEntry(CollectionHelper.COLLECTION_FILENAME)
-                zos.putNextEntry(ze)
-                CompatHelper.compat.copyFile(colPath, zos)
-            }
-            // Delete old backup files if needed
-            val prefs = AnkiDroidApp.instance.baseContext.sharedPrefs()
-            val backupLimits =
-                backupLimits {
-                    daily = prefs.getInt("daily_backups_to_keep", 8)
-                    weekly = prefs.getInt("weekly_backups_to_keep", 8)
-                    monthly = prefs.getInt("monthly_backups_to_keep", 8)
-                }
-            deleteColBackups(colPath, backupLimits)
-            // set timestamp of file in order to avoid creating a new backup unless its changed
-            if (!backupFile.setLastModified(colFile.lastModified())) {
-                Timber.w(
-                    "performBackupInBackground() setLastModified() failed on file %s",
-                    backupFile.name,
-                )
-                return false
-            }
-            Timber.i("Backup created successfully")
-            true
-        } catch (e: IOException) {
-            Timber.w(e)
-            false
-        }
-    }
-
-    fun collectionIsTooSmallToBeValid(colFile: File): Boolean =
-        (
-            colFile.length()
-                < MIN_BACKUP_COL_SIZE
-        )
-
-    fun hasFreeDiscSpace(colFile: File): Boolean = getFreeDiscSpace(colFile) >= getRequiredFreeSpace(colFile)
-
-    @VisibleForTesting
-    fun hasDisabledBackups(prefs: SharedPreferences): Boolean = prefs.getInt("backupMax", 8) == 0
-
     companion object {
-        /**
-         * Number of MB of
-         */
         private const val MIN_FREE_SPACE = 10
-        private const val MIN_BACKUP_COL_SIZE = 10000 // threshold in bytes to backup a col file
         private const val BACKUP_SUFFIX = "backup"
         const val BROKEN_COLLECTIONS_SUFFIX = "broken"
         private val backupNameRegex: Regex by lazy {
@@ -248,15 +61,6 @@ open class BackupManager {
             return directory
         }
 
-        /**
-         * @param colFile The current collection file to backup
-         * @return the amount of free space required for a backup.
-         */
-        fun getRequiredFreeSpace(colFile: File): Long {
-            // We add a minimum amount of free space to ensure against
-            return colFile.length() + MIN_FREE_SPACE * 1024 * 1024
-        }
-
         fun enoughDiscSpace(path: String?): Boolean = getFreeDiscSpace(path) >= MIN_FREE_SPACE * 1024 * 1024
 
         /**
@@ -379,23 +183,6 @@ open class BackupManager {
          */
         fun getBackupDate(fileName: String): Date? = getBackupTimeString(fileName)?.let { parseBackupTimeString(it) }
 
-        /**
-         * @return filename with pattern collection-yyyy-MM-dd-HH-mm based on given time parameter
-         */
-        fun getNameForNewBackup(time: Time): String? {
-            /** Changes in the file name pattern should be updated as well in
-             * [getBackupTimeString] and [com.ichi2.anki.dialogs.DatabaseErrorDialog.onCreateDialog] */
-            val cal: Calendar = time.gregorianCalendar()
-            val backupFilename: String =
-                try {
-                    String.format(Utils.ENGLISH_LOCALE, "collection-%s.colpkg", legacyDateFormat.format(cal.time))
-                } catch (e: UnknownFormatConversionException) {
-                    Timber.w(e, "performBackup: error on creating backup filename")
-                    return null
-                }
-            return backupFilename
-        }
-
         /**
          * @return Array of files with names which matches the backup name pattern,
          * in order of creation.
@@ -413,52 +200,6 @@ open class BackupManager {
             return backups.toTypedArray()
         }
 
-        /**
-         * Returns the most recent backup, or null if no backups exist matching [the backup name pattern][backupNameRegex]
-         *
-         * @return the most recent backup, or null if no backups exist
-         */
-        fun getLatestBackup(colFile: File): File? = getBackups(colFile).lastOrNull()
-
-        /**
-         * Deletes the first files until only the given number of files remain
-         *
-         * @param colPath Path of collection file whose backups should be deleted
-         * @param backupLimits the user's choice on how many backup files to keep
-         * @param today, the day in which the user exists, only use in tests or if you want to alter
-         * the time continuum
-         */
-        fun deleteColBackups(
-            colPath: String,
-            backupLimits: BackupLimits,
-            today: LocalDate = LocalDate.now(),
-        ): Boolean = deleteColBackups(getBackups(File(colPath)), backupLimits, today)
-
-        private fun deleteColBackups(
-            backups: Array<File>,
-            backupLimits: BackupLimits,
-            today: LocalDate,
-        ): Boolean {
-            val unpackedBackups =
-                backups.map {
-                    // based on the format used, 0 is for "collection|backup" prefix and 1,2,3 are for
-                    // year(4 digits), month(with 0 prefix, 1 is January) and day(with 0 prefix, starting from 1)
-                    val nameSplits = it.nameWithoutExtension.split("-")
-                    UnpackedBackup(
-                        file = it,
-                        date = LocalDate.of(nameSplits[1].toInt(), nameSplits[2].toInt(), nameSplits[3].toInt()),
-                    )
-                }
-            BackupFilter(today, backupLimits).getObsoleteBackups(unpackedBackups).forEach { backup ->
-                if (!backup.file.delete()) {
-                    Timber.e("deleteColBackups() failed to delete %s", backup.file.absolutePath)
-                } else {
-                    Timber.i("deleteColBackups: backup file %s deleted.", backup.file.absolutePath)
-                }
-            }
-            return true
-        }
-
         /**
          * Delete backups as specified by [backupsToDelete],
          * throwing [IllegalArgumentException] if any of the files passed aren't actually backups.
@@ -489,9 +230,6 @@ open class BackupManager {
             }
             return dir.delete()
         }
-
-        @VisibleForTesting(otherwise = VisibleForTesting.NONE)
-        fun createInstance(): BackupManager = BackupManager()
     }
 }
 
@@ -511,95 +249,3 @@ class LocalizedUnambiguousBackupTimeFormatter {
         return formatter.format(backupDate)
     }
 }
-
-private data class UnpackedBackup(
-    val file: File,
-    val date: LocalDate,
-) : Comparable<UnpackedBackup> {
-    override fun compareTo(other: UnpackedBackup): Int = date.compareTo(other.date)
-
-    private val epoch = LocalDate.ofEpochDay(0)
-
-    fun day(): Long = ChronoUnit.DAYS.between(epoch, date)
-
-    fun week(): Long = ChronoUnit.WEEKS.between(epoch, date)
-
-    fun month(): Long = ChronoUnit.MONTHS.between(epoch, date)
-}
-
-enum class BackupStage {
-    Daily,
-    Weekly,
-    Monthly,
-}
-
-// see https://github.com/ankitects/anki/blob/f3bb845961973bcfab34acfdc4d314294285ee74/rslib/src/collection/backup.rs#L186
-private class BackupFilter(
-    private val today: LocalDate,
-    private var limits: BackupLimits,
-) {
-    private val epoch = LocalDate.ofEpochDay(0)
-    private var lastKeptDay: Long = ChronoUnit.DAYS.between(epoch, today)
-    private var lastKeptWeek: Long = ChronoUnit.WEEKS.between(epoch, today)
-    private var lastKeptMonth: Long = ChronoUnit.MONTHS.between(epoch, today)
-    private val obsolete = mutableListOf<UnpackedBackup>()
-
-    fun getObsoleteBackups(backups: List<UnpackedBackup>): List<UnpackedBackup> {
-        for (backup in backups.sortedDescending()) {
-            if (isRecent(backup)) {
-                markFresh(null, backup)
-            } else if (remaining(BackupStage.Daily)) {
-                markFreshOrObsolete(BackupStage.Daily, backup)
-            } else if (remaining(BackupStage.Weekly)) {
-                markFreshOrObsolete(BackupStage.Weekly, backup)
-            } else if (remaining(BackupStage.Monthly)) {
-                markFreshOrObsolete(BackupStage.Monthly, backup)
-            } else {
-                obsolete.add(backup)
-            }
-        }
-        return obsolete
-    }
-
-    private fun isRecent(backup: UnpackedBackup): Boolean = backup.date == today
-
-    fun remaining(stage: BackupStage): Boolean =
-        when (stage) {
-            BackupStage.Daily -> limits.daily > 0
-            BackupStage.Weekly -> limits.weekly > 0
-            BackupStage.Monthly -> limits.monthly > 0
-        }
-
-    fun markFreshOrObsolete(
-        stage: BackupStage,
-        backup: UnpackedBackup,
-    ) {
-        val keep =
-            when (stage) {
-                BackupStage.Daily -> backup.day() < lastKeptDay
-                BackupStage.Weekly -> backup.week() < lastKeptWeek
-                BackupStage.Monthly -> backup.month() < lastKeptMonth
-            }
-        if (keep) {
-            markFresh(stage, backup)
-        } else {
-            obsolete.add(backup)
-        }
-    }
-
-    // Adjusts limits as per the stage of the kept backup, and last kept times.
-    fun markFresh(
-        stage: BackupStage?,
-        backup: UnpackedBackup,
-    ) {
-        lastKeptDay = backup.day()
-        lastKeptWeek = backup.week()
-        lastKeptMonth = backup.month()
-        when (stage) {
-            BackupStage.Daily -> limits = limits.copy { daily -= 1 }
-            BackupStage.Weekly -> limits = limits.copy { weekly -= 1 }
-            BackupStage.Monthly -> limits = limits.copy { monthly -= 1 }
-            else -> {} // ignore, null will be received for a fresh backup
-        }
-    }
-}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/BackupManagerSimpleTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/BackupManagerSimpleTest.kt
index d4b72fb2a0c9..2e0e0e797fc0 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/BackupManagerSimpleTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/BackupManagerSimpleTest.kt
@@ -16,27 +16,16 @@
 
 package com.ichi2.anki
 
-import anki.config.Preferences.BackupLimits
-import anki.config.PreferencesKt.backupLimits
-import com.ichi2.anki.BackupManager.Companion.getLatestBackup
-import com.ichi2.testutils.MockTime
-import org.hamcrest.CoreMatchers.equalTo
-import org.hamcrest.CoreMatchers.not
-import org.hamcrest.CoreMatchers.nullValue
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.collection.ArrayMatching.arrayContainingInAnyOrder
-import org.hamcrest.io.FileMatchers.anExistingFile
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.TemporaryFolder
 import java.io.File
-import java.time.LocalDate
 import kotlin.test.assertEquals
 import kotlin.test.assertNotNull
 import kotlin.test.assertNull
 import kotlin.test.junit5.JUnit5Asserter.assertEquals
-import kotlin.test.junit5.JUnit5Asserter.assertNotNull
-import kotlin.test.junit5.JUnit5Asserter.assertNull
 
 /**
  * Test for [BackupManager] without [RobolectricTest]. For performance
@@ -66,44 +55,6 @@ class BackupManagerSimpleTest {
         assertNull(BackupManager.getBackupDate("foo"))
     }
 
-    @Test
-    fun getNameForNewBackupTest() {
-        // Using a timestamp number directly as MockTime parameter may
-        // have different results on other computers and GitHub CI
-        val date = BackupManager.parseBackupTimeString("1970-01-02-00-46")
-        assertNotNull(date)
-        val timestamp = date.time
-        val backupName = BackupManager.getNameForNewBackup(MockTime(timestamp))
-
-        assertEquals("Backup name doesn't match naming pattern", "collection-1970-01-02-00-46.colpkg", backupName)
-    }
-
-    @Test
-    fun nameOfNewBackupsCanBeParsed() {
-        val backupName = BackupManager.getNameForNewBackup(MockTime(100000000))
-        assertNotNull(backupName)
-
-        val ts = BackupManager.getBackupDate(backupName)
-        assertNotNull("New backup name couldn't be parsed by getBackupTimeStrings()", ts)
-    }
-
-    @Test
-    fun getLastBackupDateTest() {
-        val bm = BackupManager.createInstance()
-        val backups =
-            arrayOf(
-                File("collection-2000-12-31-23-04.colpkg"),
-                File("collection-2010-01-02-03-04.colpkg"),
-                File("collection-1999-12-31-23-59.colpkg"),
-            ).sortedBy { it.name }.toTypedArray()
-        val expected = BackupManager.parseBackupTimeString("2010-01-02-03-04")
-
-        assertNull(bm.getLastBackupDate(arrayOf()))
-        assertNotNull(bm.getLastBackupDate(backups))
-        assertEquals(expected, bm.getLastBackupDate(backups))
-        assertNull("getLastBackupDate() should return null when all files aren't parsable", bm.getLastBackupDate(arrayOf()))
-    }
-
     @Test
     fun getBackupsTest() {
         // getBackups() doesn't require a proper collection file
@@ -125,144 +76,4 @@ class BackupManagerSimpleTest {
         assertEquals("Only the valid backup names should have been kept", 3, backups.size)
         assertThat(backups, arrayContainingInAnyOrder(f1, f3, f4))
     }
-
-    private fun File.newBackupFile(name: String): File = File(this, name).also { it.createNewFile() }
-
-    private fun newBackupLimits(
-        daily: Int,
-        weekly: Int,
-        monthly: Int,
-    ): BackupLimits =
-        backupLimits {
-            this.daily = daily
-            this.weekly = weekly
-            this.monthly = monthly
-        }
-
-    @Test
-    fun keepsAllBackupsForToday() {
-        val colFile = tempDirectory.newFile()
-        val backupDir = BackupManager.getBackupDirectory(tempDirectory.root)
-        val today = LocalDate.of(2022, 10, 17)
-        val f1 = backupDir.newBackupFile("collection-2022-10-17-23-04.colpkg")
-        val f2 = backupDir.newBackupFile("collection-2022-10-17-13-54.colpkg")
-        val f3 = backupDir.newBackupFile("collection-2022-10-17-13-04.colpkg")
-        val f4 = backupDir.newBackupFile("collection-2022-10-17-10-09.colpkg")
-        val f5 = backupDir.newBackupFile("collection-2022-10-16-23-04.colpkg")
-        val f6 = backupDir.newBackupFile("collection-2022-10-15-23-04.colpkg")
-        val f7 = backupDir.newBackupFile("collection-2022-10-01-23-04.colpkg")
-        val f8 = backupDir.newBackupFile("collection-2022-09-22-23-04.colpkg")
-        val f9 = backupDir.newBackupFile("collection-2022-08-11-23-04.colpkg")
-
-        BackupManager.deleteColBackups(colFile.path, newBackupLimits(1, 1, 1), today)
-
-        assertThat("Current day backup should have been kept", f1, anExistingFile()) // current day backup
-        assertThat("Current day backup should have been kept", f2, anExistingFile()) // current day backup
-        assertThat("Current day backup should have been kept", f3, anExistingFile()) // current day backup
-        assertThat("Current day backup should have been kept", f4, anExistingFile()) // current day backup
-        assertThat("Newer daily backup should have been kept", f5, anExistingFile()) // daily backup
-        assertThat("Obsolete weekly backup should have been removed", f6, not(anExistingFile())) // obsolete week backup
-        assertThat("Newer weekly backup should have been kept", f7, anExistingFile()) // weekly backup
-        assertThat("Newer monthly backup should have been kept", f8, anExistingFile()) // monthly backup
-        assertThat("Obsolete monthly backup should have been removed", f9, not(anExistingFile())) // obsolete limits were reached
-    }
-
-    @Test
-    fun handlesDailyLimitsCorrectly() {
-        val colFile = tempDirectory.newFile()
-        val backupDir = BackupManager.getBackupDirectory(tempDirectory.root)
-        val f1 = backupDir.newBackupFile("collection-2022-09-25-23-04.colpkg")
-        val f2 = backupDir.newBackupFile("collection-2022-09-24-23-04.colpkg")
-        val f3 = backupDir.newBackupFile("collection-2022-09-18-23-04.colpkg")
-        val f4 = backupDir.newBackupFile("collection-2022-09-09-23-04.colpkg")
-        val f5 = backupDir.newBackupFile("collection-2022-08-22-23-04.colpkg")
-        val f6 = backupDir.newBackupFile("collection-2022-07-11-23-04.colpkg")
-        val f7 = backupDir.newBackupFile("collection-2022-06-10-23-04.colpkg")
-
-        BackupManager.deleteColBackups(colFile.path, newBackupLimits(2, 2, 2))
-
-        assertThat("Newer daily backup should have been kept", f1, anExistingFile()) // daily backup
-        assertThat("Newer daily backup should have been kept", f2, anExistingFile()) // daily backup
-        assertThat("Newer weekly backup should have been kept", f3, anExistingFile()) // weekly backup
-        assertThat("Newer weekly backups should have been kept", f4, anExistingFile()) // weekly backup
-        assertThat("Newer monthly backup should have been kept", f5, anExistingFile()) // monthly backup
-        assertThat("Newer monthly backup should have been kept", f6, anExistingFile()) // monthly backup
-        assertThat("Obsolete backup should have been removed", f7, not(anExistingFile())) // obsolete, limits were reached
-    }
-
-    @Test
-    fun handlesWeeklyLimitsCorrectly() {
-        val colFile = tempDirectory.newFile()
-        val backupDir = BackupManager.getBackupDirectory(tempDirectory.root)
-        val f1 = backupDir.newBackupFile("collection-2022-10-25-23-04.colpkg")
-        val f2 = backupDir.newBackupFile("collection-2022-09-19-23-04.colpkg")
-        val f3 = backupDir.newBackupFile("collection-2022-09-18-23-04.colpkg")
-        val f4 = backupDir.newBackupFile("collection-2022-09-04-23-04.colpkg")
-        val f5 = backupDir.newBackupFile("collection-2022-09-03-23-04.colpkg")
-        val f6 = backupDir.newBackupFile("collection-2022-08-20-23-04.colpkg")
-        val f7 = backupDir.newBackupFile("collection-2022-06-15-23-04.colpkg")
-        val f8 = backupDir.newBackupFile("collection-2022-06-14-23-04.colpkg")
-
-        BackupManager.deleteColBackups(colFile.path, newBackupLimits(1, 3, 1))
-
-        assertThat("Newer daily backup should have been kept", f1, anExistingFile()) // daily backup
-        assertThat("Newer weekly backup should have been kept", f2, anExistingFile()) // weekly backup
-        assertThat("Obsolete backup should have been removed", f3, not(anExistingFile())) // obsolete, same week backup
-        assertThat("Newer weekly backup should have been kept", f4, anExistingFile()) // weekly backup
-        assertThat("Obsolete backup should have been removed", f5, not(anExistingFile())) // obsolete, same week backup
-        assertThat("Newer weekly backup should have been kept", f6, anExistingFile()) // weekly backup
-        assertThat("Newer monthly backup should have been kept", f7, anExistingFile()) // monthly backup
-        assertThat("Obsolete backup should have been removed", f8, not(anExistingFile())) // obsolete, limits were reached
-    }
-
-    @Test
-    fun handlesMonthlyLimitsCorrectly() {
-        val colFile = tempDirectory.newFile()
-        val backupDir = BackupManager.getBackupDirectory(tempDirectory.root)
-        val f1 = backupDir.newBackupFile("collection-2022-10-05-23-04.colpkg")
-        val f2 = backupDir.newBackupFile("collection-2022-09-20-23-04.colpkg")
-        val f3 = backupDir.newBackupFile("collection-2022-08-17-23-04.colpkg")
-        val f4 = backupDir.newBackupFile("collection-2022-08-04-23-04.colpkg")
-        val f5 = backupDir.newBackupFile("collection-2022-07-16-23-04.colpkg")
-        val f6 = backupDir.newBackupFile("collection-2022-07-14-23-04.colpkg")
-        val f7 = backupDir.newBackupFile("collection-2022-06-15-23-04.colpkg")
-        val f8 = backupDir.newBackupFile("collection-2022-06-14-23-04.colpkg")
-
-        BackupManager.deleteColBackups(colFile.path, newBackupLimits(1, 1, 3))
-
-        assertThat("Newer daily backup should have been kept", f1, anExistingFile()) // daily backup
-        assertThat("Newer weekly backup should have been kept", f2, anExistingFile()) // weekly backup
-        assertThat("Newer monthly backup should have been kept", f3, anExistingFile()) // monthly backup
-        assertThat("Obsolete backup should have been removed", f4, not(anExistingFile())) // obsolete, same month
-        assertThat("Newer monthly backup should have been kept", f5, anExistingFile()) // monthly backup
-        assertThat("Obsolete backup should have been removed", f6, not(anExistingFile())) // obsolete, same month
-        assertThat("Newer monthly backup should have been kept", f7, anExistingFile()) // monthly backup
-        assertThat("Obsolete backup should have been removed", f8, not(anExistingFile())) // obsolete, limits were reached
-    }
-
-    @Test
-    fun latest_backup_returns_null_on_no_backups() {
-        val colFile = tempDirectory.newFile()
-        assertThat(getLatestBackup(colFile), nullValue())
-    }
-
-    @Test
-    fun latest_backup_returns_null_on_invalid() {
-        val colFile = tempDirectory.newFile()
-        val backupDir = BackupManager.getBackupDirectory(tempDirectory.root)
-        File(backupDir, "blah.colpkg").createNewFile()
-        assertThat(getLatestBackup(colFile), nullValue())
-    }
-
-    @Test
-    fun latest_backup_returns_latest() {
-        val colFile = tempDirectory.newFile()
-        val backupDir = BackupManager.getBackupDirectory(tempDirectory.root)
-        File(backupDir, "collection-1990-08-31-45-04.colpkg").createNewFile()
-        File(backupDir, "collection-2010-12-06-13-04.colpkg").createNewFile()
-        File(backupDir, "blah.colpkg").createNewFile()
-        val latestBackup = getLatestBackup(colFile)
-        assertNotNull(latestBackup)
-        assertThat(latestBackup.name, equalTo("collection-2010-12-06-13-04.colpkg"))
-    }
 }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/BackupManagerTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/BackupManagerTest.kt
deleted file mode 100644
index df41e2219749..000000000000
--- a/AnkiDroid/src/test/java/com/ichi2/anki/BackupManagerTest.kt
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- *  Copyright (c) 2021 David Allison <davidallisongithub@gmail.com>
- *
- *  This program is free software; you can redistribute it and/or modify it under
- *  the terms of the GNU General Public License as published by the Free Software
- *  Foundation; either version 3 of the License, or (at your option) any later
- *  version.
- *
- *  This program is distributed in the hope that it will be useful, but WITHOUT ANY
- *  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- *  PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with
- *  this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.ichi2.anki
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ichi2.libanki.utils.Time
-import com.ichi2.testutils.MockTime
-import com.ichi2.utils.StrictMock.Companion.strictMock
-import org.hamcrest.CoreMatchers.equalTo
-import org.hamcrest.MatcherAssert.assertThat
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.mockito.Mockito.anyString
-import org.mockito.Mockito.doNothing
-import org.mockito.Mockito.doReturn
-import org.mockito.Mockito.spy
-import org.mockito.Mockito.times
-import org.mockito.Mockito.verify
-import org.mockito.Mockito.verifyNoMoreInteractions
-import org.mockito.kotlin.any
-import org.mockito.kotlin.whenever
-import java.io.File
-
-@RunWith(AndroidJUnit4::class)
-open class BackupManagerTest {
-    @Test
-    fun failsIfNoBackupsAllowed() {
-        // arrange
-        val bm = passingBackupManagerSpy
-        doReturn(true).whenever(bm).hasDisabledBackups(any())
-
-        // act
-        val performBackupResult = performBackup(bm)
-
-        // assert
-        assertThat("should fail if backups are disabled", performBackupResult, equalTo(false))
-        verify(bm, times(1)).performBackupInBackground(anyString(), any())
-        verify(bm, times(1)).hasDisabledBackups(any())
-        verifyNoMoreInteractions(bm)
-    }
-
-    /** Meta test: ensuring passingBackupManagerSpy passes  */
-    @Test
-    fun testPassingSpy() {
-        val bm = passingBackupManagerSpy
-
-        val result = performBackup(bm)
-
-        verify(bm, times(1)).performBackupInNewThread(any(), any())
-        assertThat("PerformBackup should pass", result, equalTo(true))
-    }
-
-    @Test
-    fun noBackupPerformedIfNoBackupNecessary() {
-        val bm = passingBackupManagerSpy
-
-        doReturn(true).whenever(bm).isBackupUnnecessary(any(), any())
-
-        val result = performBackup(bm)
-
-        assertThat("should fail if backups not necessary", result, equalTo(false))
-
-        verify(bm, times(1)).isBackupUnnecessary(any(), any())
-    }
-
-    @Test
-    fun noBackupPerformedIfBackupAlreadyExists() {
-        val file = strictMock(File::class.java)
-        doReturn(true).whenever(file).exists()
-
-        val bm = getPassingBackupManagerSpy(file)
-
-        val result = performBackup(bm)
-
-        assertThat("should fail if backups exists", result, equalTo(false))
-    }
-
-    @Test
-    fun noBackupPerformedIfCollectionTooSmall() {
-        val bm = passingBackupManagerSpy
-
-        doReturn(true).whenever(bm).collectionIsTooSmallToBeValid(any())
-
-        val result = performBackup(bm)
-
-        assertThat("should fail if collection too small", result, equalTo(false))
-    }
-
-    private fun performBackup(
-        bm: BackupManager,
-        time: Time = MockTime(100000000),
-    ): Boolean = bm.performBackupInBackground("/AnkiDroid/", time)
-
-    /** Returns a spy of BackupManager which would pass  */
-    private val passingBackupManagerSpy: BackupManager
-        get() = getPassingBackupManagerSpy(null)
-
-    /** Returns a spy of BackupManager which would pass  */
-    private fun getPassingBackupManagerSpy(backupFileMock: File?): BackupManager {
-        val spy = spy(BackupManager.createInstance())
-        doReturn(true).whenever(spy).hasFreeDiscSpace(any())
-        doReturn(false).whenever(spy).collectionIsTooSmallToBeValid(any())
-        doNothing().whenever(spy).performBackupInNewThread(any(), any())
-        doReturn(null).whenever(spy).getLastBackupDate(any())
-
-        val f = backupFileMock ?: this.backupFileMock
-        doReturn(f).whenever(spy).getBackupFile(any(), any())
-        return spy
-    }
-
-    // strict mock
-    private val backupFileMock: File
-        get() {
-            val f = strictMock(File::class.java)
-            doReturn(false).whenever(f).exists()
-            return f
-        }
-}

From ae33bd1d95f55747e14e51c6f6360d9743d83683 Mon Sep 17 00:00:00 2001
From: David Allison <62114487+david-allison@users.noreply.github.com>
Date: Thu, 20 Mar 2025 15:49:05 +0000
Subject: [PATCH 134/200] fix: Kotlin 2.1.20 Upgrade Errors

'when' is exhaustive so 'else' is redundant here.

The resulting type of this 'javaClass' call is
'Class<DeckPicker.Companion>' and not 'Class<DeckPicker>'.
Use '::class.java' to access type 'Class<DeckPicker>'.

See PR 18140
---
 AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt            | 1 -
 AnkiDroid/src/main/java/com/ichi2/anki/IntentHandler.kt         | 2 +-
 .../src/main/java/com/ichi2/anki/dialogs/ExportReadyDialog.kt   | 2 +-
 .../src/main/java/com/ichi2/anki/dialogs/MediaCheckDialog.kt    | 2 +-
 .../src/main/java/com/ichi2/anki/dialogs/SyncErrorDialog.kt     | 2 +-
 AnkiDroid/src/main/java/com/ichi2/libanki/Sound.kt              | 1 -
 6 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt b/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
index 2c5b23793909..1de4fe77ce7c 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
@@ -854,7 +854,6 @@ open class DeckPicker :
                 }
             is DiskFull -> displayNoStorageError()
             is DBError -> displayDatabaseFailure(CustomExceptionData.fromException(failure.exception))
-            else -> displayDatabaseFailure()
         }
     }
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/IntentHandler.kt b/AnkiDroid/src/main/java/com/ichi2/anki/IntentHandler.kt
index 74a32e2998de..3feecbb02081 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/IntentHandler.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/IntentHandler.kt
@@ -409,7 +409,7 @@ class IntentHandler : AbstractIntentHandler() {
                     showError(
                         activity,
                         activity.getString(R.string.something_wrong),
-                        ClassCastException(activity.javaClass.simpleName + " is not " + DeckPicker.javaClass.simpleName),
+                        ClassCastException(activity.javaClass.simpleName + " is not " + DeckPicker::class.java.simpleName),
                         true,
                     )
                     return
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/ExportReadyDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/ExportReadyDialog.kt
index 106096c1b903..8af9e54ce516 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/ExportReadyDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/ExportReadyDialog.kt
@@ -79,7 +79,7 @@ class ExportReadyDialog(
                 showError(
                     activity,
                     activity.getString(R.string.something_wrong),
-                    ClassCastException(activity.javaClass.simpleName + " is not " + DeckPicker.javaClass.simpleName),
+                    ClassCastException(activity.javaClass.simpleName + " is not " + DeckPicker::class.java.simpleName),
                     true,
                 )
                 return
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/MediaCheckDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/MediaCheckDialog.kt
index b3635a1b33e4..99d3e736244e 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/MediaCheckDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/MediaCheckDialog.kt
@@ -284,7 +284,7 @@ class MediaCheckDialog : AsyncDialogFragment() {
                         showError(
                             activity,
                             activity.getString(R.string.something_wrong),
-                            ClassCastException(activity.javaClass.simpleName + " is not " + DeckPicker.javaClass.simpleName),
+                            ClassCastException(activity.javaClass.simpleName + " is not " + DeckPicker::class.java.simpleName),
                             true,
                         )
                         return
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SyncErrorDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SyncErrorDialog.kt
index aa0d3bf3aa20..baf02d0220b6 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SyncErrorDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SyncErrorDialog.kt
@@ -321,7 +321,7 @@ class SyncErrorDialog : AsyncDialogFragment() {
                 showError(
                     activity,
                     activity.getString(R.string.something_wrong),
-                    ClassCastException(activity.javaClass.simpleName + " is not " + DeckPicker.javaClass.simpleName),
+                    ClassCastException(activity.javaClass.simpleName + " is not " + DeckPicker::class.java.simpleName),
                     true,
                 )
                 return
diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/Sound.kt b/AnkiDroid/src/main/java/com/ichi2/libanki/Sound.kt
index 3d82c3709f74..25857da89be9 100644
--- a/AnkiDroid/src/main/java/com/ichi2/libanki/Sound.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/libanki/Sound.kt
@@ -167,7 +167,6 @@ object Sound {
                     SoundOrVideoTag.Type.VIDEO -> asVideo(tag)
                 }
             }
-            else -> throw IllegalStateException("unrecognised tag")
         }
     }
 

From b465542a84ede6f2069fe430a2a45adefe9bfab2 Mon Sep 17 00:00:00 2001
From: David Allison <62114487+david-allison@users.noreply.github.com>
Date: Tue, 18 Mar 2025 18:51:02 +0000
Subject: [PATCH 135/200] fix(lint): link to standard-models

example: https://crowdin.com/editor/ankidroid/8232/en-sat#q=back_field_name
---
 lint-rules/src/main/java/com/ichi2/anki/lint/utils/Crowdin.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lint-rules/src/main/java/com/ichi2/anki/lint/utils/Crowdin.kt b/lint-rules/src/main/java/com/ichi2/anki/lint/utils/Crowdin.kt
index c4002e93100b..616c1191f144 100644
--- a/lint-rules/src/main/java/com/ichi2/anki/lint/utils/Crowdin.kt
+++ b/lint-rules/src/main/java/com/ichi2/anki/lint/utils/Crowdin.kt
@@ -47,7 +47,7 @@ value class CrowdinFileIdentifier(
                 "11-arrays" to 8174,
                 "16-multimedia-editor" to 8229,
                 "17-model-manager" to 8230,
-                "19-standard-models" to 8232,
+                "18-standard-models" to 8232,
                 "20-search-preference" to 8236,
             ).mapValues { CrowdinFileIdentifier(it.value.toLong()) }
 

From e4bd5775582d9af2bb9c9553036429f8ad37a5e4 Mon Sep 17 00:00:00 2001
From: David Allison <62114487+david-allison@users.noreply.github.com>
Date: Tue, 18 Mar 2025 18:53:37 +0000
Subject: [PATCH 136/200] fix(lint): link for `<plurals>` and `<string-array>`

Somewhat confusing for string-array, but better than no link

example: https://crowdin.com/editor/ankidroid/8170/en-uk#q=card_browser_order_labels
---
 .../main/java/com/ichi2/anki/lint/utils/Crowdin.kt   | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/lint-rules/src/main/java/com/ichi2/anki/lint/utils/Crowdin.kt b/lint-rules/src/main/java/com/ichi2/anki/lint/utils/Crowdin.kt
index 616c1191f144..f9fae29cfb10 100644
--- a/lint-rules/src/main/java/com/ichi2/anki/lint/utils/Crowdin.kt
+++ b/lint-rules/src/main/java/com/ichi2/anki/lint/utils/Crowdin.kt
@@ -116,7 +116,17 @@ data class CrowdinContext(
     val languageTag: CrowdinLanguageTag,
     val fileIdentifier: CrowdinFileIdentifier,
 ) {
-    private fun getStringName(element: Element): String? = if (element.hasAttribute("name")) element.getAttribute("name") else null
+    private fun getStringName(element: Element?): String? {
+        if (element == null) return null
+        return when (element.tagName) {
+            // <string-array> or <plurals>
+            "item" -> {
+                val parentElement = element.parentNode as? Element? ?: return null
+                getStringName(parentElement)
+            }
+            else -> if (element.hasAttribute("name")) element.getAttribute("name") else null
+        }
+    }
 
     fun getEditUrl(element: Element): String? {
         val stringName = getStringName(element) ?: return null

From 124484bf2ed7ece242bb6337011a3a4121fbb6c7 Mon Sep 17 00:00:00 2001
From: Mike Hardy <github@mikehardy.net>
Date: Fri, 21 Mar 2025 19:57:40 -0500
Subject: [PATCH 137/200] Dependency Updates 20250321

---
 .github/workflows/publish.yml                 |   2 +-
 .../com/ichi2/anki/AbstractFlashcardViewer.kt |  14 +-
 .../main/java/com/ichi2/anki/AnkiActivity.kt  |   3 +-
 .../main/java/com/ichi2/anki/AnkiDroidApp.kt  |   4 +-
 .../java/com/ichi2/anki/AnkiDroidJsAPI.kt     |   4 +-
 .../java/com/ichi2/anki/CardTemplateEditor.kt |   5 +-
 .../ichi2/anki/CustomActionModeCallback.kt    |   5 +-
 .../main/java/com/ichi2/anki/DeckPicker.kt    |  12 +-
 .../java/com/ichi2/anki/DrawingActivity.kt    |   3 +-
 .../src/main/java/com/ichi2/anki/Info.kt      |   4 +-
 .../src/main/java/com/ichi2/anki/MetaDB.kt    |   7 +-
 .../src/main/java/com/ichi2/anki/MyAccount.kt |  10 +-
 .../ichi2/anki/NavigationDrawerActivity.kt    |   6 +-
 .../main/java/com/ichi2/anki/NoteEditor.kt    |   3 +-
 .../com/ichi2/anki/NotificationChannels.kt    |   4 +-
 .../src/main/java/com/ichi2/anki/ReadText.kt  |   3 +-
 .../src/main/java/com/ichi2/anki/Reviewer.kt  |   3 +-
 .../ichi2/anki/SharedDecksDownloadFragment.kt |   6 +-
 .../main/java/com/ichi2/anki/Whiteboard.kt    |   3 +-
 .../anki/browser/BrowserMultiColumnAdapter.kt |   4 +-
 .../cardviewer/OnRenderProcessGoneDelegate.kt |   3 +-
 .../ichi2/anki/cardviewer/SoundTagPlayer.kt   |   5 +-
 .../com/ichi2/anki/cardviewer/VideoPlayer.kt  |   4 +-
 .../ichi2/anki/dialogs/DatabaseErrorDialog.kt |   8 +-
 .../com/ichi2/anki/dialogs/SyncErrorDialog.kt |   4 +-
 .../anki/dialogs/TtsPlaybackErrorDialog.kt    |   4 +-
 .../dialogs/help/HelpItemActionsDispatcher.kt |   6 +-
 .../com/ichi2/anki/dialogs/tags/TagsDialog.kt |   3 +-
 .../anki/multimedia/MultimediaFragment.kt     |   3 +-
 .../ichi2/anki/multimedia/MultimediaUtils.kt  |   3 +-
 .../anki/multimedia/audio/AudioWaveform.kt    |  12 +-
 .../java/com/ichi2/anki/noteeditor/Toolbar.kt |  10 +-
 .../java/com/ichi2/anki/pages/PageFragment.kt |   4 +-
 .../anki/previewer/CardViewerFragment.kt      |   4 +-
 .../anki/provider/CardContentProvider.kt      |   3 +-
 .../com/ichi2/anki/reviewer/AnswerTimer.kt    |   3 +-
 .../com/ichi2/anki/reviewer/CardMarker.kt     |   3 +-
 .../com/ichi2/anki/reviewer/EaseButton.kt     |   3 +-
 .../anki/scheduling/ForgetCardsDialog.kt      |   4 +-
 .../java/com/ichi2/anki/utils/AndroidUtils.kt |   3 +-
 .../com/ichi2/anki/widgets/DeckAdapter.kt     |  13 +-
 .../ichi2/anki/workarounds/DialogTitleView.kt |  24 +-
 .../java/com/ichi2/compat/CompatHelper.kt     |   2 +
 .../main/java/com/ichi2/compat/CompatV26.kt   |   4 +-
 .../main/java/com/ichi2/compat/CompatV29.kt   |   4 +-
 .../main/java/com/ichi2/compat/CompatV31.kt   |   4 +-
 .../main/java/com/ichi2/compat/CompatV33.kt   |   4 +-
 .../main/java/com/ichi2/compat/CompatV34.kt   |   4 +-
 .../compat/customtabs/CustomTabsHelper.kt     |   4 +-
 .../src/main/java/com/ichi2/libanki/Sound.kt  |   4 +-
 .../src/main/java/com/ichi2/themes/Themes.kt  |  19 +-
 .../main/java/com/ichi2/utils/AdaptionUtil.kt |   4 +-
 .../com/ichi2/utils/ContentResolverUtil.kt    |   3 +-
 .../main/java/com/ichi2/utils/HtmlUtils.kt    |   4 +-
 .../java/com/ichi2/anki/DeckPickerTest.kt     |   8 +-
 .../java/com/ichi2/anki/IntentHandlerTest.kt  |  12 +-
 .../test/java/com/ichi2/anki/ReviewerTest.kt  |   5 +-
 .../anki/cardviewer/MediaErrorHandlerTest.kt  |   3 +-
 .../ichi2/anki/dialogs/tags/TagsDialogTest.kt |   1 -
 .../com/ichi2/compat/CompatDeleteFileTest.kt  |   2 +
 .../test/java/com/ichi2/compat/Test21And26.kt |   1 +
 .../customtabs/CustomTabActivityHelperTest.kt |   4 +-
 .../ichi2/utils/ContentResolverUtilTest.kt    |   3 +-
 .../java/com/ichi2/utils/ImportUtilsTest.kt   |   3 +-
 build.gradle.kts                              |   3 +-
 gradle/libs.versions.toml                     |  28 +-
 gradle/wrapper/gradle-wrapper.jar             | Bin 43583 -> 43705 bytes
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 gradlew                                       |   2 +-
 tools/localization/package.json               |  26 +-
 tools/localization/yarn.lock                  | 322 +++++++++---------
 71 files changed, 385 insertions(+), 334 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 52abb17a06e9..58f4a4ae09bc 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -56,7 +56,7 @@ jobs:
           git remote set-url origin git@github.com:$GITHUB_REPOSITORY
         shell: bash
 
-      - uses: webfactory/ssh-agent@v0.9.0
+      - uses: webfactory/ssh-agent@v0.9.1
         with:
           ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.kt b/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.kt
index 496c7ab6da67..c866a2c02b3d 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.kt
@@ -22,7 +22,6 @@
 package com.ichi2.anki
 
 import android.annotation.SuppressLint
-import android.annotation.TargetApi
 import android.content.ActivityNotFoundException
 import android.content.ClipboardManager
 import android.content.Context
@@ -70,11 +69,14 @@ import androidx.activity.result.ActivityResultCallback
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.CheckResult
 import androidx.annotation.IdRes
+import androidx.annotation.RequiresApi
 import androidx.annotation.VisibleForTesting
 import androidx.appcompat.app.AlertDialog
+import androidx.core.net.toUri
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
 import androidx.core.view.children
+import androidx.core.view.isVisible
 import androidx.lifecycle.Lifecycle.State.RESUMED
 import anki.collection.OpChanges
 import com.drakeet.drawer.FullDraggableContainer
@@ -1301,7 +1303,7 @@ abstract class AbstractFlashcardViewer :
     }
 
     override fun automaticShowAnswer() {
-        if (flipCardLayout!!.isEnabled && flipCardLayout!!.visibility == View.VISIBLE) {
+        if (flipCardLayout!!.isEnabled && flipCardLayout!!.isVisible) {
             flipCardLayout!!.performClick()
         }
     }
@@ -2521,7 +2523,7 @@ abstract class AbstractFlashcardViewer :
                             intent =
                                 Intent(
                                     Intent.ACTION_VIEW,
-                                    Uri.parse("market://details?id=$packageName"),
+                                    "market://details?id=$packageName".toUri(),
                                 )
                             if (packageManager.resolveActivityCompat(
                                     intent,
@@ -2541,7 +2543,7 @@ abstract class AbstractFlashcardViewer :
             }
             if (intent == null) {
                 Timber.d("Opening external link \"%s\" with an Intent", url)
-                intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
+                intent = Intent(Intent.ACTION_VIEW, url.toUri())
             } else {
                 Timber.d("Opening resolved external link \"%s\" with an Intent: %s", url, intent)
             }
@@ -2592,7 +2594,7 @@ abstract class AbstractFlashcardViewer :
             }
         }
 
-        @TargetApi(Build.VERSION_CODES.O)
+        @RequiresApi(Build.VERSION_CODES.O)
         override fun onRenderProcessGone(
             view: WebView,
             detail: RenderProcessGoneDetail,
@@ -2627,7 +2629,7 @@ abstract class AbstractFlashcardViewer :
 
     internal fun displayCouldNotFindMediaSnackbar(filename: String?) {
         showSnackbar(getString(R.string.card_viewer_could_not_find_image, filename)) {
-            setAction(R.string.help) { openUrl(Uri.parse(getString(R.string.link_faq_missing_media))) }
+            setAction(R.string.help) { openUrl(getString(R.string.link_faq_missing_media).toUri()) }
         }
     }
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/AnkiActivity.kt b/AnkiDroid/src/main/java/com/ichi2/anki/AnkiActivity.kt
index 11d5d47cab9b..d76681163591 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/AnkiActivity.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/AnkiActivity.kt
@@ -41,6 +41,7 @@ import androidx.browser.customtabs.CustomTabsIntent.COLOR_SCHEME_SYSTEM
 import androidx.core.app.NotificationCompat
 import androidx.core.app.PendingIntentCompat
 import androidx.core.content.ContextCompat
+import androidx.core.net.toUri
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
@@ -458,7 +459,7 @@ open class AnkiActivity :
     }
 
     fun openUrl(urlString: String) {
-        openUrl(Uri.parse(urlString))
+        openUrl(urlString.toUri())
     }
 
     fun openUrl(
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidApp.kt b/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidApp.kt
index 197a81cb3cbf..c6c56b890515 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidApp.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidApp.kt
@@ -23,7 +23,6 @@ import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
 import android.content.res.Resources
-import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.os.Environment
@@ -31,6 +30,7 @@ import android.system.Os
 import android.webkit.CookieManager
 import androidx.annotation.VisibleForTesting
 import androidx.core.content.edit
+import androidx.core.net.toUri
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.MutableLiveData
 import androidx.work.Configuration
@@ -434,7 +434,7 @@ open class AnkiDroidApp :
         fun getMarketIntent(context: Context): Intent {
             val uri =
                 context.getString(if (CompatHelper.isKindle) R.string.link_market_kindle else R.string.link_market)
-            val parsed = Uri.parse(uri)
+            val parsed = uri.toUri()
             return Intent(Intent.ACTION_VIEW, parsed)
         } // TODO actually this can be done by translating "link_help" string for each language when the App is
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidJsAPI.kt b/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidJsAPI.kt
index a188ec9968d6..16a4c4ab201f 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidJsAPI.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidJsAPI.kt
@@ -21,7 +21,7 @@ package com.ichi2.anki
 
 import android.content.Context
 import android.content.Intent
-import android.net.Uri
+import androidx.core.net.toUri
 import androidx.lifecycle.lifecycleScope
 import com.github.zafarkhaja.semver.Version
 import com.google.android.material.snackbar.Snackbar
@@ -148,7 +148,7 @@ open class AnkiDroidJsAPI(
         activity.showSnackbar(snackbarMsg, Snackbar.LENGTH_INDEFINITE) {
             setMaxLines(3)
             setAction(R.string.reviewer_invalid_api_version_visit_documentation) {
-                activity.openUrl(Uri.parse("https://github.com/ankidroid/Anki-Android/wiki"))
+                activity.openUrl("https://github.com/ankidroid/Anki-Android/wiki".toUri())
             }
         }
     }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateEditor.kt b/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateEditor.kt
index 5d65dff94f9e..02eafe096537 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateEditor.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateEditor.kt
@@ -44,6 +44,7 @@ import androidx.core.view.MenuHost
 import androidx.core.view.MenuProvider
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.size
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.FragmentContainerView
@@ -616,14 +617,14 @@ open class CardTemplateEditor :
                 if (menu.findItem(insertFieldId) != null) {
                     return false
                 }
-                val initialSize = menu.size()
+                val initialSize = menu.size
 
                 if (currentEditorViewId != R.id.styling_edit) {
                     // 10644: Do not pass in a R.string as the final parameter as MIUI on Android 12 crashes.
                     menu.add(Menu.FIRST, insertFieldId, 0, getString(R.string.card_template_editor_insert_field))
                 }
 
-                return initialSize != menu.size()
+                return initialSize != menu.size
             }
 
             override fun onActionItemClicked(
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/CustomActionModeCallback.kt b/AnkiDroid/src/main/java/com/ichi2/anki/CustomActionModeCallback.kt
index 49fba5c93cfd..6c1199abb57a 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/CustomActionModeCallback.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/CustomActionModeCallback.kt
@@ -21,6 +21,7 @@ import android.view.ActionMode
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
+import androidx.core.view.size
 
 /**
  * Custom ActionMode.Callback implementation for adding and handling cloze deletion action
@@ -57,7 +58,7 @@ class CustomActionModeCallback(
             item.isVisible = false
         }
 
-        val initialSize = menu.size()
+        val initialSize = menu.size
         if (isClozeType) {
             menu.add(
                 Menu.NONE,
@@ -66,7 +67,7 @@ class CustomActionModeCallback(
                 clozeMenuTitle,
             )
         }
-        return initialSize != menu.size()
+        return initialSize != menu.size
     }
 
     override fun onActionItemClicked(
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt b/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
index 1de4fe77ce7c..fa5d32e124ad 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
@@ -25,6 +25,7 @@
 
 package com.ichi2.anki
 
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
@@ -32,7 +33,6 @@ import android.content.SharedPreferences
 import android.database.SQLException
 import android.graphics.PixelFormat
 import android.graphics.drawable.Drawable
-import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.os.Message
@@ -66,6 +66,7 @@ import androidx.core.content.edit
 import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.content.pm.ShortcutManagerCompat
 import androidx.core.graphics.drawable.IconCompat
+import androidx.core.net.toUri
 import androidx.core.os.bundleOf
 import androidx.core.util.component1
 import androidx.core.util.component2
@@ -524,7 +525,7 @@ open class DeckPicker :
         // check, if tablet layout
         studyoptionsFrame = findViewById(R.id.studyoptions_fragment)
         // set protected variable from NavigationDrawerActivity
-        fragmented = studyoptionsFrame != null && studyoptionsFrame!!.visibility == View.VISIBLE
+        fragmented = studyoptionsFrame != null && studyoptionsFrame!!.isVisible
 
         // Open StudyOptionsFragment if in fragmented mode
         if (fragmented && !startupError) {
@@ -1772,6 +1773,7 @@ open class DeckPicker :
         showDialogFragment(DeckPickerAnalyticsOptInDialog.newInstance())
     }
 
+    @SuppressLint("UseKtx") // keep SharedPreferences.edit() instead of edit {} fot tests
     fun getPreviousVersion(
         preferences: SharedPreferences,
         current: Long,
@@ -2123,7 +2125,7 @@ open class DeckPicker :
             negativeButton(R.string.dialog_cancel)
             if (AdaptionUtil.hasWebBrowser(this@DeckPicker)) {
                 neutralButton(text = TR.schedulingUpdateMoreInfoButton()) {
-                    this@DeckPicker.openUrl(Uri.parse("https://faqs.ankiweb.net/the-anki-2.1-scheduler.html#updating"))
+                    this@DeckPicker.openUrl("https://faqs.ankiweb.net/the-anki-2.1-scheduler.html#updating".toUri())
                 }
             }
         }
@@ -2301,8 +2303,8 @@ open class DeckPicker :
                     8f,
                     resources.displayMetrics,
                 )
-            val decksListShown = deckPickerContent.visibility == View.VISIBLE
-            val placeholderShown = noDecksPlaceholder.visibility == View.VISIBLE
+            val decksListShown = deckPickerContent.isVisible
+            val placeholderShown = noDecksPlaceholder.isVisible
             if (isEmpty) {
                 if (decksListShown) {
                     fadeOut(deckPickerContent, shortAnimDuration, translation)
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/DrawingActivity.kt b/AnkiDroid/src/main/java/com/ichi2/anki/DrawingActivity.kt
index df5ecc8d3271..453d43d8be79 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/DrawingActivity.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/DrawingActivity.kt
@@ -25,6 +25,7 @@ import android.view.View
 import android.widget.LinearLayout
 import androidx.core.content.ContextCompat
 import androidx.core.view.MenuItemCompat
+import androidx.core.view.isGone
 import com.ichi2.libanki.utils.TimeManager
 import com.ichi2.themes.Themes
 import com.ichi2.utils.iconAlpha
@@ -83,7 +84,7 @@ class DrawingActivity : AnkiActivity() {
             }
             R.id.action_whiteboard_edit -> {
                 Timber.i("Drawing:: Pen Color button pressed")
-                if (colorPalette.visibility == View.GONE) {
+                if (colorPalette.isGone) {
                     colorPalette.visibility = View.VISIBLE
                 } else {
                     colorPalette.visibility = View.GONE
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/Info.kt b/AnkiDroid/src/main/java/com/ichi2/anki/Info.kt
index 7c3e00814c25..cc96445dd897 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/Info.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/Info.kt
@@ -19,7 +19,6 @@
 package com.ichi2.anki
 
 import android.annotation.SuppressLint
-import android.net.Uri
 import android.os.Bundle
 import android.view.View
 import android.webkit.WebChromeClient
@@ -27,6 +26,7 @@ import android.webkit.WebResourceRequest
 import android.webkit.WebView
 import android.webkit.WebViewClient
 import androidx.activity.OnBackPressedCallback
+import androidx.core.net.toUri
 import com.google.android.material.button.MaterialButton
 import com.ichi2.anki.preferences.sharedPrefs
 import com.ichi2.anki.snackbar.BaseSnackbarBuilderProvider
@@ -72,7 +72,7 @@ class Info :
         enableToolbar(mainView)
         findViewById<MaterialButton>(
             R.id.info_donate,
-        ).setOnClickListener { openUrl(Uri.parse(getString(R.string.link_opencollective_donate))) }
+        ).setOnClickListener { openUrl(getString(R.string.link_opencollective_donate).toUri()) }
         title = "$appName v$pkgVersionName"
         webView = findViewById(R.id.info)
         webView.webChromeClient =
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/MetaDB.kt b/AnkiDroid/src/main/java/com/ichi2/anki/MetaDB.kt
index fa8138d5b26a..e60a0cb981c7 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/MetaDB.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/MetaDB.kt
@@ -6,6 +6,7 @@ import android.database.Cursor
 import android.database.sqlite.SQLiteDatabase
 import android.database.sqlite.SQLiteException
 import androidx.annotation.WorkerThread
+import androidx.core.database.sqlite.transaction
 import com.ichi2.anki.model.WhiteboardPenColor
 import com.ichi2.anki.model.WhiteboardPenColor.Companion.default
 import com.ichi2.anki.reviewer.CardSide
@@ -666,17 +667,13 @@ object MetaDB {
         openDBIfClosed(context)
         try {
             val metaDb = mMetaDb!!
-            metaDb.beginTransaction()
-            try {
+            metaDb.transaction {
                 // First clear all the existing content.
                 metaDb.execSQL("DELETE FROM smallWidgetStatus")
                 metaDb.execSQL(
                     "INSERT INTO smallWidgetStatus(due, eta) VALUES (?, ?)",
                     arrayOf<Any>(status.due, status.eta),
                 )
-                metaDb.setTransactionSuccessful()
-            } finally {
-                metaDb.endTransaction()
             }
         } catch (e: IllegalStateException) {
             Timber.e(e, "MetaDB.storeSmallWidgetStatus: failed")
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/MyAccount.kt b/AnkiDroid/src/main/java/com/ichi2/anki/MyAccount.kt
index d3d3fcf34a54..ec902be5d98c 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/MyAccount.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/MyAccount.kt
@@ -16,7 +16,6 @@ package com.ichi2.anki
 import android.content.Context
 import android.content.pm.PackageManager
 import android.content.res.Configuration
-import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.text.Editable
@@ -32,6 +31,7 @@ import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.widget.Toolbar
 import androidx.core.content.ContextCompat
+import androidx.core.net.toUri
 import androidx.core.view.isVisible
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
@@ -111,7 +111,7 @@ open class MyAccount : AnkiActivity() {
             finish()
             return
         }
-        mayOpenUrl(Uri.parse(resources.getString(R.string.register_url)))
+        mayOpenUrl(resources.getString(R.string.register_url).toUri())
         initAllContentViews()
         if (isLoggedIn()) {
             switchToState(STATE_LOGGED_IN)
@@ -182,7 +182,7 @@ open class MyAccount : AnkiActivity() {
     }
 
     private fun resetPassword() {
-        super.openUrl(Uri.parse(resources.getString(R.string.resetpw_url)))
+        super.openUrl(resources.getString(R.string.resetpw_url).toUri())
     }
 
     private fun initAllContentViews() {
@@ -266,12 +266,12 @@ open class MyAccount : AnkiActivity() {
         val resetPWButton = loginToMyAccountView.findViewById<Button>(R.id.reset_password_button)
         resetPWButton.setOnClickListener { resetPassword() }
         val signUpButton = loginToMyAccountView.findViewById<Button>(R.id.sign_up_button)
-        val url = Uri.parse(resources.getString(R.string.register_url))
+        val url = resources.getString(R.string.register_url).toUri()
         signUpButton.setOnClickListener { openUrl(url) }
 
         // Add button to link to instructions on how to find AnkiWeb email
         val lostEmail = loginToMyAccountView.findViewById<Button>(R.id.lost_mail_instructions)
-        val lostMailUrl = Uri.parse(resources.getString(R.string.link_ankiweb_lost_email_instructions))
+        val lostMailUrl = resources.getString(R.string.link_ankiweb_lost_email_instructions).toUri()
         lostEmail.setOnClickListener { openUrl(lostMailUrl) }
         loggedIntoMyAccountView =
             layoutInflater.inflate(R.layout.my_account_logged_in, null).apply {
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/NavigationDrawerActivity.kt b/AnkiDroid/src/main/java/com/ichi2/anki/NavigationDrawerActivity.kt
index 54dec99fe002..848a4a10e83b 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/NavigationDrawerActivity.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/NavigationDrawerActivity.kt
@@ -37,6 +37,8 @@ import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.content.pm.ShortcutManagerCompat
 import androidx.core.graphics.drawable.IconCompat
 import androidx.core.view.GravityCompat
+import androidx.core.view.get
+import androidx.core.view.size
 import androidx.drawerlayout.widget.ClosableDrawerLayout
 import androidx.drawerlayout.widget.DrawerLayout
 import com.google.android.material.color.MaterialColors
@@ -210,8 +212,8 @@ abstract class NavigationDrawerActivity :
     protected fun selectNavigationItem(itemId: Int) {
         val menu = navigationView!!.menu
         if (itemId == -1) {
-            for (i in 0 until menu.size()) {
-                menu.getItem(i).isChecked = false
+            for (i in 0 until menu.size) {
+                menu[i].isChecked = false
             }
         } else {
             val item = menu.findItem(itemId)
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt b/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt
index 834117521336..69c7940bbce9 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt
@@ -65,6 +65,7 @@ import androidx.core.content.FileProvider
 import androidx.core.content.IntentCompat
 import androidx.core.content.edit
 import androidx.core.content.res.ResourcesCompat
+import androidx.core.net.toUri
 import androidx.core.os.BundleCompat
 import androidx.core.text.HtmlCompat
 import androidx.core.util.component1
@@ -2455,7 +2456,7 @@ class NoteEditor :
             AlertDialog
                 .Builder(requireContext())
                 .neutralButton(R.string.help) {
-                    requireAnkiActivity().openUrl(Uri.parse(getString(R.string.link_manual_note_format_toolbar)))
+                    requireAnkiActivity().openUrl(getString(R.string.link_manual_note_format_toolbar).toUri())
                 }.negativeButton(R.string.dialog_cancel)
 
     private fun displayAddToolbarDialog() {
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/NotificationChannels.kt b/AnkiDroid/src/main/java/com/ichi2/anki/NotificationChannels.kt
index 3dbabc528699..dbfa9fc0cd33 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/NotificationChannels.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/NotificationChannels.kt
@@ -17,12 +17,12 @@
 
 package com.ichi2.anki
 
-import android.annotation.TargetApi
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
 import android.content.Intent
 import android.content.res.Resources
+import androidx.annotation.RequiresApi
 import androidx.annotation.StringRes
 import androidx.core.app.NotificationCompat
 import timber.log.Timber
@@ -40,7 +40,7 @@ object NotificationChannels {
      * TODO should be called in response to [Intent.ACTION_LOCALE_CHANGED]
      * @param context the context for access to localized strings for channel names
      */
-    @TargetApi(26)
+    @RequiresApi(26)
     fun setup(context: Context) {
         val res = context.resources
         for (channel in Channel.entries) {
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ReadText.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ReadText.kt
index 088205788817..888302b8e1c4 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ReadText.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ReadText.kt
@@ -24,6 +24,7 @@ import android.speech.tts.UtteranceProgressListener
 import android.view.WindowManager.BadTokenException
 import androidx.annotation.VisibleForTesting
 import androidx.appcompat.app.AlertDialog
+import androidx.core.net.toUri
 import com.ichi2.anki.cardviewer.SingleCardSide
 import com.ichi2.anki.provider.pureAnswer
 import com.ichi2.anki.reviewer.CardSide
@@ -304,7 +305,7 @@ object ReadText {
                                     errorToDeveloperString(errorCode),
                                     errorCode,
                                 )
-                                val helpUrl = Uri.parse(context.getString(R.string.link_faq_tts))
+                                val helpUrl = context.getString(R.string.link_faq_tts).toUri()
                                 val ankiActivity = context as AnkiActivity
                                 ankiActivity.mayOpenUrl(helpUrl)
                                 // TODO: We can do better in this UI now we have a reason for failure
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.kt b/AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.kt
index 5aa140d77cfd..23a2d4cc9683 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.kt
@@ -53,6 +53,7 @@ import androidx.appcompat.widget.ThemeUtils
 import androidx.appcompat.widget.Toolbar
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
+import androidx.core.view.isGone
 import androidx.lifecycle.lifecycleScope
 import anki.frontend.SetSchedulingStatesRequest
 import com.google.android.material.color.MaterialColors
@@ -547,7 +548,7 @@ open class Reviewer :
     }
 
     public override fun changeWhiteboardPenColor() {
-        if (colorPalette.visibility == View.GONE) {
+        if (colorPalette.isGone) {
             colorPalette.visibility = View.VISIBLE
         } else {
             colorPalette.visibility = View.GONE
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/SharedDecksDownloadFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/SharedDecksDownloadFragment.kt
index 728e68fbe243..f70037b61e24 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/SharedDecksDownloadFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/SharedDecksDownloadFragment.kt
@@ -24,7 +24,6 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.database.Cursor
-import android.net.Uri
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
@@ -38,6 +37,7 @@ import androidx.annotation.VisibleForTesting
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
+import androidx.core.net.toUri
 import androidx.fragment.app.Fragment
 import com.ichi2.anki.SharedDecksActivity.Companion.DOWNLOAD_FILE
 import com.ichi2.anki.snackbar.showSnackbar
@@ -174,7 +174,7 @@ class SharedDecksDownloadFragment : Fragment(R.layout.fragment_shared_decks_down
         openInBrowserButton.setOnClickListener {
             Timber.i("'Open in Browser' clicked")
             downloadManager.remove(downloadId)
-            openUrl(Uri.parse(requireContext().getDeckPageUri(fileToBeDownloaded.url)))
+            openUrl(requireContext().getDeckPageUri(fileToBeDownloaded.url).toUri())
             parentFragmentManager.popBackStack()
         }
 
@@ -233,7 +233,7 @@ class SharedDecksDownloadFragment : Fragment(R.layout.fragment_shared_decks_down
         fileToBeDownloaded: DownloadFile,
         currentFileName: String,
     ): DownloadManager.Request {
-        val request: DownloadManager.Request = DownloadManager.Request(Uri.parse(fileToBeDownloaded.url))
+        val request: DownloadManager.Request = DownloadManager.Request(fileToBeDownloaded.url.toUri())
         request.setMimeType(fileToBeDownloaded.mimeType)
 
         val cookies = CookieManager.getInstance().getCookie(fileToBeDownloaded.url)
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/Whiteboard.kt b/AnkiDroid/src/main/java/com/ichi2/anki/Whiteboard.kt
index d60b1c9a44e5..a3bbfec169ca 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/Whiteboard.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/Whiteboard.kt
@@ -39,6 +39,7 @@ import android.widget.LinearLayout
 import androidx.annotation.CheckResult
 import androidx.annotation.VisibleForTesting
 import androidx.core.content.edit
+import androidx.core.graphics.scale
 import com.ichi2.anki.dialogs.WhiteBoardWidthDialog
 import com.ichi2.anki.preferences.sharedPrefs
 import com.ichi2.anki.utils.getTimestamp
@@ -264,7 +265,7 @@ class Whiteboard(
             Timber.w("Width or height <= 0: w: $w h: $h Bitmap couldn't be created with the new size")
             return
         }
-        val scaledBitmap: Bitmap = Bitmap.createScaledBitmap(bitmap, w, h, true)
+        val scaledBitmap: Bitmap = bitmap.scale(w, h, filter = true)
         bitmap = scaledBitmap
         canvas = Canvas(bitmap)
     }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserMultiColumnAdapter.kt b/AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserMultiColumnAdapter.kt
index ea0081d54083..00a3965cd7bb 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserMultiColumnAdapter.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserMultiColumnAdapter.kt
@@ -19,7 +19,6 @@ package com.ichi2.anki.browser
 import android.content.Context
 import android.content.res.ColorStateList
 import android.graphics.Paint
-import android.graphics.drawable.ColorDrawable
 import android.graphics.drawable.RippleDrawable
 import android.text.TextUtils
 import android.util.TypedValue
@@ -33,6 +32,7 @@ import androidx.annotation.ColorInt
 import androidx.annotation.IdRes
 import androidx.annotation.VisibleForTesting
 import androidx.appcompat.widget.ThemeUtils
+import androidx.core.graphics.drawable.toDrawable
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import anki.search.BrowserRow.Color
@@ -158,7 +158,7 @@ class BrowserMultiColumnAdapter(
                         arrayOf(intArrayOf(android.R.attr.state_pressed)),
                         intArrayOf(pressedColor),
                     ),
-                    ColorDrawable(color),
+                    color.toDrawable(),
                     null,
                 )
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/OnRenderProcessGoneDelegate.kt b/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/OnRenderProcessGoneDelegate.kt
index 6cfe0193cf0e..6e4cf03ffa69 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/OnRenderProcessGoneDelegate.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/OnRenderProcessGoneDelegate.kt
@@ -15,7 +15,6 @@
  */
 package com.ichi2.anki.cardviewer
 
-import android.annotation.TargetApi
 import android.os.Build
 import android.webkit.RenderProcessGoneDetail
 import android.webkit.WebView
@@ -134,7 +133,7 @@ open class OnRenderProcessGoneDelegate(
         return target.resources.getString(errorCauseId)
     }
 
-    @TargetApi(Build.VERSION_CODES.O)
+    @RequiresApi(Build.VERSION_CODES.O)
     protected open fun displayRenderLoopDialog(
         currentCardId: CardId,
         detail: RenderProcessGoneDetail,
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/SoundTagPlayer.kt b/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/SoundTagPlayer.kt
index b7e5909084c5..f46273facfba 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/SoundTagPlayer.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/SoundTagPlayer.kt
@@ -23,6 +23,7 @@ import android.media.MediaPlayer
 import android.net.Uri
 import androidx.annotation.CheckResult
 import androidx.annotation.VisibleForTesting
+import androidx.core.net.toUri
 import androidx.media.AudioFocusRequestCompat
 import androidx.media.AudioManagerCompat
 import com.ichi2.anki.AnkiDroidApp
@@ -109,12 +110,12 @@ class SoundTagPlayer(
                     continuation.resume(Unit)
                 }
             }
-            val tagUri = Uri.parse(tag.filename)
+            val tagUri = tag.filename.toUri()
             val soundUri =
                 if (tagUri.scheme != null) {
                     tagUri
                 } else {
-                    Uri.parse(soundUriBase + Uri.encode(tag.filename))
+                    (soundUriBase + Uri.encode(tag.filename)).toUri()
                 }
             setAudioAttributes(music)
             setOnErrorListener { mp, what, extra ->
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/VideoPlayer.kt b/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/VideoPlayer.kt
index 9b011116c382..7b79ed6893a5 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/VideoPlayer.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/VideoPlayer.kt
@@ -16,7 +16,7 @@
 
 package com.ichi2.anki.cardviewer
 
-import android.text.TextUtils
+import androidx.core.text.htmlEncode
 import com.ichi2.libanki.AvRef
 import com.ichi2.libanki.SoundOrVideoTag
 import kotlinx.coroutines.CancellableContinuation
@@ -57,7 +57,7 @@ class VideoPlayer(
             
                     for (i = 0; i < videos.length; i++) {
                        var video = videos[i];
-                       if (video.attributes['data-file'].value == "${TextUtils.htmlEncode(fileNameToFind)}") {
+                       if (video.attributes['data-file'].value == "${fileNameToFind.htmlEncode()}") {
                            console.log("playing video: " + video.attributes['data-play'].value);
                            video.play();
                            break;
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DatabaseErrorDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DatabaseErrorDialog.kt
index 668aa013935d..97b35ffb6b27 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DatabaseErrorDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DatabaseErrorDialog.kt
@@ -18,7 +18,6 @@ package com.ichi2.anki.dialogs
 
 import android.annotation.SuppressLint
 import android.app.Dialog
-import android.net.Uri
 import android.os.Bundle
 import android.os.Message
 import android.os.Parcelable
@@ -27,6 +26,7 @@ import androidx.annotation.CheckResult
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AlertDialog
 import androidx.core.app.ActivityCompat
+import androidx.core.net.toUri
 import androidx.core.os.BundleCompat
 import androidx.core.os.bundleOf
 import androidx.lifecycle.lifecycleScope
@@ -450,7 +450,7 @@ class DatabaseErrorDialog : AsyncDialogFragment() {
             R.string.install_non_play_store_ankidroid_recommended,
             dismissesDialog = false,
             {
-                val restoreUi = Uri.parse(it.getString(R.string.link_install_non_play_store_install))
+                val restoreUi = it.getString(R.string.link_install_non_play_store_install).toUri()
                 it.openUrl(restoreUi)
             },
         ),
@@ -458,7 +458,7 @@ class DatabaseErrorDialog : AsyncDialogFragment() {
             R.string.install_non_play_store_ankidroid,
             dismissesDialog = false,
             {
-                val restoreUi = Uri.parse(it.getString(R.string.link_install_non_play_store_install))
+                val restoreUi = it.getString(R.string.link_install_non_play_store_install).toUri()
                 it.openUrl(restoreUi)
             },
         ),
@@ -489,7 +489,7 @@ class DatabaseErrorDialog : AsyncDialogFragment() {
             R.string.help_title_get_help,
             dismissesDialog = false,
             {
-                it.openUrl(Uri.parse(it.getString(R.string.link_forum)))
+                it.openUrl(it.getString(R.string.link_forum).toUri())
             },
         ),
         RECREATE_COLLECTION(
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SyncErrorDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SyncErrorDialog.kt
index baf02d0220b6..92dfffb5d38c 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SyncErrorDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SyncErrorDialog.kt
@@ -17,11 +17,11 @@
 package com.ichi2.anki.dialogs
 
 import android.app.Dialog
-import android.net.Uri
 import android.os.Bundle
 import android.os.Message
 import androidx.annotation.CheckResult
 import androidx.appcompat.app.AlertDialog
+import androidx.core.net.toUri
 import androidx.core.os.bundleOf
 import com.ichi2.anki.AnkiActivity
 import com.ichi2.anki.ConflictResolution
@@ -161,7 +161,7 @@ class SyncErrorDialog : AsyncDialogFragment() {
                 dialog
                     .setPositiveButton(R.string.dialog_ok) { _, _ -> }
                     .setNegativeButton(R.string.help) { _, _ ->
-                        (requireActivity() as AnkiActivity).openUrl(Uri.parse(getString(R.string.repair_deck)))
+                        (requireActivity() as AnkiActivity).openUrl(getString(R.string.repair_deck).toUri())
                     }.setCancelable(false)
                     .create()
             }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/TtsPlaybackErrorDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/TtsPlaybackErrorDialog.kt
index fd8d7537c5c0..311079d6bac0 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/TtsPlaybackErrorDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/TtsPlaybackErrorDialog.kt
@@ -18,8 +18,8 @@ package com.ichi2.anki.dialogs
 
 import android.app.Activity
 import android.content.Intent
-import android.net.Uri
 import androidx.appcompat.app.AlertDialog
+import androidx.core.net.toUri
 import androidx.fragment.app.FragmentManager
 import com.ichi2.anki.CrashReportService
 import com.ichi2.anki.R
@@ -45,7 +45,7 @@ object TtsPlaybackErrorDialog {
                     activity.getString(R.string.tts_error_dialog_supported_voices_button_text),
                 ) { _, _ -> showVoicesDialog(fragmentManager) }
                 setNeutralButton(context.getString(R.string.help)) { _, _ ->
-                    activity.openUrl(Uri.parse(context.getString(R.string.link_faq_tts)))
+                    activity.openUrl(context.getString(R.string.link_faq_tts).toUri())
                 }
             }
         }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/help/HelpItemActionsDispatcher.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/help/HelpItemActionsDispatcher.kt
index c3d66f6413bf..ac2ed37b2b98 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/help/HelpItemActionsDispatcher.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/help/HelpItemActionsDispatcher.kt
@@ -13,8 +13,8 @@
  ****************************************************************************************/
 package com.ichi2.anki.dialogs.help
 
-import android.net.Uri
 import androidx.annotation.StringRes
+import androidx.core.net.toUri
 import com.ichi2.anki.AnkiActivity
 import com.ichi2.anki.AnkiDroidApp
 import com.ichi2.anki.CrashReportService
@@ -43,11 +43,11 @@ class AnkiActivityHelpActionsDispatcher(
     private val ankiActivity: AnkiActivity,
 ) : HelpItemActionsDispatcher {
     override fun onOpenUrl(url: String) {
-        ankiActivity.openUrl(Uri.parse(url))
+        ankiActivity.openUrl(url.toUri())
     }
 
     override fun onOpenUrlResource(url: Int) {
-        ankiActivity.openUrl(Uri.parse(ankiActivity.getString(url)))
+        ankiActivity.openUrl(ankiActivity.getString(url).toUri())
     }
 
     override fun onRate() {
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/tags/TagsDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/tags/TagsDialog.kt
index 387fa96aa974..011d7b2b8099 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/tags/TagsDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/tags/TagsDialog.kt
@@ -25,6 +25,7 @@ import androidx.appcompat.widget.Toolbar
 import androidx.core.content.ContextCompat
 import androidx.core.os.BundleCompat
 import androidx.core.os.bundleOf
+import androidx.core.view.isVisible
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.ichi2.anki.OnContextAndLongClickListener
@@ -334,7 +335,7 @@ class TagsDialog : AnalyticsDialogFragment {
             val tag = TagsUtil.getUniformedTag(rawTag)
             val feedbackText: String
             if (tags!!.add(tag)) {
-                if (noTagsTextView!!.visibility == View.VISIBLE) {
+                if (noTagsTextView!!.isVisible) {
                     noTagsTextView!!.visibility = View.GONE
                 }
                 tags!!.add(tag)
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/multimedia/MultimediaFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/multimedia/MultimediaFragment.kt
index a1538a351e80..d8bf38dc5023 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/multimedia/MultimediaFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/multimedia/MultimediaFragment.kt
@@ -28,6 +28,7 @@ import androidx.annotation.LayoutRes
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
+import androidx.core.net.toUri
 import androidx.core.view.MenuHost
 import androidx.core.view.MenuProvider
 import androidx.fragment.app.Fragment
@@ -93,7 +94,7 @@ abstract class MultimediaFragment(
                 field = multimediaActivityExtra.field
                 note = multimediaActivityExtra.note
                 if (multimediaActivityExtra.imageUri != null) {
-                    imageUri = Uri.parse(multimediaActivityExtra.imageUri)
+                    imageUri = multimediaActivityExtra.imageUri.toUri()
                 }
             }
         }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/multimedia/MultimediaUtils.kt b/AnkiDroid/src/main/java/com/ichi2/anki/multimedia/MultimediaUtils.kt
index 7caef2cf183c..661d6272e0b1 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/multimedia/MultimediaUtils.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/multimedia/MultimediaUtils.kt
@@ -25,6 +25,7 @@ import android.os.Environment
 import android.provider.DocumentsContract
 import android.provider.MediaStore
 import androidx.core.content.ContentResolverCompat
+import androidx.core.net.toUri
 import com.ichi2.anki.CrashReportService
 import com.ichi2.anki.utils.getTimestamp
 import com.ichi2.libanki.utils.TimeManager
@@ -109,7 +110,7 @@ object MultimediaUtils {
                             docId.toLongOrNull() != null -> {
                                 val contentUri =
                                     ContentUris.withAppendedId(
-                                        Uri.parse("content://downloads/public_downloads"),
+                                        "content://downloads/public_downloads".toUri(),
                                         docId.toLong(),
                                     )
                                 getImageNameFromContentResolver(context, contentUri, null)
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/multimedia/audio/AudioWaveform.kt b/AnkiDroid/src/main/java/com/ichi2/anki/multimedia/audio/AudioWaveform.kt
index f122d860d07c..bceb02653e20 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/multimedia/audio/AudioWaveform.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/multimedia/audio/AudioWaveform.kt
@@ -22,6 +22,7 @@ import android.graphics.Paint
 import android.graphics.RectF
 import android.util.AttributeSet
 import android.view.View
+import androidx.core.content.withStyledAttributes
 import com.ichi2.anki.R
 
 // TODO : Middle blue line should move left->mid https://github.com/ankidroid/Anki-Android/pull/14591#issuecomment-1791037102
@@ -64,7 +65,8 @@ class AudioWaveform(
     /** Gap between each spike **/
     private var d = 4f
 
-    private val displayVerticalLine: Boolean
+    // Intended to be `val` but declared a `var` instead to allow initialization from the init {} block
+    private var displayVerticalLine: Boolean = true
 
     /**
      * If the vertical line is displayed, the waveform is drawn up to the line
@@ -79,10 +81,10 @@ class AudioWaveform(
                 .toInt()
 
     init {
-        val customAttrs = context.obtainStyledAttributes(attrs, R.styleable.AudioWaveform, 0, 0)
-        displayVerticalLine = customAttrs.getBoolean(R.styleable.AudioWaveform_display_vertical_line, true)
-        backgroundPaint.color = customAttrs.getColor(R.styleable.AudioWaveform_android_background, backgroundPaint.color)
-        customAttrs.recycle()
+        context.withStyledAttributes(attrs, R.styleable.AudioWaveform, 0, 0) {
+            displayVerticalLine = getBoolean(R.styleable.AudioWaveform_display_vertical_line, true)
+            backgroundPaint.color = getColor(R.styleable.AudioWaveform_android_background, backgroundPaint.color)
+        }
     }
 
     fun addAmplitude(amp: Float) {
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/Toolbar.kt b/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/Toolbar.kt
index 04d7be0be48a..376cbed6108c 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/Toolbar.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/Toolbar.kt
@@ -23,7 +23,6 @@ import android.graphics.Canvas
 import android.graphics.Color
 import android.graphics.Insets
 import android.graphics.Paint
-import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
 import android.os.Build
 import android.util.AttributeSet
@@ -43,7 +42,10 @@ import androidx.annotation.DrawableRes
 import androidx.annotation.IdRes
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.AppCompatImageButton
+import androidx.core.graphics.createBitmap
+import androidx.core.graphics.drawable.toDrawable
 import androidx.core.view.children
+import androidx.core.view.isVisible
 import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat
 import com.ichi2.anki.AnkiDroidApp
 import com.ichi2.anki.NoteEditor
@@ -308,14 +310,14 @@ class Toolbar : FrameLayout {
     fun createDrawableForString(text: String): Drawable {
         val baseline = -stringPaint!!.ascent()
         val size = (baseline + stringPaint!!.descent() + 0.5f).toInt()
-        val image = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888)
+        val image = createBitmap(size, size, Bitmap.Config.ARGB_8888)
         val canvas = Canvas(image)
         canvas.drawText(text, size / 2f, baseline, stringPaint!!)
-        return BitmapDrawable(resources, image)
+        return image.toDrawable(resources)
     }
 
     /** Returns the number of top-level children of [layout] that are visible */
-    private fun getVisibleItemCount(layout: LinearLayout): Int = ViewGroupUtils.getAllChildren(layout).count { it.visibility == VISIBLE }
+    private fun getVisibleItemCount(layout: LinearLayout): Int = ViewGroupUtils.getAllChildren(layout).count { it.isVisible }
 
     private fun addViewToToolbar(button: AppCompatImageButton) {
         val expectedWidth = getVisibleItemCount(toolbar) * convertDpToPixel(48F, context)
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/pages/PageFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/pages/PageFragment.kt
index 6c4ca52a3400..0235bb741718 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/pages/PageFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/pages/PageFragment.kt
@@ -17,7 +17,6 @@ package com.ichi2.anki.pages
 
 import android.content.Context
 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.view.View
 import android.webkit.JavascriptInterface
@@ -25,6 +24,7 @@ import android.webkit.WebView
 import android.webkit.WebViewClient
 import androidx.annotation.CallSuper
 import androidx.annotation.LayoutRes
+import androidx.core.net.toUri
 import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
 import com.google.android.material.appbar.MaterialToolbar
@@ -122,7 +122,7 @@ open class PageFragment(
         val title = arguments.getString(TITLE_ARG_KEY)
 
         val nightMode = if (Themes.currentTheme.isNightMode) "#night" else ""
-        val url = Uri.parse("${server.baseUrl()}$path$nightMode")
+        val url = "${server.baseUrl()}$path$nightMode".toUri()
         Timber.i("Loading $url")
         webView.loadUrl(url.toString())
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/previewer/CardViewerFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/previewer/CardViewerFragment.kt
index 878cf2541e0e..9f9cd4e7e43d 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/previewer/CardViewerFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/previewer/CardViewerFragment.kt
@@ -197,7 +197,7 @@ abstract class CardViewerFragment(
                         startActivity(intent)
                     } else {
                         val packageName = intent.getPackage() ?: return
-                        val marketUri = Uri.parse("market://details?id=$packageName")
+                        val marketUri = "market://details?id=$packageName".toUri()
                         val marketIntent = Intent(Intent.ACTION_VIEW, marketUri)
                         Timber.d("Trying to open market uri %s", marketUri)
                         if (packageManager.resolveActivityCompat(marketIntent) != null) {
@@ -261,7 +261,7 @@ abstract class CardViewerFragment(
 
     private fun showMediaErrorSnackbar(filename: String) {
         showSnackbar(getString(R.string.card_viewer_could_not_find_image, filename)) {
-            setAction(R.string.help) { openUrl(Uri.parse(getString(R.string.link_faq_missing_media))) }
+            setAction(R.string.help) { openUrl(getString(R.string.link_faq_missing_media).toUri()) }
         }
     }
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/provider/CardContentProvider.kt b/AnkiDroid/src/main/java/com/ichi2/anki/provider/CardContentProvider.kt
index 8ef388ad1d05..15d5c0db6696 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/provider/CardContentProvider.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/provider/CardContentProvider.kt
@@ -28,6 +28,7 @@ import android.database.MatrixCursor
 import android.database.sqlite.SQLiteQueryBuilder
 import android.net.Uri
 import android.webkit.MimeTypeMap
+import androidx.core.net.toUri
 import com.ichi2.anki.AnkiDroidApp
 import com.ichi2.anki.BuildConfig
 import com.ichi2.anki.CollectionManager
@@ -1003,7 +1004,7 @@ class CardContentProvider : ContentProvider() {
         col: Collection,
     ): Uri? {
         // Insert media file using libanki.Media.addFile and return Uri for the inserted file.
-        val fileUri = Uri.parse(values!!.getAsString(FlashCardsContract.AnkiMedia.FILE_URI))
+        val fileUri = values!!.getAsString(FlashCardsContract.AnkiMedia.FILE_URI).toUri()
         val preferredName = values.getAsString(FlashCardsContract.AnkiMedia.PREFERRED_NAME)
         return try {
             val cR = context!!.contentResolver
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/AnswerTimer.kt b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/AnswerTimer.kt
index 047147d94bce..9f6ed161cf0e 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/AnswerTimer.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/AnswerTimer.kt
@@ -22,6 +22,7 @@ import android.view.View
 import android.widget.Chronometer
 import androidx.annotation.MainThread
 import androidx.annotation.VisibleForTesting
+import androidx.core.view.isInvisible
 import com.google.android.material.color.MaterialColors
 import com.ichi2.anki.CollectionManager.withCol
 import com.ichi2.anki.R
@@ -69,7 +70,7 @@ class AnswerTimer(
     ) {
         currentCard = newCard
         showTimer = newCard.shouldShowTimer(col)
-        if (showTimer && cardTimer.visibility == View.INVISIBLE) {
+        if (showTimer && cardTimer.isInvisible) {
             cardTimer.visibility = View.VISIBLE
         } else if (!showTimer && cardTimer.visibility != View.INVISIBLE) {
             cardTimer.visibility = View.INVISIBLE
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/CardMarker.kt b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/CardMarker.kt
index 9b7965d44c2c..c5fd59594632 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/CardMarker.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/CardMarker.kt
@@ -19,6 +19,7 @@ package com.ichi2.anki.reviewer
 import android.view.View
 import android.widget.ImageView
 import androidx.annotation.DrawableRes
+import androidx.core.view.isVisible
 import com.ichi2.anki.Flag
 import com.ichi2.anki.R
 
@@ -39,7 +40,7 @@ class CardMarker(
 
     /** Whether the mark icon is visible on the toolbar */
     val isDisplayingMark: Boolean
-        get() = markView.visibility == View.VISIBLE
+        get() = markView.isVisible
 
     /** Sets the flag icon on the card  */
     fun displayFlag(flag: Flag) {
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/EaseButton.kt b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/EaseButton.kt
index 953902da20ea..ca59ea266f2f 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/EaseButton.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/EaseButton.kt
@@ -22,6 +22,7 @@ import android.view.ViewGroup
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.annotation.StringRes
+import androidx.core.view.isVisible
 import com.ichi2.anki.AbstractFlashcardViewer
 import com.ichi2.anki.Ease
 import com.ichi2.utils.KotlinCleanup
@@ -47,7 +48,7 @@ class EaseButton(
 
     @get:JvmName("canPerformClick")
     val canPerformClick
-        get() = layout.isEnabled && layout.visibility == View.VISIBLE
+        get() = layout.isEnabled && layout.isVisible
 
     var nextTime: String
         get() = easeTimeView.text.toString()
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/scheduling/ForgetCardsDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/scheduling/ForgetCardsDialog.kt
index 5d649f358f52..ed8bff778b47 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/scheduling/ForgetCardsDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/scheduling/ForgetCardsDialog.kt
@@ -17,9 +17,9 @@
 package com.ichi2.anki.scheduling
 
 import android.app.Dialog
-import android.net.Uri
 import android.os.Bundle
 import androidx.core.content.edit
+import androidx.core.net.toUri
 import androidx.core.os.bundleOf
 import androidx.fragment.app.DialogFragment
 import com.google.android.material.checkbox.MaterialCheckBox
@@ -116,7 +116,7 @@ class ForgetCardsDialog : DialogFragment() {
             // title(text = TR.actionsForgetCard().toSentenceCase(R.string.sentence_forget_cards))
             // "Reset card progress" is less explicit on the singular/plural dimension
             titleWithHelpIcon(stringRes = R.string.reset_card_dialog_title) {
-                requireActivity().openUrl(Uri.parse(getString(R.string.link_help_forget_cards)))
+                requireActivity().openUrl(getString(R.string.link_help_forget_cards).toUri())
             }
             positiveButton(R.string.dialog_ok) {
                 sharedPrefs.edit {
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/utils/AndroidUtils.kt b/AnkiDroid/src/main/java/com/ichi2/anki/utils/AndroidUtils.kt
index d191a599f8ce..eec7d5f11b99 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/utils/AndroidUtils.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/utils/AndroidUtils.kt
@@ -21,6 +21,7 @@ import android.net.Uri
 import android.os.PowerManager
 import androidx.annotation.StringRes
 import androidx.core.content.ContextCompat
+import androidx.core.net.toUri
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import com.ichi2.anki.AnkiDroidApp
@@ -103,4 +104,4 @@ fun Fragment.openUrl(uri: Uri) {
 
 fun Fragment.openUrl(
     @StringRes stringRes: Int,
-) = openUrl(Uri.parse(requireContext().getString(stringRes)))
+) = openUrl(requireContext().getString(stringRes).toUri())
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/widgets/DeckAdapter.kt b/AnkiDroid/src/main/java/com/ichi2/anki/widgets/DeckAdapter.kt
index a6a59b4be68f..4fa8e7580e0f 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/widgets/DeckAdapter.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/widgets/DeckAdapter.kt
@@ -26,6 +26,7 @@ import android.widget.LinearLayout
 import android.widget.RelativeLayout
 import android.widget.TextView
 import androidx.core.content.res.getDrawableOrThrow
+import androidx.core.content.withStyledAttributes
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
@@ -69,7 +70,9 @@ class DeckAdapter(
     private val deckNameDynColor: Int
     private val expandImage: Drawable
     private val collapseImage: Drawable
-    private val selectableItemBackground: Int
+
+    // intended to be `val` but was declared a `var` to allow initialization from the init {} block
+    private var selectableItemBackground: Int = 0
     private val endPadding: Int = context.resources.getDimension(R.dimen.deck_picker_right_padding).toInt()
     private val startPadding: Int = context.resources.getDimension(R.dimen.deck_picker_left_padding).toInt()
     private val startPaddingSmall: Int = context.resources.getDimension(R.dimen.deck_picker_left_padding_small).toInt()
@@ -238,7 +241,7 @@ class DeckAdapter(
                 R.attr.expandRef,
                 R.attr.collapseRef,
             )
-        var ta = context.obtainStyledAttributes(attrs)
+        val ta = context.obtainStyledAttributes(attrs)
         zeroCountColor = ta.getColor(0, context.getColor(R.color.black))
         newCountColor = ta.getColor(1, context.getColor(R.color.black))
         learnCountColor = ta.getColor(2, context.getColor(R.color.black))
@@ -251,9 +254,9 @@ class DeckAdapter(
         collapseImage = ta.getDrawableOrThrow(8)
         collapseImage.isAutoMirrored = true
         ta.recycle()
-        ta = context.obtainStyledAttributes(intArrayOf(android.R.attr.selectableItemBackground))
-        selectableItemBackground = ta.getResourceId(0, 0)
-        ta.recycle()
+        context.withStyledAttributes(attrs = intArrayOf(android.R.attr.selectableItemBackground)) {
+            selectableItemBackground = ta.getResourceId(0, 0)
+        }
     }
 }
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/workarounds/DialogTitleView.kt b/AnkiDroid/src/main/java/com/ichi2/anki/workarounds/DialogTitleView.kt
index d341e59c5f0c..9ea39a755b05 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/workarounds/DialogTitleView.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/workarounds/DialogTitleView.kt
@@ -45,6 +45,7 @@ import android.content.Context
 import android.util.AttributeSet
 import android.util.TypedValue
 import androidx.appcompat.R
+import androidx.core.content.withStyledAttributes
 import com.ichi2.ui.FixedTextView
 
 /**
@@ -75,19 +76,18 @@ class DialogTitleView : FixedTextView {
         setSingleLine(false)
         setMaxLines(2)
 
-        val a =
-            context.obtainStyledAttributes(
-                null,
-                R.styleable.TextAppearance,
-                android.R.attr.textAppearanceMedium,
-                android.R.style.TextAppearance_Medium,
-            )
-        val textSize = a.getDimensionPixelSize(R.styleable.TextAppearance_android_textSize, 0)
-        if (textSize != 0) {
-            // textSize is already expressed in pixels
-            setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize.toFloat())
+        context.withStyledAttributes(
+            null,
+            R.styleable.TextAppearance,
+            android.R.attr.textAppearanceMedium,
+            android.R.style.TextAppearance_Medium,
+        ) {
+            val textSize = getDimensionPixelSize(R.styleable.TextAppearance_android_textSize, 0)
+            if (textSize != 0) {
+                // textSize is already expressed in pixels
+                setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize.toFloat())
+            }
         }
-        a.recycle()
 
         super.onMeasure(widthMeasureSpec, heightMeasureSpec)
     }
diff --git a/AnkiDroid/src/main/java/com/ichi2/compat/CompatHelper.kt b/AnkiDroid/src/main/java/com/ichi2/compat/CompatHelper.kt
index 1e3c239cc31d..ef8fc6749a38 100644
--- a/AnkiDroid/src/main/java/com/ichi2/compat/CompatHelper.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/compat/CompatHelper.kt
@@ -15,6 +15,7 @@
  ****************************************************************************************/
 package com.ichi2.compat
 
+import android.annotation.SuppressLint
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
@@ -44,6 +45,7 @@ import java.io.Serializable
  */
 class CompatHelper private constructor() {
     // Note: Needs ": Compat" or the type system assumes `Compat21`
+    @SuppressLint("NewApi")
     private val compatValue: Compat =
         when {
             sdkVersion >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE -> CompatV34()
diff --git a/AnkiDroid/src/main/java/com/ichi2/compat/CompatV26.kt b/AnkiDroid/src/main/java/com/ichi2/compat/CompatV26.kt
index 0acc4e243e64..7b092d3c8252 100644
--- a/AnkiDroid/src/main/java/com/ichi2/compat/CompatV26.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/compat/CompatV26.kt
@@ -16,11 +16,11 @@
  ****************************************************************************************/
 package com.ichi2.compat
 
-import android.annotation.TargetApi
 import android.content.Context
 import android.os.VibrationEffect
 import android.os.Vibrator
 import android.view.View
+import androidx.annotation.RequiresApi
 import androidx.annotation.VisibleForTesting
 import com.ichi2.anki.NotificationChannels
 import java.io.File
@@ -38,7 +38,7 @@ import java.nio.file.StandardCopyOption
 import kotlin.time.Duration
 
 /** Implementation of [Compat] for SDK level 26 and higher. Check  [Compat]'s for more detail.  */
-@TargetApi(26)
+@RequiresApi(26)
 open class CompatV26 : CompatV24() {
     /**
      * In Oreo and higher, you must create a channel for all notifications.
diff --git a/AnkiDroid/src/main/java/com/ichi2/compat/CompatV29.kt b/AnkiDroid/src/main/java/com/ichi2/compat/CompatV29.kt
index 67ccb9b9181f..aa0c661b680c 100644
--- a/AnkiDroid/src/main/java/com/ichi2/compat/CompatV29.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/compat/CompatV29.kt
@@ -15,7 +15,6 @@
  */
 package com.ichi2.compat
 
-import android.annotation.TargetApi
 import android.content.ContentValues
 import android.content.Context
 import android.graphics.Bitmap
@@ -24,12 +23,13 @@ import android.net.Uri
 import android.os.Environment
 import android.provider.MediaStore
 import android.util.Size
+import androidx.annotation.RequiresApi
 import com.ichi2.libanki.utils.TimeManager
 import java.io.File
 import java.io.IOException
 
 /** Implementation of [Compat] for SDK level 29  */
-@TargetApi(29)
+@RequiresApi(29)
 open class CompatV29 : CompatV26() {
     override fun hasVideoThumbnail(path: String): Boolean? {
         return try {
diff --git a/AnkiDroid/src/main/java/com/ichi2/compat/CompatV31.kt b/AnkiDroid/src/main/java/com/ichi2/compat/CompatV31.kt
index 65c0a5f56aab..a9d346f7d526 100644
--- a/AnkiDroid/src/main/java/com/ichi2/compat/CompatV31.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/compat/CompatV31.kt
@@ -15,15 +15,15 @@
  */
 package com.ichi2.compat
 
-import android.annotation.TargetApi
 import android.content.Context
 import android.media.MediaRecorder
 import android.os.VibrationEffect
 import android.os.VibratorManager
+import androidx.annotation.RequiresApi
 import kotlin.time.Duration
 
 /** Implementation of [Compat] for SDK level 31  */
-@TargetApi(31)
+@RequiresApi(31)
 open class CompatV31 : CompatV29() {
     override fun vibrate(
         context: Context,
diff --git a/AnkiDroid/src/main/java/com/ichi2/compat/CompatV33.kt b/AnkiDroid/src/main/java/com/ichi2/compat/CompatV33.kt
index e6a2f05fe9ed..00831adb8fc2 100644
--- a/AnkiDroid/src/main/java/com/ichi2/compat/CompatV33.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/compat/CompatV33.kt
@@ -16,15 +16,15 @@
  */
 package com.ichi2.compat
 
-import android.annotation.TargetApi
 import android.content.Intent
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.content.pm.ResolveInfo
 import android.os.Bundle
+import androidx.annotation.RequiresApi
 import java.io.Serializable
 
-@TargetApi(33)
+@RequiresApi(33)
 open class CompatV33 :
     CompatV31(),
     Compat {
diff --git a/AnkiDroid/src/main/java/com/ichi2/compat/CompatV34.kt b/AnkiDroid/src/main/java/com/ichi2/compat/CompatV34.kt
index 64da5827432b..24283c5c1dbd 100644
--- a/AnkiDroid/src/main/java/com/ichi2/compat/CompatV34.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/compat/CompatV34.kt
@@ -16,10 +16,10 @@
 
 package com.ichi2.compat
 
-import android.annotation.TargetApi
 import android.view.MotionEvent
+import androidx.annotation.RequiresApi
 
-@TargetApi(34)
+@RequiresApi(34)
 @Suppress("ktlint:standard:property-naming")
 open class CompatV34 : CompatV33() {
     override val AXIS_GESTURE_X_OFFSET = MotionEvent.AXIS_GESTURE_X_OFFSET
diff --git a/AnkiDroid/src/main/java/com/ichi2/compat/customtabs/CustomTabsHelper.kt b/AnkiDroid/src/main/java/com/ichi2/compat/customtabs/CustomTabsHelper.kt
index dfa0bc25bcb9..a8162c6ccf41 100644
--- a/AnkiDroid/src/main/java/com/ichi2/compat/customtabs/CustomTabsHelper.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/compat/customtabs/CustomTabsHelper.kt
@@ -17,8 +17,8 @@ package com.ichi2.compat.customtabs
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
-import android.net.Uri
 import androidx.browser.customtabs.CustomTabsService
+import androidx.core.net.toUri
 import com.ichi2.compat.CompatHelper.Companion.queryIntentActivitiesCompat
 import com.ichi2.compat.CompatHelper.Companion.resolveActivityCompat
 import com.ichi2.compat.CompatHelper.Companion.resolveServiceCompat
@@ -63,7 +63,7 @@ object CustomTabsHelper {
         if (sPackageNameToUse != null) return sPackageNameToUse
         val pm = context.packageManager
         // Get default VIEW intent handler.
-        val activityIntent = Intent(Intent.ACTION_VIEW, Uri.parse("http://www.example.com"))
+        val activityIntent = Intent(Intent.ACTION_VIEW, "http://www.example.com".toUri())
         val defaultViewHandlerInfo = pm.resolveActivityCompat(activityIntent, ResolveInfoFlagsCompat.EMPTY)
         var defaultViewHandlerPackageName: String? = null
         if (defaultViewHandlerInfo != null) {
diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/Sound.kt b/AnkiDroid/src/main/java/com/ichi2/libanki/Sound.kt
index 25857da89be9..b012cd3c90c5 100644
--- a/AnkiDroid/src/main/java/com/ichi2/libanki/Sound.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/libanki/Sound.kt
@@ -25,7 +25,7 @@
 
 package com.ichi2.libanki
 
-import android.text.TextUtils
+import androidx.core.text.htmlEncode
 import com.ichi2.anki.CollectionManager
 import com.ichi2.anki.preferences.getHidePlayAudioButtons
 import com.ichi2.compat.CompatHelper
@@ -151,7 +151,7 @@ object Sound {
                 """<video
                     | src="$uri"
                     | controls
-                    | data-file="${TextUtils.htmlEncode(tag.filename)}"
+                    | data-file="${tag.filename.htmlEncode()}"
                     | onended='$onEnded'
                     | onpause='$onPause'
                     | data-play="$playsound" controlsList="nodownload"></video>
diff --git a/AnkiDroid/src/main/java/com/ichi2/themes/Themes.kt b/AnkiDroid/src/main/java/com/ichi2/themes/Themes.kt
index 5f049fcc2f8f..2ae45b21cebc 100644
--- a/AnkiDroid/src/main/java/com/ichi2/themes/Themes.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/themes/Themes.kt
@@ -22,9 +22,10 @@ import android.content.Context
 import android.content.SharedPreferences
 import android.content.res.Configuration
 import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
 import androidx.annotation.ColorInt
 import androidx.appcompat.app.AppCompatDelegate
+import androidx.core.content.withStyledAttributes
+import androidx.core.graphics.drawable.toDrawable
 import androidx.core.view.WindowInsetsControllerCompat
 import androidx.fragment.app.FragmentActivity
 import com.google.android.material.color.MaterialColors
@@ -107,15 +108,18 @@ object Themes {
         return getResFromAttr(context, attrs)[0]
     }
 
+    /**
+     * NOTE: dangerous function, it mutates the input array and returns it!
+     */
     fun getResFromAttr(
         context: Context,
         attrs: IntArray,
     ): IntArray {
-        val ta = context.obtainStyledAttributes(attrs)
-        for (i in attrs.indices) {
-            attrs[i] = ta.getResourceId(i, 0)
+        context.withStyledAttributes(attrs = attrs) {
+            for (i in attrs.indices) {
+                attrs[i] = getResourceId(i, 0)
+            }
         }
-        ta.recycle()
         return attrs
     }
 
@@ -123,6 +127,9 @@ object Themes {
     @ColorInt
     fun getColorFromAttr(context: Context, attr: Int): Int = MaterialColors.getColor(context, attr, 0)
 
+    /**
+     * NOTE: dangerous function, it mutates the input array and returns it!
+     */
     @JvmStatic // tests failed when removing, maybe try later
     @ColorInt
     fun getColorsFromAttrs(context: Context, attrs: IntArray): IntArray {
@@ -151,5 +158,5 @@ fun FragmentActivity.setTransparentStatusBar() {
 }
 
 fun FragmentActivity.setTransparentBackground() {
-    window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+    window.setBackgroundDrawable(Color.TRANSPARENT.toDrawable())
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/utils/AdaptionUtil.kt b/AnkiDroid/src/main/java/com/ichi2/utils/AdaptionUtil.kt
index 1561358d6910..c0fc96c6512a 100644
--- a/AnkiDroid/src/main/java/com/ichi2/utils/AdaptionUtil.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/utils/AdaptionUtil.kt
@@ -22,9 +22,9 @@ import android.content.Intent
 import android.content.pm.ApplicationInfo
 import android.content.pm.PackageManager
 import android.content.pm.ResolveInfo
-import android.net.Uri
 import android.os.Build
 import android.provider.Settings
+import androidx.core.net.toUri
 import com.ichi2.anki.AnkiDroidApp
 import com.ichi2.compat.CompatHelper.Companion.getPackageInfoCompat
 import com.ichi2.compat.CompatHelper.Companion.queryIntentActivitiesCompat
@@ -76,7 +76,7 @@ object AdaptionUtil {
         if (isUserATestClient) {
             return false
         }
-        val intent = Intent(Intent.ACTION_VIEW, Uri.parse("http://www.google.com"))
+        val intent = Intent(Intent.ACTION_VIEW, "http://www.google.com".toUri())
         val pm = context.packageManager
         val list = pm.queryIntentActivitiesCompat(intent, ResolveInfoFlagsCompat.of(MATCH_DEFAULT_ONLY.toLong()))
         for (ri in list) {
diff --git a/AnkiDroid/src/main/java/com/ichi2/utils/ContentResolverUtil.kt b/AnkiDroid/src/main/java/com/ichi2/utils/ContentResolverUtil.kt
index ef3d9a860cf1..295d74b0bc85 100644
--- a/AnkiDroid/src/main/java/com/ichi2/utils/ContentResolverUtil.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/utils/ContentResolverUtil.kt
@@ -21,6 +21,7 @@ import android.net.Uri
 import android.provider.MediaStore
 import android.webkit.MimeTypeMap
 import androidx.annotation.CheckResult
+import androidx.core.net.toUri
 import timber.log.Timber
 
 object ContentResolverUtil {
@@ -96,7 +97,7 @@ object ContentResolverUtil {
                 // content uri contains only id and _data columns in samsung clipboard and not media columns
                 // gboard contains media columns and works with MediaStore.MediaColumns.DISPLAY_NAME
                 val dataIndex = c.getColumnIndexOrThrow("_data")
-                val fileUri = Uri.parse(c.getString(dataIndex))
+                val fileUri = c.getString(dataIndex).toUri()
                 return fileUri.lastPathSegment
             }
         } catch (e: SQLiteException) {
diff --git a/AnkiDroid/src/main/java/com/ichi2/utils/HtmlUtils.kt b/AnkiDroid/src/main/java/com/ichi2/utils/HtmlUtils.kt
index 16d548c3795f..a5b8b80456ce 100644
--- a/AnkiDroid/src/main/java/com/ichi2/utils/HtmlUtils.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/utils/HtmlUtils.kt
@@ -15,7 +15,7 @@
  */
 package com.ichi2.utils
 
-import android.text.TextUtils
+import androidx.core.text.htmlEncode
 
 object HtmlUtils {
     // #5188 - compat.fromHtml converts newlines into spaces.
@@ -28,5 +28,5 @@ object HtmlUtils {
         return withoutWindowsLineEndings.replace("\n", "<br/>")
     }
 
-    fun escape(html: String): String = TextUtils.htmlEncode(html)
+    fun escape(html: String): String = html.htmlEncode()
 }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerTest.kt
index d45fa527eed3..c635c8c9c135 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerTest.kt
@@ -1,6 +1,7 @@
 // noinspection MissingCopyrightHeader #8659
 package com.ichi2.anki
 
+import android.annotation.SuppressLint
 import android.content.Intent
 import android.content.SharedPreferences
 import android.content.pm.PackageManager
@@ -82,6 +83,7 @@ class DeckPickerTest : RobolectricTest() {
     }
 
     @Test
+    @SuppressLint("UseKtx")
     fun getPreviousVersionUpgradeFrom201to292() {
         val newVersion = 20900302 // 2.9.2
         val preferences = mock(SharedPreferences::class.java)
@@ -107,6 +109,7 @@ class DeckPickerTest : RobolectricTest() {
     }
 
     @Test
+    @SuppressLint("UseKtx")
     fun getPreviousVersionUpgradeFrom202to292() {
         val newVersion: Long = 20900302 // 2.9.2
         val preferences = mock(SharedPreferences::class.java)
@@ -131,6 +134,7 @@ class DeckPickerTest : RobolectricTest() {
     }
 
     @Test
+    @SuppressLint("UseKtx")
     fun getPreviousVersionUpgradeFrom281to291() {
         val prevVersion = 20800301 // 2.8.1
         val newVersion: Long = 20900301 // 2.9.1
@@ -287,9 +291,7 @@ class DeckPickerTest : RobolectricTest() {
             // We don't show it if the user is new.
             targetContext
                 .sharedPrefs()
-                .edit()
-                .putString("lastVersion", "0.1")
-                .apply()
+                .edit { putString("lastVersion", "0.1") }
             val d =
                 super.startActivityNormallyOpenCollectionWithIntent(
                     DeckPickerEx::class.java,
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/IntentHandlerTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/IntentHandlerTest.kt
index 911496e58672..7595bb5b4d30 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/IntentHandlerTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/IntentHandlerTest.kt
@@ -17,7 +17,7 @@ package com.ichi2.anki
 
 import android.content.Context
 import android.content.Intent
-import android.net.Uri
+import androidx.core.net.toUri
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.IntentHandler.Companion.getLaunchType
 import com.ichi2.anki.IntentHandler.LaunchType
@@ -34,12 +34,12 @@ class IntentHandlerTest {
     // higher-level tests at a later date when we better extract dependencies
     @Test
     fun viewIntentReturnsView() {
-        var intent = Intent(Intent.ACTION_VIEW, Uri.parse("content://invalid"))
+        var intent = Intent(Intent.ACTION_VIEW, "content://invalid".toUri())
         var expected = getLaunchType(intent)
 
         assertThat(expected, equalTo(LaunchType.FILE_IMPORT))
 
-        intent = Intent(Intent.ACTION_SEND, Uri.parse("content://invalid"))
+        intent = Intent(Intent.ACTION_SEND, "content://invalid".toUri())
         expected = getLaunchType(intent)
 
         assertThat(expected, equalTo(LaunchType.FILE_IMPORT))
@@ -78,13 +78,13 @@ class IntentHandlerTest {
 
         for (mimeType in mimeTypes) {
             var intent = Intent(Intent.ACTION_VIEW)
-            intent.setDataAndType(Uri.parse("content://valid"), mimeType)
+            intent.setDataAndType("content://valid".toUri(), mimeType)
             var expected = getLaunchType(intent)
 
             assertThat(expected, equalTo(LaunchType.IMAGE_IMPORT))
 
             intent = Intent(Intent.ACTION_SEND)
-            intent.putExtra(Intent.EXTRA_STREAM, Uri.parse("content://valid"))
+            intent.putExtra(Intent.EXTRA_STREAM, "content://valid".toUri())
             intent.type = mimeType
             expected = getLaunchType(intent)
 
@@ -113,7 +113,7 @@ class IntentHandlerTest {
         action: String = Intent.ACTION_VIEW,
     ) {
         val intent = Intent(action)
-        intent.setDataAndType(Uri.parse(data), type)
+        intent.setDataAndType(data.toUri(), type)
         val actual = getLaunchType(intent)
         assertThat(actual, equalTo(expected))
     }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerTest.kt
index 482a0c386d9f..0d1d4278a1a6 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerTest.kt
@@ -21,6 +21,7 @@ import android.view.Menu
 import androidx.annotation.CheckResult
 import androidx.core.content.edit
 import androidx.core.os.BundleCompat
+import androidx.core.view.iterator
 import androidx.test.core.app.ActivityScenario
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -534,9 +535,7 @@ class ReviewerTest : RobolectricTest() {
         fun getVisibleButtonNamesExcept(vararg doNotReturn: Int): List<String> {
             val visibleButtons = arrayListOf<String>()
             val toSkip = hashSetOf(*doNotReturn.toTypedArray())
-            val menu = menu
-            for (i in 0 until menu!!.size()) {
-                val item = menu.getItem(i)
+            for (item in menu!!) {
                 if (toSkip.contains(item.itemId)) {
                     continue
                 }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/cardviewer/MediaErrorHandlerTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/cardviewer/MediaErrorHandlerTest.kt
index 26ee7e0a7826..4820a500b98a 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/cardviewer/MediaErrorHandlerTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/cardviewer/MediaErrorHandlerTest.kt
@@ -18,6 +18,7 @@ package com.ichi2.anki.cardviewer
 
 import android.net.Uri
 import android.webkit.WebResourceRequest
+import androidx.core.net.toUri
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.testutils.AnkiAssert.assertDoesNotThrow
 import com.ichi2.testutils.EmptyApplication
@@ -146,7 +147,7 @@ class MediaErrorHandlerTest {
 
     private fun getWebResourceRequest(url: String): WebResourceRequest =
         object : WebResourceRequest {
-            override fun getUrl(): Uri = Uri.parse(url)
+            override fun getUrl(): Uri = url.toUri()
 
             override fun isForMainFrame(): Boolean = false
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsDialogTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsDialogTest.kt
index 21fde85a5d49..008e7ea19bf9 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsDialogTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsDialogTest.kt
@@ -213,7 +213,6 @@ class TagsDialogTest : RobolectricTest() {
                     CheckBoxTriStates.State.INDETERMINATE -> foundIndeterminate.add(tag)
                     CheckBoxTriStates.State.UNCHECKED -> foundUncheckedTags.add(tag)
                     CheckBoxTriStates.State.CHECKED -> foundCheckedTags.add(tag)
-                    else -> Assert.fail("Unknown CheckBoxTriStates.State? " + vh.checkboxState)
                 }
             }
             ListUtil.assertListEquals(expectedAllTags, foundAllTags)
diff --git a/AnkiDroid/src/test/java/com/ichi2/compat/CompatDeleteFileTest.kt b/AnkiDroid/src/test/java/com/ichi2/compat/CompatDeleteFileTest.kt
index 9aa09679c8fb..b64b4e833370 100644
--- a/AnkiDroid/src/test/java/com/ichi2/compat/CompatDeleteFileTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/compat/CompatDeleteFileTest.kt
@@ -16,6 +16,7 @@
 
 package com.ichi2.compat
 
+import android.annotation.SuppressLint
 import com.ichi2.testutils.AnkiAssert.assertDoesNotThrow
 import com.ichi2.testutils.createTransientDirectory
 import com.ichi2.testutils.createTransientFile
@@ -38,6 +39,7 @@ class CompatDeleteFileTest(
     @Suppress("unused") private val unitTestDescription: String,
 ) {
     companion object {
+        @SuppressLint("NewApi")
         @JvmStatic // required for Parameters
         @Parameterized.Parameters(name = "{1}")
         fun data(): Iterable<Array<Any>> =
diff --git a/AnkiDroid/src/test/java/com/ichi2/compat/Test21And26.kt b/AnkiDroid/src/test/java/com/ichi2/compat/Test21And26.kt
index 8b0c83c7b37d..7e35bf7ceb69 100644
--- a/AnkiDroid/src/test/java/com/ichi2/compat/Test21And26.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/compat/Test21And26.kt
@@ -44,6 +44,7 @@ import kotlin.test.assertFailsWith
 @RunWith(Parameterized::class)
 abstract class Test21And26 {
     companion object {
+        @SuppressLint("NewApi")
         @JvmStatic // required for Parameters
         @Parameterized.Parameters(name = "{1}")
         fun data(): Iterable<Array<Any>> =
diff --git a/AnkiDroid/src/test/java/com/ichi2/compat/customtabs/CustomTabActivityHelperTest.kt b/AnkiDroid/src/test/java/com/ichi2/compat/customtabs/CustomTabActivityHelperTest.kt
index e6f1c78ab241..adbe1fe36aff 100644
--- a/AnkiDroid/src/test/java/com/ichi2/compat/customtabs/CustomTabActivityHelperTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/compat/customtabs/CustomTabActivityHelperTest.kt
@@ -18,9 +18,9 @@ package com.ichi2.compat.customtabs
 import android.app.Activity
 import android.content.Intent
 import android.content.pm.PackageManager
-import android.net.Uri
 import androidx.annotation.CheckResult
 import androidx.browser.customtabs.CustomTabsClient
+import androidx.core.net.toUri
 import com.ichi2.compat.CompatHelper.Companion.queryIntentActivitiesCompat
 import com.ichi2.compat.ResolveInfoFlagsCompat
 import org.hamcrest.CoreMatchers.not
@@ -64,7 +64,7 @@ class CustomTabActivityHelperTest {
             mock<PackageManager> {
                 on {
                     it.queryIntentActivitiesCompat(
-                        Intent(Intent.ACTION_VIEW, Uri.parse("http://www.example.com")),
+                        Intent(Intent.ACTION_VIEW, "http://www.example.com".toUri()),
                         ResolveInfoFlagsCompat.EMPTY,
                     )
                 } doReturn emptyList()
diff --git a/AnkiDroid/src/test/java/com/ichi2/utils/ContentResolverUtilTest.kt b/AnkiDroid/src/test/java/com/ichi2/utils/ContentResolverUtilTest.kt
index 5f6233f11e16..7f2593c7b8f2 100644
--- a/AnkiDroid/src/test/java/com/ichi2/utils/ContentResolverUtilTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/utils/ContentResolverUtilTest.kt
@@ -20,6 +20,7 @@ import android.database.Cursor
 import android.database.sqlite.SQLiteException
 import android.net.Uri
 import android.webkit.MimeTypeMap
+import androidx.core.net.toUri
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.testutils.EmptyApplication
 import com.ichi2.utils.ContentResolverUtil.getFileName
@@ -38,7 +39,7 @@ import org.robolectric.annotation.Config
 class ContentResolverUtilTest {
     @Test
     fun testViaQueryWorking() {
-        val uri = Uri.parse("http://example.com/test.jpeg")
+        val uri = "http://example.com/test.jpeg".toUri()
         val mock = mock(ContentResolver::class.java)
 
         setQueryReturning(mock, cursorReturning("filename_from_cursor.jpg"))
diff --git a/AnkiDroid/src/test/java/com/ichi2/utils/ImportUtilsTest.kt b/AnkiDroid/src/test/java/com/ichi2/utils/ImportUtilsTest.kt
index a4922c8c2eb5..f9da1d709926 100644
--- a/AnkiDroid/src/test/java/com/ichi2/utils/ImportUtilsTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/utils/ImportUtilsTest.kt
@@ -21,6 +21,7 @@ import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import androidx.annotation.CheckResult
+import androidx.core.net.toUri
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.RobolectricTest
 import com.ichi2.utils.ImportUtils.FileImporter
@@ -113,7 +114,7 @@ class ImportUtilsTest : RobolectricTest() {
     }
 
     private fun clipDataUriFromFile(fileName: String): ClipData {
-        val item = ClipData.Item(Uri.parse("content://$fileName"))
+        val item = ClipData.Item("content://$fileName".toUri())
         val description = ClipDescription("", arrayOf())
         return ClipData(description, item)
     }
diff --git a/build.gradle.kts b/build.gradle.kts
index 65bd3429e16a..dea78a19504c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,6 @@
 
 import com.android.build.api.dsl.CommonExtension
 import com.android.build.api.extension.impl.AndroidComponentsExtensionImpl
-import com.android.ide.common.util.parseIntOrDefault
 import com.slack.keeper.optInToKeeper
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.internal.jvm.Jvm
@@ -152,3 +151,5 @@ val gradleTestMaxParallelForks by extra(
         max(1, Runtime.getRuntime().availableProcessors() / 2)
     }
 )
+
+private fun String?.parseIntOrDefault(defaultValue: Int): Int = this?.toIntOrNull() ?: defaultValue
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f4cfa30cb9c1..95c91439d24f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -18,9 +18,9 @@ ktlint = '1.5.0'
 #
 # Old changelogs - See 'Table of Contents' in sidebar
 # https://developer.android.com/build/releases/past-releases
-androidGradlePlugin = "8.8.1"
+androidGradlePlugin = "8.9.0"
 # https://developer.android.com/jetpack/androidx/releases/activity
-androidxActivity = "1.10.0"
+androidxActivity = "1.10.1"
 # https://developer.android.com/jetpack/androidx/releases/annotation
 androidxAnnotation = "1.9.1"
 # https://developer.android.com/jetpack/androidx/releases/appcompat
@@ -28,13 +28,13 @@ androidxAppCompat = "1.7.0"
 # https://developer.android.com/jetpack/androidx/releases/browser
 androidxBrowser = "1.8.0"
 # https://developer.android.com/jetpack/androidx/releases/constraintlayout
-androidxConstraintlayout = "2.2.0"
+androidxConstraintlayout = "2.2.1"
 # https://developer.android.com/jetpack/androidx/releases/core
 androidxCoreKtx = "1.15.0"
 # https://developer.android.com/jetpack/androidx/releases/draganddrop
 androidxDragAndDrop = "1.0.0"
 # https://developer.android.com/jetpack/androidx/releases/exifinterface
-androidxExifinterface = "1.3.7"
+androidxExifinterface = "1.4.0"
 # https://developer.android.com/jetpack/androidx/releases/fragment
 androidxFragmentKtx = "1.8.6"
 # https://developer.android.com/jetpack/androidx/releases/media
@@ -56,7 +56,7 @@ androidxTestUiAutomator = "2.3.0"
 # https://developer.android.com/jetpack/androidx/releases/viewpager2
 androidxViewpager2 = "1.1.0"
 # https://developer.android.com/jetpack/androidx/releases/webkit
-androidxWebkit = "1.12.1"
+androidxWebkit = "1.13.0"
 # https://developer.android.com/jetpack/androidx/releases/work
 androidxWork = "2.10.0"
 ankiBackend = '0.1.51-anki25.02'
@@ -70,7 +70,7 @@ commonsCompress = "1.27.1"
 # https://commons.apache.org/proper/commons-io/changes-report.html
 commonsIo = "2.18.0"
 coroutines = '1.10.1'
-desugar-jdk-libs-nio = "2.1.4"
+desugar-jdk-libs-nio = "2.1.5"
 drawer = "1.0.3"
 espresso = '3.6.1'
 mikehardyGoogleAnalyticsJava7 = "2.0.13"
@@ -79,25 +79,25 @@ imageCropper = "4.6.0"
 javaSemver = "0.10.2"
 jetbrainsAnnotations = "26.0.2"
 json = "20250107"
-jsoup = "1.18.3"
+jsoup = "1.19.1"
 androidTestJunit = "1.2.1"
-junitJupiter = "5.11.4"
-junitPlatformLauncher = "1.11.4"
+junitJupiter = "5.12.1"
+junitPlatformLauncher = "1.12.1"
 # https://github.com/JetBrains/kotlin/releases/
-kotlin = '2.1.10'
+kotlin = '2.1.20'
 kotlinxSerializationJson = "1.8.0"
-ktlintGradlePlugin = "12.1.2"
+ktlintGradlePlugin = "12.2.0"
 leakcanaryAndroid = "2.14"
-lint = '31.8.1'
+lint = '31.9.0'
 material = "1.12.0"
 materialTapTargetPrompt = "3.3.2"
 mockitoInline = "5.2.0"
 mockitoKotlin = "5.4.0"
-mockk = "1.13.16"
+mockk = "1.13.17"
 nanohttpd = "2.3.1"
 okhttp = "4.12.0"
 # https://github.com/protocolbuffers/protobuf/releases
-protobufKotlinLite = "4.29.3"
+protobufKotlinLite = "4.30.1"
 # ../AnkiDroid/robolectricDownload.gradle may need changes - read instructions in that file
 robolectric = "4.14.1"
 searchpreference = "2.7.0"
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index a4b76b9530d66f5e68d973ea569d8e19de379189..9bbc975c742b298b441bfb90dbc124400a3751b9 100644
GIT binary patch
delta 34744
zcmXuJV_+R@)3u$(Y~1X)v28cDZQE*`9qyPrXx!Mg8{4+s*nWFo&-eX5|IMs5>pW(<
z=OJ4cAZzeZfy=9lI!r-0aXh8xKdlGq)X)o#ON+mC6t7t0WtgR!HN%?__cvdWdtQC<
zrFQ;?l@%CxY55`8y(t7?1P_O7(6pv~(~l!kHB;z2evtUsGHzEDL+y4*no%g#AsI~i
zJ%SFMv{j__Yaxnn2NtDK+!1XZX`CB}DGMIT{#8(iAk*`?VagyHx&|p8npkmz=-n!f
z3D+^yIjP`D&Lfz500rpq#dJE`vM|-N7=`uN0z86BpiMcCOCS^;6CUG4o1I)W{q6Gv
z1vZB6+|7An``GNoG7D!xJGJ<c(5lA(KYiLlDQB9PIY2*1omobu^d~%F?^lW+dlj#+
zuhl}acngFjeo#uXaPW}5&|9Qn0W=Mut|F!~+Q(O{lqNc*-|z;`osEU&4DcGvU1&_?
z>d_Qv(M-kdVdsIJ?CrXFEH^@Ts83}Q<W?rW4<1i^^DCjN7zUG>X}1%P6KQFNz^-=)
z<|qo#qmR!Nonr$p*Uu1Jo2c~KLTrvc*Yw%L+`IL}y|kd+t{NCrXaP=7C00CO?=pgp
z!fyr#XFfFXO6z2TP5P1W{H_`$PKzUiGtJd!U52%yAJf}~tgXF`1#}@y`cZl9y{J-A
zyUA&-X)+^N?W=2Fm_ce2w$C6>YWp7MgXa{7=k<nAhh-JR2ZFG6i{xJ#8OpVY7|4BV
zzNu%N9t?hsT@2Am!a~8j1K|Nc;|4q^o!o}|A%3fQF{v1(R>wwy9guBx26=MnPpuSt
zB4}vo3{qxa+*{^oHxe7;JM<uOhAmqTF0*B$<8CT_+)b(;y;Ku**c}!BtX!^CLrs<t
zIYdMWscSWL#6gu|6R`n^MCrR7`aUB`w+(PnkTj@&^{^g}c9JZspGOa<lo09Q*HU0|
zMeQ6pdQM&y(tG5tOFa#MHQNu(o?^}(^T2L%Auv>NMp>F`iNv>0!MsFtnb+5eEZ$WI
z0M9}rA&cgQ^Q8t_ojofiHaKuhvIB{B9I}3`Dsy3vW8ibigX}Kc912|UZ<T|;S;^C*
zS2e+93S7rchGUL3L{bA)g|Ku!p;?s;PX_Zq0~!Okb!jE`W<J!cA;!EoBjvfooo2-H
zIGlz=Mt6L58E}BDp?*uf^`V2$k7Utxvl0d3y#A}NV3@XKTz`{`5ga+J?%m13u<mZ5
zFSTkg9&s?NX1FU|kUfHfQ}h~tg)fEv*L`+oRq_sy5D@iH5a3yCeDDi31y})-5O}VD
zDU2l`8d$hC8wCHvQ1$&?2ah=saS&QsP704X5AbAK)IMi!?9r6Ak=H*Q{Dk~54NWoA
z4|kOt?XiY|md<`b>1uhH?RuHU=i&ePe2w%65)nBkHr7Bx5WwMZj%1B53sUEj0bxI(
zEbS%WOU<F$3BSsC289J>w)3-B0`-m0!{mk7Q%={B#7C^Si>C04@P|qm7$<d+;^50^
zi{HHGZmr1H4-WYmLf!OeLR<<(+u=k)lcFBzTv3l`ix|E}$B7ytzgSGGrFdR=2lXH)
zss6-j7Eo^DZ|=Z*5={M>Oxn3ki)G_oNQBTh6CN6d_kt@UKx1Ezdo5)J0Gdf@TcW|{
zdz1V?a>zldA7_5*Pj<LVGNxR@&)zaQo~k@(o}Eru%r)kYAt46?exw-pABAxUyQs|z
z!u5GpwGE+quI$ayI7&EAq}=i$_XWPeHP68;g?cIP9watEWz!*NT{|l-+O{$Ud)#1X
z_i+aw7gbtTddmth)#=Yl0|_x(Bpw07_dl{154D@|J`6oUr3OJ9>n6kDj|sbUqt-7X
z5+oajeC}*6oi~vxZ#Ac&85cYcC$5OKUnYPv$Y~>H@)mnTtALo*>>5&=0QMr5{5?S;
zCDF=RI@94n(!~sa`4Y{JLxgcvRqMM&T!}rRd~Kl#_X4Z&85;})o4W*g>?TaAVXSWB
zeY#!8qz^hmC6FERsjTnC)1Xu1UPd7_LfuNvuVqF8(}Jfar=T-K9iChEuZi-FH(P%u
zzLrjpq|?}8?g1Vnw^&{eqw~QY0f*9c71&*<5#9f5JlhJmG~IuV*8~nEBLr`KrvOvs
zkOLdlZ58K?u>1{vAU0CtT>Il<<J!?-PV@ZY`lCzw+gXNHj{UMNwQ_cB_UCVw7dE-O
zdZ8bf*kso?6aB>I{Q8#A!lO7#73V&iN13;oV?Hl?N5xDK63)Rp3%5reb&3n5OQ|9H
zDpYEI%JQXcrs^o*SCFY~iYf-VM<`7Tl@+kQS3tfR-fyH_JDaz5SYEMU-bTCLQ=JVG
ze?ZPcj95Tci|bVvSZk3^enqQ?pIcZn24V=YT{cf-L|P&<B%k^khho{7sHKt97|1g0
zReX55n{JE<ir!0^Gfz#GOIVaA6FArU)-20rcEaf)u=Ai8AwERWaQ6JHQ(McF8w%Xf
zE4Zk%LA%^X^uSN-nDQgZP0n4Y1{i!=!@5(B%Ee9}p{!jovFZ^=gFa(QqGZpUT64W%
z?5!M!7^xA>{-%%^ql$)^Vu~)Ida=<XPx9}M@!Pw!XHLEf+qh;>h$bZAMQEi$MM|&b
zY8;D;aEba_`W^=VdKfttW)h_zjRA&0A^T*tF*%+}TZQCOvFqKUu=xf1Bx@T?&~S(J
zopXniA?s%}Q4p9~F(Ty{8wt$l4oHeT(#U6sAu4>Q+~a;}I>0>??v*wfke}0TwPaeE
zj3gWtfNlD{jRgy7;S9PS?su5pnobi%Zoe0LVpw%`<)V=yT~Ht_U<t3J#R6KBv;{6U
zD`;&sL_;6Hk$+b5out^N)V!C+xz9-LP>UXIna4YUa;p=-T4df6<WRLWbSBrT2EHvQ
zX(*%JudK2|V2O}{(u+Oa5FqeX!|FGd+;=Kdf+Jk-<{AuGKjlFH<GI=0`kQ1R6|RBg
zR6L5LWBW}=%ct6|HLhw)FL0Vw9x7+j3L?8)TYP8pKwQ-*<S<n%hj4KPJDSbg77}R?
zccXgd^n3aVWRe)kGZEp)Jnci5_|=&R)w}3CQbS&7HY$egG0iwk$@}H>^;bz%;@|$F
zK;s9#K@9hqZCST!66N0uPB+FT*kq22%o<kD(e<Gj6FOb5db?zd6(YMgOB`|w%4|Bc
z(k<nVkl8H?k6%n=h)GRWLInD&GddoX$(?suWUkGuJOY_3COZ)(x*`6jCK#!&{ftl$
z5c+W78EgV@HW>vtJ%<9ArE%hcX^!(Lz;3?kCZ@Ak*MThjTOKU&t+uJdN*6t$;DDmh
zFStdHO>r)8L@qO}K@H~7Z);#f6WU{@Icn7Tc^|IZ`;K^ek9eCWdync`kWCt2s%D-k
zE$wyPCui$@gJJ9Q`CtixbMF(GiCCbm`ut(~ce-G|Ji|PZ3~DHlG`Asn;skVhnu0r_
zgGbdmfl|er`87<PDxK)?L{vfWEMzrIt#2nmi4k+6thI#E7ujL0iKg?Jb+&OW@<G(A
z?|UFyg#_0O6&G9ENNZ&VZepy{T5h}4=3-l6BSYDB!gK;2GstLmbj{j7#=!|R#=wU;
zwp?a$rL{V3x}gE&EKk?T<Ud!p4_iz9%TlRa&qWpRnpjZYrY90$d|NSy{r8Y<IE6}~
z4U$fj-apXaH~1^)xeE$3z4hybvp_#J8(o9>x@uYmd8A+!-3V95GE4&_^9N@hp4SC4
zeFU+Z<h<7ALX1|ieYvUghI44|&yD#FLgb;0L%_q|+({zf%6hN$g(W=uxx+>3Ou&G!
zlvZy|iHIIX3X2-Yb7YJ#{SYE9lCoixO+}(|u+H@Z6Rz-l1eZ7{I;vk+Y7kP7ev>hG
zv|(I<4?N{EXMSvRgUhbQhDoP1&A;SEUGGep8*!@4u)fNbl3%cts<&=m5<5pi7M-HQ
zPS#svbXWu2n&m*K6jL#@xm3VSMJxnxve5J6w1qGv`2>5<6F!uzGVHP1A(_xI7CWlX
zm6*wpT@dmQ&pAlm`r~T;)>m5HK^H^cM`pCSoh{;-CE43rMkg<;HnZaCHfMq1LoN0S
z%%7|$y~&k6wpiY@rsdCY9ZDh%9W6Pf=2^p=;iv-Ah^ACxwK3VmI}SMNneTa9n%biL
z#GoojRHxa}R2zOo!G@<<N~}d%LZtM_=`*gi>8M-B6vNp?)@_>#mYku#pe{O~t?~}1
zE8`)=BstIRk5W*xZw@2=89@ds?eQ~mxzkrA`y<$oR8bmaUw=rE%lFmzHY&aY8?<-N
zp1|bb$(XrOMmiYy{pH#)D1GOmv5aj_?waU~*h~s{VZ&H_PhoXYz`C8Pss{ymY_hPG
zt{NY&nPMH#FRvwR+T0(Xo2#<v5J=l*6F>T6;=oFmRgA9b-HVY72d|~YF+6v$F%sY0
zS#^LF7sTj>Itvyi!~){Hit*~3imOG*Xh51<a_1hxC!rL7YYs|OGyF+!91<CoI8u{4
z>qLz+!W~`vUBVeZZ5&k34SD%Ha%5#aclSzMfoGW<XEJVA;mZRf?T3gb>jiq9#rl}j
zOf*8NY>VN(`W!DxaBgjBzj3oUAVlLY{R}tiZZ0o>K$vwr?+eggZ!q74m2t?lkvm9z
zAmL2=W$jQJL>SSrbIOibe734A(K^B8`M@uao!`E$p+9D!rBea8Oxb|p5r3o4##G8K
zMr0I9y&`21{@m=Bi+4tTJ-xy(DB_mG$kYv+qw&VBM(A9^wP9;Yo<dQ|81bAtx~{Af
zxoYv{3*UnjM**q_Hz!exTY51$lwoq?_Ahv*wlsS!;*s!f;UMjE3x22cOIXyE+m!Sd
z5&Cx2U<A2wx0Gn3sV1o?$Txg0=svx@ET$`(C)Bb~g0q&nc{;%OnB6eaNp<dgDebd0
zM?P2+?k{xz0gxsC!Wp6p_f<{a_{5rC@jR_}^a@&|Sq?l)gbh@#%a)va-*K)Wl)PiJ
z^M}*brJVVRe7`f#&6C#u5GbwZe#+jaQqX9jxJ{>*6{#5tMp<g`jXf)he=6$LcD#=6
zVDpveMuDHkcNXT7DamVr3^8Z=iB&@`HF(_Gg*B$~q9qW~Wg4%TFNB>fa;m2FC+%l@
zk_cKXg-d&YUIj3(x{)aNwYGYjSHiOQK2K#yWt$vQomhbnF;Qhkxl`+;i{&+t{PrY`
zp5r28&|UvmUK|&Jlv>oX4>XE87Zns?fiE6c;VP7Bix<I(n$NvQi7hg_h9W83bYi5K
zDjgmam^+F73QGZf<80SV@GG70q5#9*uq37PYcqGEObGDg?BbaF;uSJ(yf47xb#HCx
z8d^YO6N5W;5wZhRtYGvZT~Qhjwv6Pt?&(Hze1@!Mwy7S3@9gZkVrY7ZA1fJt9%1W#
zBKqWt@F?Qg+sU(FGuB(eB-wa`pYSV43V)KZ^pBQ^yjX>T*6n}Zsbv$wd{gXyrE&Sd
z<S`Tii|b(0jYW#GOY$jqN0GnJ6ZOr1hb=tOu!-ky9O|6^jv9YxI{$r2#i!$kwNJ+A
zU+Bi6A+2b`TIg<NzqeTPC#bO%ME1Ic24SDh_OjzeuaXy}|BblIfQ!s^aMyQRpsKy%
zoD!BlBNU=;LZCuFS3}TGrj7Oa)_@u6nSQe%^xy<Xj}86OhGy9{1{Mkb@a`Ve^kccV
zZPY7CTt!*SX?kHRu+N2nU-nUEw(G@|;T900q{rx~ru#GRTEW)YRdKkfsVt4KvLG#c
zt&xyuHJe?pnql}7N%HE)^pHLg5O7$<{1}vtZ&gls0i9Ri&d_(D-xtfSbML)Su|ZO?
z1-Ri87$T9Z8H=GM3~jKZ32~H->hRlv!-{%~xv6yNvx@3^@JEa$={&giRpqZG>`{93
zEjM}YI1i6JSx$DJa&NWcl0M;igxX;est*nz=W16zMfJ0#+s{>Eo>bxmCi)m*43hU1
z;FL43I}nWsz<Wv=$2>jSS%*F1UYt^)4?D6&pDEt1(atK(DKY1pAkNMG`a>_ec;KiT
z^xMBBZ9i=;!_hNGlYp^uR0FW^lcBrs_c3ZvhcctW4*T^-DD^OU{{hK8yHahyGyCK&
zL0>f0XW|wvi4f`bNTfO+P*Ao<JRMaLqv0$({&278gLnpYNZlD%)>^L@8~ezagtl%l
z{(2uo71sT3rKTQ-L#Y5Rsy#x)Eo+HQranZmk;r_Hf7WWkRq<Yba&O~6u21mEKWYm3
zOl&3yq~$QoZ69OCnSeZ}w91hHEs|z^i|+-j$nChF;wxZxlfL3=&#*~e`a<fEN<phc
z-de(Hy#daWt+L3+OzdeTAPvX|uvXG~am?Uabm&o>&Q<eTqm!XiWZ8?!w45RQ;79VW
z;4rMI&{VwL<8h-7hT>mP{?}do0X=;3U_UYspffJl7v<a_2Rm~;=t1#eaw{n(`XA&^
zp_%SsDpq_ht0euysMlOi!YHX?n7{y`(WjqK2PqZu3O?D7UOA60n-7mU#N80l#(_Jx
zBO^L5`RPY5T~3In(Pft<(&|jBa76<G^~Y8}Yrn&%_F}AKo2?&I6<s3wZ85A=@z(b-
z05!=MphWAR11(<go<~NM{p^BTSp5#VRqN;>*Y&GnW;M7$C-5ZlL*MU|q*6`Lvx$g^
z6>MRgOZ>~=OyR3>WL0pg<z<=WunQAd$(giB3w14QYOU7RX)5AXVr4al0~er#j>h2_
znG)RNd_;ufNwgQ9L6U@`!5=xjzpK_UfYftHOJ)|hrycrpgn-sCKdQ{BY&OEV3`<YU
za)oLl!4JkDW;~G+aZFL>roT|=4I#PT@q`6Lx=Lem2M&k4ghOSjXPH5<%cDd>`!rE}
z5;hyRQ|6o>*}@SFEzb7b%5iY}9vOMRGpIQqt%%m)iSpQ@iSAU+A{CmB^&-04fQlV9
z14~oE=?j{b{xE*X^1H)eezKTE27;-=UfNvQZ0kZ+m76{6xqAyTrEB&Oe`Mx{4N;}5
zXp%ojp}JYx6PE}Z`IBO3qWsZEfVPa4EEz0vnsFNkQ!kG8tcec&)k$+s&XmPE<c+0S
za4(vqTIvzPiBe>rROoNxeTh9fATBk)w1g|9*~&S!%r0u6+FTn}dK-qa7cfK~tkJlV
zMi{BX!>lQsZhSQ<w<+X|J|4n?!kfEI>UWAf(M6+McPrv>)j<*T&hC!*?qq{@ABJWX
z@!~2Y1rhy*Z|x`DZUBuyayz}Kv5Pzrh}1wiHT{9|fh`Wl%ao=lRSwEFl*wy6BZ%vo
zrt9Ocbicd1q$a{F6`4#ZQ6vJa@`}IGz+xUr*=6TF^GR?`u{1to&gqJpwf$LN0?G&!
zsLNiG+}M+c{*<YTitloX{?VHG$MApcT?ma!w*2q6Ed%r4|KNmD64;}F&w@q>j-Q4I
zO!=lj&~{29Os}hgEv`iJ1tU)dx}=ob>DHSHKX|FVu2Y#pO|SsigHRgg4?!FX2>b3W
z`m}xI<#_02adGka0TuAIg89kS?>*lKyI)T)Pa)|12XfH;k9}<tY!B8Y;}j~X4&l&s
z(g;xpQ5G?0>#=dzH6T<KeHENIo<#?I;bVAn6Q}qQ-9h?=>iciCNO->e9m>!W)l&4B
zd74@>_LL9OuJ&v5e0)l7ME@xW)9K@*LUd1RY}Vs_${3YC%+LfSR^H+I=(7Szh2nKB
z_8bMoty|M+k9A|hGURVePvMf0XY9NYOiC@h^MLs-X@(8PV4zI7A155!RnZrBE9R1>
zuI4E`=JTxyJ#d`!(9_s?T2jxEM*E`){wGI`DBFIz%ouW`Y0cKDfXAGN{};aMpLRvZ
zu`PZ-3(+Tsh?UKAr)TQQ;2Jz(kv8{R#!c9Tyeev55@5@Ng*c4-ZQ6vC?o#5>6{<IS
z|Hdrgbn<g0XtE#_Q{Hr>;?gVfAIr-+^g>3b$}13U^~?gce6s6k-4ulnzWlFpq}*)2
zd0!wP{2>3U+zYiPaNr+-6O`J;M2Cb`H5hjDXw(1oKK!?dN#Y~y<BK6jV4~IT|3=+q
z6NP_+MdAvd<pq!H<;v^c(b6TvqA{~CKi`^T$DHmuKX!JZ<Ee#i^=Z*1Z0vr*o)73u
zH^_;iU_1Bs*jH4Pdb07knlsRgMaGzt+Wj9+JtBZY#mp*jxg_IkidvJS>gl{H2|9$(
zVg7`gf9*O%Db^Bm6_d808Q!r%K;IUSa(r^hW`w)~)m<)kJ(>{IbCs-LkKJ5Qk~Ujv
z|5`OBU>lb7(1IAMvx%~sj+&>%6+_-Pj&OOMzMrkXW}gMmCPOw5zddR}{r9blK&1(w
z^6?`m=qMI=B*p~LklFLvlX{LflRXecS#l<eVt23^HuA<>V$LVwi$+9F8zyE29LgL>
zW6R-6z&3x-zL({$nMnbhu|plRO8S_EavN?EKrr+c&Tt;Mk)NC0e|cvyXk%VKb5VIc
z;|DN^5)t^}tr&-2q)SbwrF>=k$moYK;yA{Q1!I940KmPvg_Ogb81w$_)<fG_Q;2t;
zuF7u(*g|W@;`q3%d}`uX&L4n<f|)LvVsUb-FRe25UJ>i3FgFWG<NjY@vAi9VTEfW1
zf8@Kw`sOYVb)srLfeI}ST9i6M{9{)Hv+tB&LU!S+-VlJ4jH1a8Sbkx2EYwuj|K%V(
z=w=V}uV5uQlmAb`R3x%cG&C^Yr@3@rrIXEJu&E*Yzlasepnnhg|0NvTks$@2jJm_b
zO>+MS?k=BpkVGk-bRhBF;xJ}wnGN{)?gbry^3=P1@$k^#z9*@tmmB+TZ|L@3#3Z+x
z8hJE({GEeEWj#+Mn<POX8zwJomlnSu4cNVLK-*Wer5Kd-2zA1qS6S&^TPxk#bnnv5
zrxXdP9S3)|pQlhD(V#+wMVL2H@@+uZR%lU2I9l}ck)9bgITlwdP^eG@R^AlMT+6Qk
zK&0q{0vG8G*{ksGaEi9SAZKMB9ScVYpC_Vvm9!}I?j2)@UkIlOduiIFU9wOw0`ZS-
znURQTw}nH6OFzn;4FYj3msI=-Nu*caS}u8ej9NE8s+UGK_B`-#kjo^x$J&3zbM098
zoO)!#Z28)R^<>USN^~c!=G+yW^j=cfN_0!}%(J-f1`G}w^}xi!T8BJDOCri{mGBU?
zsKXxeN*=L#<-p_aj6cHtYWMJ+;F`HLeW5cpmeVAhFfy+Y=0rIqqyJ-NRIu-aE*Mvr
zVnC-RDR`d1n<mbSq~r_vKQ+Ik{X(n+8!>nQu|^S79I>%9=bPNx1JLOJnB**Y`2WCq
zctq<)Cq2^Z%=$*&;QxX30;642;y+=mlMLec<knC1Y#tVqX>6{KA208FQ~_S&tiFQW
zp2{C3nyrmgkh+HRmG+$_y19m~0z~b`Mo+m6)Qq82p5)Z6ePn&B=!*twk7Rz%zzm-R
z>Qj!PE3XMBY)N-x<H_`H*~U8Gpsgw&BA7fvhw&L@=vaJsl8ryP$6fL0_j#VJZpCVx
zcD2>O(=VpO6=Cky5kpl}fQztM7QzvG#a}5$>2$f5w|}b8=3E)cNQw<%e1xAEwaRHu
zhHCGB4Uzs6x3A<AZi@p*tw0Y1R4F7A#&?S#=_%}E)>=7uUBC0({&iNH{!7JgQHVa+
zKfQItwD}sd;587x<ysUr;Wek0t>?M_hzpR|TKtTH^4{`G7*87o_wJrFlmrEjk=jvA
z6xBPKYjFB9{0Sj0rBL-z9BuBY_3c||UjVgv2kqw2m<@4#>zfx&8Uhq8u+)q68y+P~
zLT;>P#tv|UD62Nvl`H+UVUXPoFG3>Wt-!sX*=4<rs6D%tp5jx<Ip0&dkKN&67uJCV
zIZHWSLgAgPNgn!qcd4wsH!}4`7Z35*$oDu>{XxV|GSC+alg10pP~VaA>^}sRr1I4~
zffa2?H+84k=_w8oc8CQ4Ak-bhjCJIsbX{NQ1Xsi*Ad{!x=^8D6kYup?i~Kr;o`d=$
z*xal=(NL$A?w8d;U8P=`Q;4mh?g@>aqpU}kg5rnx7TExzfX4E=ozb0kFcyc?>p6P#
z5=t~3MDR*d{BLI~7ZZG&APgBa4B&r^(9lJO!tGxM7=ng?Py&aN;erj&h``@-V8OA>
z=s<m4Oi3*NA!x4t1}QZ=`cuvY3`i0fEc7?4Xf2xf@51(CvSAw}+RJ|jH&A3M4W91W
zruGUA9tPK%bbjBLp1V7G&*V&hD*IUUX+B?_82p{g^g0^nx#YRMApU&2!TW(~gFHnf
zkbVqA%h_4&sJVOkp_dWkG04%b!XbBo+XPH5TW<T_PA1o*FC1llQPfa3eYl}B5Q94I
zGKZaYZ9}8JvyepMH-2~TZYxlXaCTRHo>Q4diM!6K=su^WMbU@R%Tj@%jT5prt8I39
zd3t`Tcw$2G!3;f!#<<KOiK&UK`ftjs%A^uhWsp{;N$}cg(yq@+j?8g;=<QI$vjYF-
z>>>SQ<>g6}Q{xB|sx_%QKm2`NxN|Zl%?Ck6Lu_EMC?*eRxdgS!3zYU#OnO~0&UFei
zmP3k9!70^O24j5;G-fH6%T}X{EdO(%*+7ThlNGAh;l?$&{eZ<FnW)8j^|4C#HpOph
zbm@`#uYjc%$Rm&>-l`j281o@47x+6Z*DC`R2CkPo{1Behvlt!4${0Q?fBx)iIw$Ky
zI#xvxKs1U`uMgeZg5fD>s5AYH*n=+UaRzS?ogn6WwBPK3Gib5@Jj!sZN^tm>M&*r@
zjbBoF7uXJU2MW~JK3%Xa3R}3zsP<dU#Eq<gmn-<ZU4@`W+81jOp+Ou?1elLplyzJR
z9&@5(X#_WK`23z^zV1@2XNbd3;UoQq`_=wy*(Q2$Vgyzjd8>7qHEqbnC%eKsJ51+%
zVAT-eRHwD)0YlfK2&rN549*};CJ8I;dj8rD^PR(>#n?Jccsqx&wF#We;Auv9Vm%-}
z3HjpBGp$t5^S$XhJmYAP0q_qM@^#D}NM1FmCCyo;F|wv3_ci@$MA<3An0Aa|>_M&S
z%qGjO@w{NI$VKyDF<l%iI;N+l*{as6&ER^9*jArjrp&9CPuu23wa}!N@tNjuhPcC;
z?6mlkS`bvvH_g!~%F&ch+7hHlQK;!bveC_x6Phpp-}mQpT*~Cl1z7f2lF90T=o!7^
z=|4vq%$XLu{gPJ}rF}}5_2ap@Owm7i-PTrqUz1^v+c$yHJP@#RQL=+UMupjabm^GL
zJo>@w5W*6XK~5S`S$@ABWh@uaFIBq~VqOl99dhS}?}3N#JizIfYYt<W_#2=md9gBI
z#}F}*i(I`rGJ@Q|4CI#j%v)Q+9#;X}=?+J{8bF&jT!<pTicXV4_4SCoK4g;p3Zrqx
zRw=THF?#1)pKE>`ZKK0i_e#E;P0)VXh-V!w+qX%^-I0^ok>HAm5)tbBZlYov@XkUL
zU}l}NDq{%pc=rmBC>Xi>Y5j9N2WrO58FxmLTZ=$@Fn3>(8~6sbkJ;;Uw!F8zXNoF@
zpW;OS^aL|+<qH#mBemG0I2|~ter1TI1m%~?XOM%c$G!SO*d_Cm;2ametA9t!34vIs
zuThJ6wLav-QtC6jfIVAR<d6oh8=>aN@xwRNj^&9iX;<p|H+r$KL^^=M;IX6b-&Xy<
zd-x9#Ce9V6FcLXTrl%A|soy2|{09m8R0*VK!yBGFGDnq-N+&6}xpKOn+i!hxSmHK~
zM_+XDgs$sR<IPbaKmVJmxn$F?wf|hr6#l=AY=DLd{?3aIPUoNkuFc|kL#*jQr#DC?
z;gy7qj4SY-n^8{6wHdXVJwtQ_bU-w>XxRUuPo`ti>k3Hi3cugt`C(EwuQ&d2lyfO`
ze!0fi{eHhU1yN+o%J22|<Zx5&q_FVNQW$pBrz1#!Wc#z$>{prPvPOs1S?1eUuGUkR
zmzMlCXZtW)ABWasAn53}?BqtPMJ*g>L1i6{$HmoEb@h(kILnMp(2!H!rG?MNH`1V0
zotb`;u#Yz0BZrT1ffVTCV!?{L^z8q11_21ptR0ITbOcaZ!mlWhC_AZb>?2IDV|b_y
z9lVt3)0d@W=lNp1ArE;h_;DDQX^_;WtsSIO<;Ly&(#O~Xw$R0~W|xdQk*Y(b2=vLV
zt8HX8=;#;$=y}!;Qku2HJbGEzF`2_~&i$&ogHUe5vhx}FLR}K_Mp)J{n*Va2<|pk$
z4tI(7v3A%Z7Z0|ZWw#7%<L9&#Zv#MPQt+(E?sqgh1<}UP*wE8kaR!+eKa^P!EX^{p
zsd1qo?~5RTg$|wKuI|=~B2t6m=-05YFc<cqfE{Padpk)t{+ZdEN)S-Ehng`;#uT|{
z@)Cm*K&~<YYp-nI_KKJnj`A<T25*(MDss9uqe-S=dP;5=@s2p=b}9sg;DW|JDH14u
zY7AyB>$U#*mv+`Ujlh^N(t63xFt_%*WoJ^oq!U0j+Bx`<>q!J&0sWy4&{@#*BOr-s
ztZ68f;l0UT3wf@RRC}_ufMr6rQ69Woa@1sZ50Ww|{yfp8!7rMOh<G%wh$s!NM(0R(
zq0Gucg>_POTE;|zamq+4OObJ-VeTK|D|h?mfR$^lA{E7pk8DRDz*j&r<&fR>GaG*d
zYaJ*q5#n251XIpR6F1o-w>LZ)Cb6Ma^6tCfcOItn1o;$#H?^jqOd(PA)B3HaTlJ<a
z|JC!mDZ*M()h1k@$&%j_Fp^Bimz+bz3MbiZp&v&nl+p!x=UY?wbC3<^qw#s}Abt>K
zw!~?nh-v<X)^J^C{N(L?fFSM<gYb6Q$3|e3g(Pg4u%vVHg^k?Ih3wtu_E3C_!7v^M
zj+DJR9-Tfa2lPfcx5AWw_iIX?xAi+E-iSpr9k=p;6Q_Dl=`kvxbhn~rD#5R7pi5~$
z+&FBc%Pss`?GA<#x2q2WcMh4!xiGTTt}Vy|wf09qj3=Sfoh13@5BiB$RA!e!Vm@I1
z&Ej0XP<PnVJrW5A@0d!lpw3(Z?PA>-_WBi5*B=IuTZOX2sa{1I!#%VMd5eGe1VcL6
zQ!aDft}>TjlwzEJ9Kr6MWh1MoNNWr$5_?z9BJ=>^_M59+CGj=}Ln)NrZ;Fja%!0oU
zAg07?Nw&^fIc9udtYSulVBb-USUpElN!VfpJc>kPV`>B3S$7`SO$B21eH8mymldT}
zxRNhSd-uFb&1$^B)%$-O(C$#Ug&+KvM;E9xA=CE*?PIa5wDF_ibV2lMo(Zygl8QK5
zPgH1R(6)1XT9GZ6^ol$p>4UH@5-KV66NF$AH-qOb>-b~+*7)DYsUe&Is0yTx=pn8N
zs&2Z4fZ1Wk=dz>AXIfd%>ad=rb-Womi{nVVTfd26+mCx`6ukuQ?gjAROtw&Tuo&<w
zl)%U_5i!?%54w;2?WJEeGYDZRRXCWWuvQ_WLc!ER(u{D*q^lL!vV}~F_dI0|A2@2S
zp(UQW8vjSbVvo6rl@*INzt7g1P#i})ahTo4)xeTld!?`9&uK8h$n-G#SH2B6mDVt?
zz~=;Z7@okG2Q?-a`(9Vu15@4hw-95LV%~-4w10^Hs45ci8{L%>w$|&=rEzNzwpuy0
zsqq)r5`=Mst4=HCtEV^^8%+Dv2x+_}4v7qEXSjKf%dOhGh~(FDkBW<~+z&*#4T>r@
z>i7T5TGc96MfD%hr~nK9!%r{Ns9=7fui)N%GN8MvuIrox)(0nNg2{McUIC6nq>dD+
zNvX69vvf=Pw1@x}^K{@%UCL734;&AVta#($&l2E|*VUaKW@h`X*L*;1Kl4tajl}GQ
z$K>;*$3y1(<^32Cg8ugi^ZII=I&ina>q@GC&~gQ#Z88(nOj;<iHMXuH#f(t61*>*j
z1{hyEq|R_0v7LZNKB|3jqZPqZOuUG(SuM^Z>0@mzsKqVbRrkTz#TRZ0sTQ|%XiYcE
zEE5{9jEB+2Sdga|veYSFZEzOuepHGusAO#pg&R(%Ob@V0Lw;AfQJ{aLUJxnbe`q(m
zadg^fXYiWr+mm2akb*J?y`w(!KAL8OfFD!mVWiWrgScgp9^yo<SycT#CPl61i?gjI
z$t#MvsLPusu(Ze$1&fJYn`YD#<D1oakpkF%2Mu5kGnN&_sV53Gy2aXtoScfyu*`RU
z5Z&{L3ox^cFduqRc9}5;(=YJLVE5%dn&JyE>h3lNN<k?z`^Jd!^cl}ye~%N80oKmX
zlR9EQ=zh@Dc@vpGfxh`){OtH4b;4d~z{w(uZ9Xb{VkMXPR&y+0C~oq5u!axo1vLI5
zaymilE2p--)9$eeML6KkhU7_)Os~Y?p@Xb(Yq}<by|p(F{jF9kn%C9>Uxd?YyvgUL
z>+!2VX<jUwm;P9RH<=9I3W&9K6u52IZV+RNe)E)v3>P7Fzq<G1?skULDYhp=u&U@>
zYQ?(9-r*?N*cJCK&)pbYzuv%R{b;TB_wC1V3nO#12V0ucgp);>!N=;G=l;({KZF>)
zNAo=0m|3Zu*PNLa-2v=3r5>-hVI_xYdz0m*f-zUW_=eDqiM3j4MPnS~eIRNdw466?
z)yxHI@6d7gL2Qj<_@72W{GDyINBy%X6X&_cF1(##v^}87YGZ87HgfH$&epf>Jlia4
zw53K1M6=Px@YCVTUk!%_MjyBeaWy7c40i47-3B{voi|&|7aXz<V{M){FpJrHr`@4d
zImdj`-d3YlYC}?n2+c|oT3ALDb+Ng3u>a!(OB~E)U;f>5Wd3&@#UP~gkM*qmK=aeZ
zkP}gn%JmKK34}KdEu)4E2~qN)EnAhj>)4dbq&RbLu$BD&kJSoIvr$3A#S%P~l$l1A
z!96hNdtFXsta!b+enJ@G;6rv-Rd=IQ_llL#tSGk-mpQi(mhop;lObiTQIARXw~&d>
zVuCSG$T&zi?#&PT-fP)`*-d@gc;+tOPDaUA*6>R<P%GT~fbV;=0N6J%2`I*qqE!qY
zdsT^}ef}vE-<Df{OF)bj(T83TniX(Lw)hy#N$wQi&aRL}fE(G!FsyC8%c5F4vXE4{
z8;3KRWH5CGGA$f_Rkb#kVf-O#bgwsQZbwenO@34m2@wSu6}AdI-IX#jc0H>Irf67&
zpZ<1ie#4rJ3HEu>v7sF={4;oXv?_MwEI-^o-Lr@rW%%cd0TR2q`p=rkMOKYzOs&^$
z=xW*e)6p-B(0Ek7w8+!@Cks9>$_#zi44MLyL9X?{sDlihX%V;$%a;wd&RL*XGcb$`
zvU}#qxz8wAT)*NQ+lXO>AI`^r7B&IQ3J&{cVNn0aWa)(!fQtV+mm~`vsH24+xI|q{
z4ce$OB1hrqGLn;H#=~Rx%T#b|hN`d6SXt=;Jd=DNX3LO9R8xLX@6p3>SnZO7M+96a
z1s=zJKd%qy0#GWLeFgc~?fsCw^$6lG;B*54&@n#>q$#nRSr?2GA4YaSSl5~B2k}R_
zfJE-$C~{O_6Rh6BJbWFuoaeXEI!Q-YSA9EvSG_sjB~-*hf_PM~mJ6BL+IcaF)8$+;
z*4A4W&+_Mn6~tF|M8Sz57BxO=W9ZJrNPtdhME>$sS6)etinxj{YkK){@Q${`Vc~dX
zLT4U<?^MaTTKi<|Zf-Ag_mm{Rir&!7+NL1FnK1}xtSu*nQ-G{^%2y1TCQ<0)bJW~n
zI@Y>YjwuC>dH8AAjQb{Ji>eMvJ5rH-4a(K{4EyLrCDtta)u#>`V_AvyS?Y(;FRT8L
ze`JXZP4s<VKe1y+m7Uy9?EojlL(yzHoBGi!vU355-i4-5el(Yr>~Quq$m=6NI@}`(
z`>o3kbSApx<kp>cHP;1Mds3&41!_0r619~@AQr9TW*Swk`Q1JNmIk%nKm(ZbZMHEi
z4n%vC0MuAKNz2njKLk~w|6u!|y7FN!SXk5=7>^^p-R4w7R;~G!v<{>H3%SC-<DK1r
zmWHA8d+z%B^0Zo>?>8jAP&ka=owuQ$sKwU4e8EVyc6V2IpBR56HthbwJ*XdwnwrW4
zcR7oGg7kCmj(q{#ka1d85mRVIo0`1v3+B--4RXv$hGb545y#j7bmu0*>BLnTRZ+mp
z29%AP8Id+57Q(6`ep^&LTtq}GO1dvJ*8~jxjiH0quR*Poy%N3@c8rhlO6YR@LBk%l
zux{&bK~LvKYq%d;Tzl|VS=?rkBUD-j$YY-xX)z`zUfH^&($ZYco(Xc1tr|9rwx}=-
zk`E2Wwkh*HIVsWej-nJ6HNH)7rWDlB0@`{QG*0)&P+~Ng{m^kG#J*^p`drM(`dnd&
z9$U+FH=rXh2py-N$l_0)@|JY;X1hVL`@}qxNi@<Vp`k(Kp#IzZX}Q{K|Cg&a3@Y@#
z_@?OCRJ4~yFSWaaQhj#ROR|lyROWPW250>Zy5hI)@(af%=1cl~L3{fxZWys9G-hLv
z*%jvhoba^ePB8YL)`%d%=t6Yh*c5p1S7`+BPjOD*#q4~gv#bn0wOaf_K0SiGC{jp8
zAc_Vk31hKTSUiEU7XNk7`D}S-RUrYb<7%)k+tV0zZ7(}vQN@0C5EI<=$$qW}m7f7I
zk>dMLd+kSjN4{OaxBJ^_h?FayJ`Yr)3eC$jdk1@jEzVT=a?{BSjp?&?qPX=xO!ttw
zN_s#<#Ve(0i_|cRa=MC2=8MonmoT5)UtF&Wr9-b2ng>>zv{8$*UcIBIXSZ3)x727q
zy{r>bdOh?E;ZI(^io=P3`o*tLdsjkjM!rGae!v5QH<3-OBW(XcRhvM!(b)Yas?oK?
z$5)Y*YS^_d9H-ZP^_iVooK6EE1(akYvmNkXQGH1`kXg()p94|_F8B@_ABt*7QTmYk
z47RyNSjX8nMW&@VZIQ`1WB%-*W4oN#|M}EKDCC_@HQ9!BenOQ{0{i#>IaQkyU-HOT
z#8ueeQdKezCP`+p0{|o?!axX6WB@{OJTR;qfs(;uKp@Kjq4Dr)^>R9T+^$ohEYKB=
zQ<S&6O=lU<wJvhQ9NmpOheG7eK|obT)Ls7j-aFUfdl;&F=AVkl_O8G<gDS-j+x`iu
zk@6j^V9sp=`bAzfu`UCvHyl;AcuC=*A!=3vKg%h+Lu+2zUDXxKo7Wp9wmO=N{@!LW
zd!e3W=!v!L?};!;?nzD{sT;aWVITv|yf(<x5$&v&xK-eKKwtK5p>x_P+t?e3z}3#W
ztf10?br2MbSVn%*3!j2QFu;=K)-ueTmgyYq;%9HjJL_W=dV$#21FIjyv}d3@oIy+c
z?IcrTw17F6oYGMQA=66yCh`48DJb}^Q?8r<L=7qTP1jJUFL#dbmkA$tCUCXqZcc0$
zL4AVmDhE)6<M|8U?@geK<|Cx9J3o1b?cs0!dcF}No9<ST!)4EUpPs~{gNJVN9i|!r
zSC;%|fD20oC6G2_v+qQo-r|t<<cQjQuASQ>3Le<Md~c{^jh(Xt-g2pr%Q2GcL0y3N
zkxgi<>i%QJ!qpxnt5`aP%aJL9ltY7#;qzq)qdoGzpYx=gz7Lz$JJZ4?^Nr`!1MK@k
z47M)#_%Bezu?xD<{tFcQ{{@OiDQRGst}MJJdOtp%(wvCymmU}NKvIK%z%RysueJ$h
zMe(J;-iblcWW>90Ptma{$`%AUZi8_y>pQy*1GpoiiS>`GK9%)TGXC!$FDO5REO0l^
z&lv``tj^Y#F@DP6&qSkCYO-b8O*XVx^8O@0D}Wv-tbz7`p<r8&0pJ?jwLSwY%46)D
z#;`ke7zsyi^!o37Do|1Gao>YOlCS4pVmi!~|4dv-5i^8laoUp<SQpc@F%-z^VZ}+p
z<y}k3*x5P;8zGO@fm1=hSQvWH+|77XQuxgymSgu@GvjNmEr*&2vQG_?CeJoTI#SV_
zEb-P|%^=i~?K6BchU|6*MqPj$$nqCeXA$)3DpXTgjG}w%=z^DN8g|)761X;la%*>k
zxH@-rdRED~DyWrZO2290e;bISH8z$=kcmp_ct)+edl012<`vnqx}D^<cDH??kRDQ=
z){q+<gvtixTpn6MdOI7BfZAl^^Jy7>FD$tw<i7G_e`#P-V`60JkYWX{3o=Q=F)r<5
zR3(KMvgvE5=PT7}MWTJ+RlVl%;?D2NL2%)oz6DATxgrmlSP3vRwPeLI_;jh32;;P2
zTeS>K8)RpVW@yMvk8CRc&d*ku^a#%~2|u>f%{up2Q6x9Mdt&e&@t?_bEXURy{+@>{
zJjDZB-f~7aGc%-QXc7g4fF1tUfP-hsa@qS*#N2_g3675xMqbz<x|kauRfl07pLU|(
zo2L<u=Nq;`1@L~F=0gz8nh8)P?6|1Nbd4z$hAm>yQnC~pK_jH^3k}w%a6jCW!C?MU
zo{9eUxt*=#6(neNmoNf#hiRNdGBu|Q(@9s7|H`J*IMWuCEyE4;3IJtKS-n7f+C1=O
z89gY4%6N}DeX%EYz8B!^9f5Sf8V2S}yTJ>r+}=RsLXtADv|&$w!dxTz4oSIuz=8S>
ze%G>2|5coCh@K)cA(h6O>kRSfAQt>H_fE#}H@p)v`Tw>aulOfNhyS)7=rI4b9<or-
zSP<~=@DLCX;4SR0U`aV1Am4@q$x2gTVM8oQZtKsvHTFOeumK4iNk#!9!{W%rm__<V
znz;ohT(b9fgMdg$26g2Q+Q?P-4R*2LHrCjvV%K8g1FwQg*LnVq7F-+Twtp3G#~iz#
zyB@pt{FYufO{avOm;>Co$DH=Jd$I?iu%Tq!e%aPW7DXN#iTjDG0TqkpLrhBBzR8`k
zD7XbvwV1f*5U7kBxrIxHO}NcgSmCK*P*zt<4FpS5V5@~j2g+wGN-WtIbV``U0-3X<
z(0T||f@~2Ebo3UuxzrdG=FuH~6+|7!<lg5F8b!yct<wjxc=ma(hTjm{1hG|2$9Rga
zE14i{GTTs>VsYU$0Z;OEL^Mr^S^zSSbYwE3A~U-vOJDyUDUStXfD%K9;#`BD_z>Zb
zYj83mc+8KTgEK6`Y;^Q6ku|@W3|m*M55gt8^^WdrxGslExn_2O8$_a0M&&_Be0KPA
zDd|?nYAOvUkTJUXZ7l2Ml&#rK04@AJab<n7YONhF$kVc0AbF;)Rn-XDrOG&oq~{8M
z9-P0+2zFVKjxHdw-1fy!3v^&WFV53fCsHTyZ{@d}ZXO-RgR7;HRUIugA*dIGZ2;{=
z)0e0%OH@H>u&@g<IoY4R(eAL<=0%9V?j7*_LJN4iT@olUyHYxIzh)V0dhsS^96B8+
z5#b1ytsfZ!y42mW29Pi1Df}(B)Z!g`OkNv^;D=8T+FiFf+7qlm_rb48v1_`kp}29a
z(hHMuSuzdAA+jsz?BA>=pIr~b;eo^(8BT(?FunH$AF3j*ZiHB%C({8I)tTa3VRkn)
z=9uW|9))}J#GUqRh<&w4yL15QpK%2bM)-YYq2tcqZmh#_)@tYAn7$!Z+6(FhAPs2p
z^%a8A6xo5O-hgk)a=r7#iC9Sn=%vgrQsl}WCq)N+4q*=_VT+ac3I+*<OQvyJD;fIA
z6(qz4yMH&2`d`}Exu~_V!nps`{0iqorpPV`enN9Sp08C|xWzp3rMCaX&)9oyQ4;KT
z8fm@HX6NA^X^s>3lJQ&#epf@`!?G!7S(!aZGWqpGk8(*`ig}*V&iyhzH;xtxA$y_N
z>)-lw)z%-mcQ3s#`hcb*fp;U`yikM&{Z0^!k1?*j(d(dK9Vw#6o;HRAhEj6<dbj;k
zg~!LE*(BW!VSpSQqQnlg%vUwq6|-OcebL941?htmy!N#<q<w_a-!$C<9dr=N8g>!&
zxJ$%z@#hubu+iCATwZBgyl$DO;-%^6*lhP|m`w<wUCgJY!LGd^M^p%+khJt=9HmT|
zAWQqTpVcIK0C1NPC6tO1AZcC8PKVAYo$cAbi|%!j>V*S9e%1oP-d7}LFzNb-nbg&b
zLeV~*+>vogxCnjjqMaj6y1jn;s7GQLf{ZSY20O#1YGg;yjg-{KM81iL;0{|;LN@@*
z6ST#Kr<W{N8l2O5)N8_sg@zQCbhz8KJU)5mcT*%*@2l_kW;^s5!%FvttV5d;r-Gqj
z9lr+q)O5@aelh@MZpkSgq>KAJTzEMTb{1d?&eNzE47+;ZFtJ8pB_U~EkOk=`-6MB)
zTaU^zm3`7P2kZ;D_=u#Q2t;SHzo8P1xqM5!?7^WSE#u5XoolRV{Q<h*nfm!?&VMnG
zdWAju-nB{CBY|M(&RCe@EIS@{5c<|uJP<~8?Vj+lWfTt_0M$-wv7+NCHELO9n9wYG
zMmF=Z6>}doTaC)1S08Zy7GJ<J)$8@R$=Is+w%_AX3Zr~`mdm<dl$=FWN>?pd&8Jjw
z`*_`ev(<+Ra2R&CQf7cb97~c^x3voFRhQSEV_1<ZR&lGJqmXQH_Ldo5y7N%kd8g(=
zTBY3IP!R$aiHaqQvCCHzGvZAya!VI}m=^cL-}7g6+}8j7gFY&#NB%~ttDT#$&$C-?
z6*N5&Uqs#-vZVxx$y)!!XQ|ARCyMd$-2&zHS3bsvm|_42#)sUaWb%rV`RIbWMg6-W
z_>pF(I!QUWEkUh<2Uq?3Cz9FxIKeB|n?CuVkX7tAhr<4Ej#%Cq?uB5e^<(Tu{>54T
z!(6b8DmhS=>>S)e9h|J%5}ljxfXIRDVa(<SjjNDHf^m}B%L_v0beA_~>%*0*xTQ{+
zUjroY*#_U^>b1Teuc$T-egClH97?IE<0#OhF0Y9ByTKPxej00P`|jMJVCqxQ>44F0
z6StS1JT#Ng(}>CWNb0uNM*qkV5<zCb5#uB#H4OaSoi(#5WeLk=H?mzQUxl0}e}N2}
zA!BoPstK$2#pAab#%b+?HL~Q}$f|S!QEe!FQFEX$5lwwA@tD1q!X?=kO`~KKb3Kbb
zTJK0C>JF(s$Hm`S`+O2LRS#bpUMgwU)x`e2u1#H8woa1YGZIsxydK5$JP$cfI67I1
zBE?jjeY6QO_arp9gg1v9k)(iTssRJl7=WdW!5$tkQ-3&w4c|W=|Bh|HOKy{C>%J3@
zZ|8r+H6nd{{iLE~*`b<}mmrmA{8WRDdlJ%rL%W#To}q01jQ%5ZNy@MC_fzCo_!q8x
zb46H1v;|CrZ;mdn-6=g>sqK$5H<)H5rH0*n+c!YnE5YQcu{wHPyVztNP`)K`bv3XO
ziFeTQst<w6YKmJ}Hw0=wU-b#Wp^pTgXmEqG1MYFfDd>%KJAd9G3SLmUQ|V9fRRc;+
zPd%sGo1p@XsJh&<x>z8?psQ1@NnY|!@p3%Mm9gi!S*yNThSTSi>xCoEGLx%T*dPC_
zK3<rIHG)Nonynn9j31xe!ELe>J4iwp-OZ&1%b#}32cNRbgvhDTdd7->2vcnO3Mt%o
zR22P|KlOg^Lw}@|mzlgUh+KF7hZA-R_k=AFARuTl!02E$Fun#45CtF|+z(y&M--)~
zkX(>sZe#6y_I>oP0}9KH=o`);bPVMO1Tg8k$trp`n2F7Ga^3Z^)#GsOamw&Zg{k!R
z#))<PgT$qb?T^4p$5RbO!-dM}I6Xy52LQm|3iCFSKau6y+;9-IKxK<o>|f#dP=GU6
zM#KYRBI_eOICiiDR%oBa@n|ggpZJs>v7kQ|)(*x)4xxl6;d76Fl^)QGde*sDZnRit
zpWm`UgACR9MH}@~KMp!Y^x#))Vw2>dEk%BKQY#ne{MWqyu__rdoOP0@hS7`G*TR#L
zKP;$iLuM2_a){&S^B&D>F@2K;u0F-emkql27M7pe;`+bWflrlI6l9i)&<zY@u25WF
zwDF}C1PJ3Fgm?7r0vT#wDFR0-o$U}(mFbNTHKA{4bju%BGC<|P7MrYogl8T-Olsbw
z4mFZTa3(yxIwP-kt5mWRAs6DW9(o)i6tWta=+D`YyKx$a-NoT!eh(XsDarDkuleNs
zsMx<s-|C+r6)s|uqA09}kDL)6Vd|!yYwM$sUEX@2Esxr-rA5DpZxXZW3_|AwJTv|B
zzDJ)sxS{%g0Es|$zs#NCcKI$ZXV5?3!FymV%kVmZ%nwjY2MDcD`jnF&SX+M!d>m!9
zKWFwavy<&Bo0Kl4Wl3ARX|f3|khWV=npfMjo3u0yW&5B^b|=Zw-JP&I+cv0p1uCG|
z3tkm1a=nURe4rq<n?QsjYC%O&)T=1Iy<WxF^@R#b@Bf?GO|r?R)Zgu|?d*KtIp;g?
z$2VVk_0h+PXpJ<$boY%n?plBM`kFp1c1TahYr-|L{+jxln2{PvBsDW(q(dnqu46r;
zCv`2WV{=f;hGK(y>`*qB%GQMYwPaSWuNfK$rL>_?LeS`IYFZsza~WVW>x%gOxnvRx
z*+DI|8n1eKAd%MfOd>si)x&xwi?gu4uHlk~b)mR^xaN%tF_YS3<T8ITeRCqIGc7kV
z1C0Y2EuPdHk7Tr=AwAQ$#d_UizjbMev`kK>`PXTOwZ^2D9%$Urcby(HWpXn)Q`l!(
z7~B_`-0v|36B}x;VwyL(+LqL^S(#KO-+*rJ%orw!fW>yhrco2DwP|GaST2(=ha0EE
zZ19qo=BQLbbD5T&9aev)`Al<gP#ctGOU!h^j3Xv@LA;WDDlMQYrbV+s$+VEE0%Rjb
z%rYhvQzV+!&Boqc5fEBLewEIn^O?L;cVxPN$z>Y7yE<o}bpmZEU8vF$3Y4OC%2dPT
z!I?eqkrc$JDxyx+wwIRE3YC`8>tL0B7+0ZSiPda4nN~5m_3M9g@G++9U}U;kH`MO+
zQay!Ks-p(j%H||tGzyxHJ2i6<M!cBG0fyi|!BQcLGEIdCYisBdl~&WGOqDbDWoiOT
zreS;JgkAt5R)D>Z)>qJ43K#WK*pcaSCRz9rh<ItEE&dgtb$KG4FgH#UZ^A3R)IzN)
zHB+0d)}2~LPn&;U>JS8)X|qkVTTAI)+G?-CUhe%3*J+vM3T=l2Gz?`71c#Z>vkG;A
zuZ%vF)I?Bave3%9GUt}zq?{3V&`zQGE16cF8xc#K9>L^p+u?0-go3<u6|EOLdzb=K
z0zH;Yz@<|uEgg>_WdI?oXJm@Ps6m_FK9%;;epp{iCXIh1z3D?~<4AhPkZ^c-4Z}mO
zp@Sa4T#L5>h5BGOn|LS(TA@KB1^<gfYsQcrC2PxOh{)_**{4Ax{WKuB89b{DHndFF
z!4_I(AeVv)b`KB1pB6->r67<@Qp!Vz2yF573JoDBug@iPQ=tr2+7*HcE3(5`Q%{A2
zp%psJG}nJ3lQR>^#z-QI>~|DG_2_261`HHDVmM&*2h2e|u<fd@Ku~WOXb6PbQ^R7n
zIW>G(OXl?228C|G32{9e%Onc=sVwIVZ=g2{K5s0>v2}V&CZi1_2LA=x)v|&YrWGaH
zEe3L=lw}aSiEdWu&2-C5U0O~MpQ2Hj-U8)KQrLg0Wd|XyOt&Gc+g8oC4%@84Q6i;~
zUD^<idn>(7ILW`xAcSq1{tW_H3V};43Qpy=%}6HgWDX*C(mPbTgZ`b#A1n`J`|P_^
zx}DxFYEfhc*9DOGsB|m6m#OKsf?;{9-fv{=aPG<V74~Jin`uk%EKX}<Z<r1-L%9Wh
z?oof~ee@s2q-fc$)6_FspGa>1$)qI2n`vZ(R8tkySy+d9K1lag&<E&4MJgrxGTo1C
zhW4UcKWbXxjnEyTk5tfy>7%F<X=}N(o)o;tOCP5P1l%W>>R(e|_M^wtOmO}n{57Qw
z_vv`gm^%s{UN#wnolnujDm_G>W|Bf7g-(Amg<kWxmVO9W$VW1biU2rQoj;<|7(EKD
zghKnSX+BV=&}Z<H(o7WBtd|}a+|<!2l!k1sFI#Z$>R@NtZ2eh!Qb2zWnb$~{NW1qO
zOTcT2Y7?BIUmW`dIxST86w{i29$%&}BAXT16@Jl@frJ+a&w-axF1}39sPrZJ3aEbt
zugKOG^x537N}*?=(nLD0AKlRpFN5+rz4Uc@PUz|z!k0T|Q|Gq?$bX?pHPS7GG|tpo
z&U5}*Zofm%3vR!Q0%370n6-F)0oiLg>VhceaHsY}R>WW2OFytn+z*ke3mBmT0^!HS
z{?Ov5rHI*)$%ugasY*W+rL!Vtq)mS`qS@{Gu$O)=8mc?!f0)jjE=p@Ik&KJ_`%4rb
z1i-IUdQr3{Zqa|IQA0yz#h--?B>gS@PLTLt<PX!ZH@)-+(a5|=e}u8nBOomn)$64{
z(?^76Ub3_fH4Y_p6TQP<ZS(#OoFp+@n1fdSfFWO@zY8n<12P)vZlll_c<FzP(C|YL
zg63OvistA@$Gt3xp5h^Pl(wW+>6F=3=v*e6s_6w`a%Y2=WmZ&nvqvZtioX0@ykkZ-
zm~1cDi>knLm|k~oI5N*eLWoQ&$b|xXCok~ue6B1u&ZPh{SE*bray2(AeBLZMQN#*k
zfT&{(5Tr1M2FFltdRtjY)3bk;{gPbHOBtiZ9gNYUs+?A3#)#p@AuY)y3dz(8Dk?cL
zCoks}DlcP97juU)dKR8D(GN~9{-WS|ImophC>G;}QVazzTZ6^z91{5<+mRYFhrQeg
z|Kn=LOySHXZqU8F1`dXWOJ?NViPE%&FB1@$8!ntuI?)geXh|#JJC1+G^n$h4F)g-P
z4WJMPQn{p=fQtw0)}uk;u*&O2z+G5?iW_=1kTy(!AJzj}de{a9WHY+*SqJ7`<bkc|
zdn1N%C^sZC29ZVW9h+NvBfAf7+11h>={VTi)3NK|)*W3PUT#5a$D6oyqH%5zjdO$5
zICHx_V;1Z)4A(rT6aasvZ{{r`HnxK7^fMLS1{;H{o<8j5hz*F@WkKQmDI*Q<U|JR|
z9m8fBJ@`rt7`%%qSVl3E4kk!!MHnTK=y<n%1z<=2)S$m`+L^V}{Lsr+@g9|X`D!$S
zWzLHj0|VlKy`t#swfWnx@;*KwX5OQSK)B#Rk?xuqlS@q*5`}+jkB+05{Y3-Ceeimb
zW>%Kf$Mo!EpQ)=HV^lsj9KSz->ROVIrXAI0!Q?WUosf8t6CR*rl382^sU3q@($L~E
zC(AoyIjS<FBbkdC{fLn{v^$Z~4UtZ`)5}AAy@w4(gLxi!Jq#&kTBR;Hi>&2(el|I$
za*8oAtqGQs+O~huhBCOFw(^b&bol)FWsp15Sra3v%&#w<U?v<+GY3UMPW4%i_Qshm
zHO;}S6W^rrjf`>Xz*!kSi!sV>mhe(I=_Zxmz&E1>i6=yB*_X4M#ktdNg7_G}MVRGQ
z7^zX=+mQ}1xtg7JN9E<W+2sLq6(cKQj*_!lzuuckFfD(b<w9nH^qu?;p<s+tb4;V9
zr>(QI&?4}=tP2#z2<7N%zf9rxzynL~!MgNpRvXaU69c*^X2<O`Wf>(c?$=h&o~Fvv
z06*{JdsM!gF$KALcW(}@Q&<c>Alo`@3h!H3j^@5rFMp8l6-q!cb?1iS$oZfU+}A2<
z)&2ZoL34kkSnbf=4>q<Y20GKGZY2oJKJK{1fyfjVxsUS$0teHMJJ@NFfxRA7`D6T$
z=$@VwzaADX6mr4*spf0dvZz@nMLst;4_oZqwPRaH+ir!&ra@ZwRQ#w7IS$Ah5<@oj
zWA@tP_L>d%guV7zM1p=amds@nhpkK7mRJlb?9zYI&?4ftd8+RvAYdk~CGE?#q!Bv=
zbv1U(iVppMjz8~#Q+|Qzg4qLZ`D&RlZDh_GOr@SyE+h)n%I=lThPD;HsPfbNCEF{k
zD;(61l99D=ufxyqS5%Vut1xOqGImJeufdwBLvf7pUVhHb`<Oo}66o?X=p>8`+K+G9
z>llAJ&Yz^XE0;ErC#SR#-@%O3X5^A_t2Kyaba-4~$hvC_#EaAd{YEAr)E*E92q=tk
zV;;C}>B}0)oT=NEeZjg^<nOEeyy!cWw3aqRR<;`KZC?Hn|5()KpSVc;nb*3>LHx}p
zic<&Fy$hApNZFROZbBJ@g_Jp>@Gn*Vg{XhVs!-LSmQL#^6Bh-iT+7Dn)vRT+0ti(1
zYyOQu{Vmgyvx3Tuxk5HG!x2a+(#>q7#Xji%f&ZxT@A*$m8~z`DDl?{&1=gKHThhqt
zSBmSp<nUy6!0Fb87~QOP^{@OlmH)yom&_Zx2Vpjp&c7p7WRto+B%*(t0DqOwsQiBq
z3A2kc1`qX05+NNtEjfx_QC2=#!sH?szT<c$88eRLmK4}Andnm_6@|Zyr?(o0iKL(n
ziEk^`6pmqawJdp6X^zM)o+NUHI0AlNTN-g`EhUs=ih{Cl+BLZ}Pnr+6k`@$a%)(a(
zD>x#kQc$Dh6W76k!dHlhS6V2(R4jj!#3(W?oQfEJB+-dxZOV?gj++sK_7-?qEM1^V
z=Sxex)M5X+P{^{c^h3!k*jCU>7pYQ}gsEf>>V^n1+ji40tL#-AxLjHx42bchIx9Z<
zz`>51CG4Iboc%m0DAfvd3@b}vv4%oRoYZpZ*dW?+yTcduQlxreAz&6V(Tac9Xw3_`
zNotT9g&r{F_{!Xb%hDPJqn`CWqDwai4M@7F4CQ?@C{H~rqxXwD(MFpB4!uljQmH~(
zTXJJj3MEVHkt7r8!^R;bp!H=&%-OG&ONKIOgLJtng(VD0u9%2LuXKe7h$?9lQ^#cL
zOo}gOx^+ixt2Izmb6{J`u0VexU0j}8Is+?LWLGvQ66Pg0ax4n^G+xW-rwp&fIZ0}l
zI?y~wn^6o3{jj*VSEQ}tBVn1#sVTQB(l&Gf(sriC0DKR8#{);Sgb5%k`%l#BfM#W|
zfN5C8APnl5w%nrNi{BWrDgudYAZLGEQKTzz^rV(Bst!UI7|8?nB_w}@?_pYX_G?9i
zgK?yo0}({MC^6DiO!bB88kijN><T5+IyvxKBN7h6c(t(&xeiNl%!`>+BCQ8v!rg{Y
zz$`Hf$t<u<%LMu}Mk)|9;(8xsD_Ux=xWhRMYx@Oj2Z}9bp=;<FPMg}%$*L<IEPm*<
zXmlHv&$sLSn~hvLZr^{nNm}u;#e$iF978r2pKeiu#q~{hF4d=Jb_*WpB65*zl~=?Z
zDfq{dPULwBzbc57g_W*6&C64Do)+inqG%*fD=TaB)OcKep>B*WdxSPHMMkJ{&p0(l
zyXx|^X_VUQBdh9)?_2P1TV<rOJ5RetsW(qo+kYeDv^TncfA@bV9dMo`&Gi`7MWc?&
zSdX((@5xi5vhE}q#ntPvniZ>iiYqy+91$zg%3%OjzWyY=X^f7I)2-34bDVCEhECAi
z^YqS9x@(k<kJJ02VOPlS9HsX^LiaI+-G28Y^f9L6eA@34zdy<J1W1SFJe@es_xt6_
zybzNXjMEr!1?qqJ$eCxb{#c%#I8J_`$xzPc{qn&)J)NhohFv3P9>D(Bto;VDKfgIo
z-)s_q)d2mr4O;DTUTgjOe4f51kd6T9`xa6_AUP*N{jz%!Z0E!Dqq}JlfPZ2EyGN*E
zoPHJ^rT;z^0vaI03Z(WcdHTh1suHxs?;>yWLj~GlkAQ#jSWq|nUE}m()bBZ1`Rh^o
zO`d+Ar$33kry+En{&JjrML}&gUj3pUFE58(t|p~g@k3p&-uvoFzpGktUMnQ6RxDA&
zibYl_A!{@9au^_fB@6;1XHLORS}C(Hi&J8=@>Kw66&QJD@w>_I1XJuBW3_vn?f~bb
zTv3_J^W1+E?921QNo!MQiLHISD9?+dP0BsAK+yB?l009uXXMOteoGX;?5I|RG_v#B
zf~l?TPy3zGkT`N>WlZRa=k7Vdbz-66IQ979fX!i7Wen@lu-oEcweu$76ZXrc&JWRf
z!tL<p$n#n-gQyuHeVo@veY|0mFF$4f+$erN%x!;reB3d{ojB_>Rg2JqNG{;`-H@L`
zKHfgY-Lve@vsPT7B0@716|Z$Z-Z{!WV;qGHV!`h!S>b)rZpc`9J))^79ey;7@-=zZ
zjys+j=U6maKhDddqZ}XQffIbFYn)R657nRGEG#j`M-Gni4deWVXcr=HoNok4SKTPT
zIW&LDw*WrceS&Wj^l1|q_VHWu{Pt**e2;MKxqf%Gt#e^JAKy{jQz4T)LUa6XN40EO
zCKLskF@9&B?+PnEe(xB+KN|M<@$&<DzAw)o8Rw6|kDN_Po<CWwfTvH*U!LbrTka*}
z^#q(toKC+#XuDZh7WPw4@F)mDwN@Tb{jPtoX9RA7l}E&i^zOQ_C*)WB9ziK22%X^1
zOwbaMA&5bzf|}<9pNfXnA~lcS6%kUZMPe)K{hqohgq|!VRQTzhpm~B%kMq;fh#!*r
zo%K-Zm-GCrm4%~SB2KO@gpVcPHjBj9C$O;{?auQz@21ruVNaTa$G5GN5*X*_qXK`o
z{-BS)Cqj>ZP{jM;DemSl!tAG2{Iisge|}6`>*BENm!G2E!s<fTyY8W_<NS-L6<;sb
zgM(k?`FEBh{W;qG6fH%hgT^cPyMUfPHYV{1soVW>_XsaUit2`a&pfn!ggt)wG<~No
zFFD~p(1PRvhIRZaPhi})MXmEm6+(X?Aw+GxB}7gAxHKo)H7d=m&r6ljuG2KX{&D9A
zNUe9Q=^7yych#S!-Q!YKbbka8)p==Am-8`N5_Qz~j7dxLQeaeCHYTma$)Fy}ORKS4
z5sf%}(j`4U=~Aq(!-|ZRRXvQijeGJ^%cq3itmW;FI)JsU8k4pNmCazDyH9@=bqwS9
zq)y8?KhH}MpVTd^>?u+Cs!&l|6KH<*pikOqr$wK%YZ7(>z%vWLb^+m&cCQ+h_MDo+
zaXmPW7CD|K$-d&cg$&GVPEi#)hPjGYx|SBxatca)&Ig?*<!7b1bIf_#dOqX)u6Vku
z+>6~uiQKE)tF7l+ci4JvbZ>vQo}1mB?m;{w?j6>1xBD9F+2<a#o^N&^lUwmT=DyQ{
zf2aE{@swNTF6+5d?y;V|@__ZcPQFPz(Z}@TzXsZF^)~BCqMhWRz2qbvJx_w%G>p#Y
zP3U>vfnMicQVHdhK1yDCfacJHG?$*GdGs93XO$LkB~?nFAfNOoRY`xRs9JiG7CM&D
zd5!=ra;zY~qn6HhG|^&58(rYoNlP4qwA7KN3mvymz;PR0<oE{FI9{S<P6sV_%Cy2c
zk6!1jq?OJf1)cR&>%5d!IoDF1vxVxNS5wG&fEt`JYIGi>i=Fq;YUc>8aXv_wIKNAm
zI$xs8oUc$5M((w)<+NMQ6{7X7iz)2tqz$eebh#@<&91|=(KSq0xZX>fTn|!<yNX)f
zYpKnB7qz?ZrVjV>v{~LlTjaOXR{3kxDZfD5<Uc`I7}=pOi5&k2P)i30$5jABB^3Yw
z$|;l46&#bnZ83ihd|Oo&|KFs|dwqTTXuEbx_tkY9bZygagO(A-V026>rHpl>gbmAU
z@|wOa$t%grx`7}nA|ePPsN0Y)k&2=Mc4?uE@gW0-f>S_2bO;VnKt&W3k$KKdvZh@&
z*WWKa@7#~`b<h2ubN77w;KKkGi<JV~F1u{?l1r+)jo^PqGZw1$R|k8l>#Kuyw9kqd
zj%CMuQ9ESPc-)MbM#7}YUL)ZP_L{+siDWcU?e8%n3A4VsFYJpNeLjn2bT>CI3NCJ<
zwecm{{XNM@ga#75hHnwEW-M&QOfzo9!Zf<cj3-DJjW209u3?EUWNxayRD}@GI_zXT
zXs)y(roev;J05Nf$Bj_LZ0wI4eSK!Uu{D-(j7VhOA_WBklQ$TfjK+u&3pbwKy}=AR
z3OoWc<!I8eB8@>i7EH$DX3S}9p>0NY#8jZt#!W_KUc?R>k@Ky-w6=+Da+_s0GJldl
zF|P?(31@{B7bweeajQGYky;y%9NZK$oyN7RTWNn&2`?k9Jytjwmk||M(3Z!M&NOYw
zT}t~sPOp`iw~(CAw<+U2uUl%xEN7WOyk@N3`M9ikM-q9|HZC|<M+r)cP>6CJ8jAUA
zst!H<<<&6(6Zvbpj!BrzUo!>VHN3A3vo$EF5-6b1Q~ajXENB~lhUA@|>x6=N0u#cf
zv&w(qgG`^+<m|?*r#g<ou^Q&1Mquiw$PR~d?zE&837K&PwHoSJy+Y#Jji@=^g7k6{
z=0gJuYothX3}PVxU(KNl58azlMIshqF>5=HoNur<s%R2W9Xq{B#|f;U4od{)<~_kN
zT4d<_Y!K(Am7t8IK-uvvGO*|CI2p@$_7s0I*GjMy9m~^0rwL3VXP0*;>`2lvR~b&P
zjumO|P8X;=d`c+z1YJlY7&H@<kqap&!!<|Dp#SH^5jM}u&=v+7id`!{so@NqDRAsj
zZc=a-S({#Xh8?8<oXrW@j#Xn|qGL<KF{27rQ{>Dz-Rts$X0IYE9kSIlqGZ7utSx^+
z2hOEC-eXviWZXQ9;$Va+WlHlU%y|f~w(|)o@(5J0o|3MQ2O@+B<@r*H4*65)(r^JT
zq+<*b06XMGclsEElst5dEfFJ;AQfYhRt}O0CVKdGh4Tk3-(^-{kukZb*3oM$ZffpG
zMs;jtk2ZjAsn%mND4R~OS73JDbj^Q440{oS&4<@VUYMInc0xxy?FE@$J_^n)b|gY+
zOj;8Pk^)6$w9nbnMms3RSr6q(9wP_)v01|=P}UbkXoS_1#FCl?>&9cjCHOS!yEJ<m
zQp)mp+>qiGd`83Nj00{X6dHFN84%)I^*MZ=*Ihw5FxD0YSJHV{j!9v(DT#k7##q~$
z87Dig!k3EiMO;k|9XhYz8cGVPukGe$N5@yNtQgngIs(U-9QZ2c^1uxg$A}#co1|!Z
zzB|+=CrR6lxT%N&|8??u1*Z?CRaGbp6;&#}$uQEzu(M6Tdss;dZl=hPN*%ZG@^9f*
zig-F9Wi2cjmjWEC+i?dU`nP`xymRwO$9K3IY`|SvRL^9Jg6|TlJNEL9me$rRD1MJ|
z>27?VB1%1i)w5-V-5-nCMyMszfCx0@xjILKpFhA4*}fl9HYZ~jTYYU@{12DS2OXo0
z_u+ot_~UfZNaN>@w4Es$Ye>i&qhgqtxJf9xi6El-@U<d)Q*=Ct5te`Q5P6%`dRnrl
z$Bdhy)utiq)x&g7*}2wOUorzH+382JwJu|D&JqQW<vA!>NPeQ>aXcYVxOUA--x3v1
z3e=7+%#m@}QuMTjN3n--=-{@rNtyYdYS@LJ(G?*np*HILbUeo)+l8N#+F-;^(8w>i
z8Q6til8Y^NG7_qa*-n2|4}(k<-HF~R0v*cP7bxlTWNJ1s6#R<fo-lgMwQ<6-SvBL}
zXnf3H!pj<djo*wb=h;ht#B%;yzB#`W5Dh9`CFjWHgdOvfk*{TOM($kG8@Kz@t>z!N
zCYesAbm(}4qp%-;B%AF-LyS5Q6@Q|V&Y2ar$uWn(?U<u#G{}FXxA3+`HR_#gg-hcT
zCpM}6tAJ~5$H8iqGe<k$#ovqYH@r8tHcGh){z(QocAMQ#)q>stqXy;5$ZOCC_?L$F
z@o#dk--?Co{)CGEP^73Kb_^><U_Cw8x0YTb-eF#pG-JUui2N5H^Zo-AwQehxIdfIe
z!(iIzE(#R4B-wwSPPjRxdg<MvibBGz6PlV-p^#%-E{&KSv&dd~ZAFo6dxXY-z3wo%
zEp$y3hzTT<dW*Qj#Ua<#jPjFoF-c73l_hk`4w+U&8Hd2IoRwT2s7GtnMY*WZ#1t`=
zstK8vbIs@y=XA5V_fHpIQOTR8k11p%G-@~wJ3mtsvt)liJwGu&rV9G<^vGF(rFqh5
z-C=WntYFeyE#{JJF^?528IvcJ-*l}NaV!CN=5>`G8sAN)M@iNKQLBj>QAcHjIw0!1
zl6{UYd;|bA+CcC#3IGYysWLa4!KA}CsEV#c)JpJcF~NX9mrX2WwItXv+s%I2>x#v)
zy%5xDSB`&bU!9COR@6LwbI|OQ&5mf&L^GGZnOXEOLshxOs;Y;ikp^<NqRL8;JyrCa
zvqDu=FXUW<D*Ra;GGH{(NH5479ZSbRLC(aooX)WI?3{^H3ARRev}WUDhH}<W7hljq
zFKcS%8BW`i(QY%oh9g9{R7g!9MHYpVOZYto5Y>M(l-^>J(o0NIdbt5`(fTq>p%?cG
z;%aHXhv=-@!20#xf*q)++kt8IJ5cG{ff?Sy9hfzQIroA8N>Git>3xOUNhe8nUspSV
z`GL0DK}<_w!3gRCwOvD~m+Zn6jxTMde<_?egr$S1OySh6XsS!0Wh)wJPX+xd11YQ=
zMq7X2tU;U;Xx|ObfO}%y{pchi>ryaM2zAy50_$ltt(ew6h#CF@+U74D#H@hdQ=dX_
z=OChf#oerWnu~l=x>~Mog;wwL7Nl^Iw=e}~8;XZ<v0oiPEAy8H{OXgW>%co+bp)3O
z{Mryc`*3ryyIC*S%Zu;8Y_D3bFAn%8NTYv?y_%Q4zR-DvE(Q*~>ec+JSA76q7D#_w
zFR&HI@z>V`9-)x<HM0L391yS8Rl0Qu+sVyzEK;~_7<YCK9C(`S^9*7jg?oHnWf=Fe
zVT0tx0ABAbFY?@u=e)|3*i$c81^kK>r*ME%7~<$Ykd?U8uZ~EqUe&AlGDqP{uUvna
zvy#q%0y2VKf%UxO(ZC2ECkuzLyY#6cJTru6Q`qZQQ+VF1`jr8+bHIwcJg}=iko8FE
zDt(bW8pbOr>?{5KLASE=YFFv&(&IM|P6@wK(5#jhxh@Pe7u_QK<?6PNJF_W3zZp{4
zJvoUWG@cIl3;2Lb|2&Mp+>d{x@L_-HM=1`rX8<oqmkWJm!bN_G_7PDK@a)9<fq=KL
zE8s2@o{oYtp>`BDds3pf+|$)DBqpXrDP>JcOxubC$Dy60;8(mfG^6yXE(+N*UWMW?
zA~?H-#B7S@URtmlHC|7dnB!Lqc0vjGi`-tNgQ8uO67%USUuhq}WcpRIpksgNqrx{V
z>QkbTf<T<=W9r+DIo^V7lnT4b#G-MDQD0k^632JS`x7E^PP^~k5z!pr%P=HP*u~%J
zqb(CB%Dwx_#7UX6rFkr-r^8L+JaIC$?srRi4>i6_2l0TUk5SXdbPt}D^kwXm^fm04
z^i66Xn0`pLmnhX(P0|TezL<YjiaC;2ixVY1S*(^cD*D8$;uLX_xJuHi#kG=NFSbj1
zvly22A+cA|z2bSX9}q8!mn6Smyv5XYjq67D1hHJwBGKa7?z&a-OqsvUb*JQ+GC$xN
zlsr@Bhg=Uzo+<M?U5`kfDf5rHo{&6K=AUxCB6+6F?{mE&d8W+2?RtM#@=Te3&-H=i
znKJ*OyHN5>iFcQ{E0~v*cmmAR2|PETl7Ls>OakCexUmie^yDw3ccuqd5(wV_6?YM+
zegsV{M=^n{F2a}~qL}DfhDok9nC!X$C9WV!U15~DF2xl0YLvS#K!rPqsqS7(b8m##
zZA(3F3H0v&0Z>Z^2u=i$A;aa9-FaPq+e!m55QhI)wY9F+db;s$6+CraswhRp8$lEl
zK|$~`-A=dB?15xkFT_5GZ{dXqUibh$lsH=z5gEwL{Q2fjNZvnQ-vDf4Uf{9czi8aM
zO&Q!$+;Vr_pzYS&Ac<0?Wu}tYi;@<xZb*}~#G4&yy`V$Et?fqE-EB*4sph7Cp%=;2
zQ@KZTXQv))ZZm5dKlAOb)-2eL^y=JF9IBYes5oS`N5=A5tT#5cHX2@wdhSCBLZEz^
zbWK1<N|V5HVnRPOvZcwtGcrxd_$RT=q}EH{`7pm&5yJvgH?k*vE#uHXZ{ARl6*0<w
zU*pF~#D0^f14bo&?!U)ETPoduHFQSS%8-fa(_fd%EWa&Nqx&jW*@3{~%3p*3@amO7
zVP*BofrH61il{g!VQdT|s5&TPJg;U1h7b9bQ0Jz|KQn}CPH|Pu8P0;k!33{!+%2HM
z0aVtmuU{~={*39`GiINF0a_SX6g~k^O9u!<o;w0-0RRB!0RR9{O9KRxNDvm2%zH<F
z5h+8q93HYw5uy}QM_|d8m%xHt3D{+J7m{e#O4`V2j<#tMr-_uta^2Q+TPKZL38bS$
z>J__n)1+zBq-Wa3ZrY|-n%;+_{BHn|APLH8qfZ}ZXXee!oA>_rzc+m4JD<KzMB7D9
z(8Y7-hIc*QI;y2l>1L)i(VEV-##+;VR(`_BX|7?J@w}DMF>dQQU2}9yj%!XlJ+7xu
zIfcB_n#gK7M~}5mjK%ZXMBLy#M!UMUrMK^dti7wUK3mA;FyM@9@onhp=9ppXx^0+a
z7(K1q4$i{(u8tiYyW$!Bbn6oV5`vTwt6-<~`;D9~Xq{z`b&lCuCZ~6vv9*bR3El1-
zFdbLR<^1FowCbdGTI<Yd=2+)}(UW@G^;5l|`kXa3rrUznCu^)v%E{e=0vYR!nX|Nv
zppCTz`^(c1U8kQ-=L(K-TI$u4PV0`dUo$m%%DvT#4b#<aQ_FQ`A=sI-(x-6Y&b>=6
z$L96-7^dOw5%h5Q7W&>&!&;Mn2Q_!R$8q%hXb#KUj|lRF+m8fk1+7xZPmO|he;<1L
zsac`b)EJ~7EpH$ntqD?q8u;tBAStwrzt+K>nq0Mc>(;G;#%f-$?9kmw=}g1w<ipB6
z>Dm#OQM0@K7K=BR+dhUV`*uus`*ND&2x<<uSM4PScL(Wqx`VBt3JO+#AM2-9I7B~d
zIIbfN_E3;EQ=3AY=q^DmQncV2xz0W-mjm8_VaHElK@EC-!ktWFouH=5iBgisaA1U@
z3bj)VqB)H4VK|{N+<t8Sy@S+2oqQhb)jYRLk8Nvmdp~VgXa~D*nc?&sHk7dJ$sp}4
zY1sv>wG1HL5>74*j@^8Jn_YA_uTKbCF<(bN-6P0vID7dbLE1xY%jjOZPtc<eNRz7>
z2-(JHfiJCYX>+!y8B2Fm({k0cWxASSs+u_ov64=P?sTYo&rYDDXH?fxvxb>b^|M;q
z%}uJ?X5}V30@O1vluQ2hQy*NBwd}kGo8BE>42WYjZn#(~NPFpjeuet!0YO{7M+Et4
zK+vY}8zNGM)1X58C@IM67?0@^Gy_2zq62KcgNW)S%~!UX1LIg~{{L&cVH^pxv&RS8
z7h5Dqhv+b?!UT{rMg#O##tHOouVIW{%W|QnHnAUyjkuZ(R@l7FPsbEG&X{YTZxd6?
zGc~wOFg0-e2%mI+LeRc9Mi3vb*?iSmEU7hC;l7%nHAo*ucCtc$edXLFXlD(Sys;Aj
z`;iBG;@fw21qcpYFGU<ZU9b&zvU5M^3yjxqjOiRCV+cH$TcX8GLws9}Gs}Lcy$4KV
z&`E{H>6D<g)!Gf169pGr=vv-Sd1i<C%9rqFDP+<_g&i<|H*Xmdk{4fK0AKi6FGJC#
zf<g|RMl=;BGMWpW{g@gU;O)-RBx~{*#M3#;(S!5@oF5!|0^%8|FE#{A^#<wf^bVH&
z!HU*ZH|{MMxeRB8cPezAfzmi9F@V$}Gse4MI@fwoKU-R}2(hyP`)+!VLO)FJ<y4Nk
z!5t6MkI(^sj^Q805JSbp{WgUA7OyTVf=%8}KhC;*Ku~;X4=u6sL%i}Sq!HJu=(;*w
zQ`MiKkFe}VIcvPFfXXOH7nx!E>0@j_)KD&L`tcGuKP_k_u+uZ@Sh<3$bA}GmGrYql
z`YBOYe}rLeq-7bVTG?6wpk_57A#-P&*=D9tDb<vJ$!nA9xOQ4sM|Is)T`iB$29KOE
z-0_Y!v(GZKhMia4am~e#u5PJbJTk5!5Jn35E$W1AVWB&zA{r<8tP)wo%Vg0}o(EZ}
zTs5eMgW$E9nUDxFyhPP(s8$YB7)%~lUan?sD~~95?SjKB=g7LRgD=)!eVM~{E}^zL
z7%lIAqb9AAiAuw>G+8N86Ovlm%$~Fhhg1!#<%uJPW4P+L>rOa{&N2gbFd3Fh-nnA8
zlL@IrHd6K33HFYag|7^pP;EZ&_CU5|tx*P)T5w<<O-<vHxNfy*Om%c!Iz=^Hhpm0u
z002R8KaGlW4r{{&(>3xsYB7C+*ZJvZ7o_)pdFg0Mq37s%lo=)Pp+u-bBo85|bFx@z
znXN$P1N#N~1jF)^LHc?61qH?2r$7+}^DzU=b4Sh0ILA`+DkZGwe8`w6RaaLOy2{+;
z*G-qRoS@LWVrj2g$m_QBE_9ft8J2%>-hNdge!7N;!t-RmW$Sx$dLFwX06)v6%V+3+
zI_SpK&${J_g&{nfAAf~@mBoJzd1aB-d!go}pMC=xBXEb1?t=6Z2khtQWf04f1vH2D
zAzR~Tj#erum;iqZ)uy9mW#IE(g6{gBs0m8`Hho^9SLk>6WYl=|`BSI?aM#~0G0T@g
zhZQIE7P486_X7pDDlh!Lpxdh5G=KJg4;1<e`z18z*=m6@wEj?`FVi2Pa+C>hc2-bl
zI9c0tmCMY}Qn=5b(4Vqv{|sKKb)cXA9B?~><OzfSCFiKWps(}K6TAw!Ns&-wCddWp
zm*|%np?{4kvd=0Y=(wVg0&0N%miZa+;N@5j(BBIZ2(f>}U6*`p`RQ9+ELmfJLHahw
z(?8R{AQudS8<=zg^lz2qD}8im+_uhWqYUr=fMT#sIo${8zZfe2N&j7)tPfNL^8Z2}
z6)v8;x|<$fDzHr5?L0g@AOmYTwm%3~HQmw+c~!W5LEVM>2|z;BF)jd7U&jQ>xPb5h
zeEn5a91wogI=6UL`b7g^&v-q5Y#V}Z4=>PWem5wViJ&4Bv3x<oU9vK-O1NSroFrCN
z9%JP_{h|r#yVl|1WYtAWlSv%7TC^ylS*)4AEa?}w0isAvoaxNcBMpSQVEx=2c3LOa
zD<UK|fCBJ%>eU=0-BSSJgLq4+X0GzB+;^$X5GmqzaR*xhkIN?DGhN6_q3Am7=yuN-
zb_|MEpaRpI;Cvp9%i(}%s}RtlP5ojEwsLfL7&QhevV-Nsj0eq<1@D5yAlgMl5n&O9
zX|Vqp%RY4oNyRFF7sWu6%!Dt0yWz|+d4`L7CrbsM*o^`YllRPf2_m#~2I3w7AEh+I
zzBIIu%uA#2<eNp0BJLBtSYS9@dD?bi0@XoK^n)oev)4!bZxs<vLe3qt5v=_F)y+kJ
z%vl%_oBQ>wR>--P{=o&yasGhV$95c?|JRlO>qdUDA33j5IN=@U7M#9+aa>fFb^X45
z?2QBBpdyCETfk(qrO_G9QH{A<cLc<ULa)>F(1{Qg6c9(jWVU>`9kPNV#kqZxKsnG@
z%?+|N3y9-DUAf>)sBX#CYB(Ss;o`eS>0TYtk8(ugt>(!)?E#S%6uC82XIZqAYlIHH
zMHZAe8xkWHvS<a9b0jJfz?<GaD+4lInKVp&sE{Ak?L(6bh97@P^tM3Wi*|h^b$ptd
zuF>k$;54;FuF~4*RSLzf()!C1J`J>iHkKBN2e70b?Xqa3NOvAB(w2*)%usxAitdXR
zX<KUWWvZXL`K`z`+L205)0?jE@pO4xyc?gTjgc1b_Ef@Gr0xr(L__%4ee}FnOx=7n
zIv9D8-Yn<>sosCjl0P-*iH$V%MrP>2!E3ZHl@yU_+CN1fffNwny;LnWvPf(q;(3vd
z)}hwfgz-(OR5H?(nx==K>;(!(<@t9;uhDT<@L}{HO(kEVmC@_oXQ(0S**-;H@pAPM
zql=DME;|u{PV`eSkr1cw8-cy+VdH~Tho_^5PQzI5hn0Vy#^@BR|0?|QZJ6^W<QgbV
znX*yqG0&d+LhNPoUT(_HP;TfNnW=;~I!$kDTt%M=Bzz$+TkK4#tNv+fiidojmii(+
zJ_T#jhg$0EF0t9a77uxgbgoE0g!SjKewv>2bop9*@$1i0N4&+iqmgc&o1yom5?K6W
zxbL!%ch!H^B7N{Ew#U$ikDm9zAzzB|J{M9$Mf%ALP$`-!(j_?i*`%M1k~*I7dLkp<
z=!h>iQXd~_`k9coWTEF$u+PukkXqb;1zKnw?ZnMCAU$*2j^CZL_F4f6AMEu3*y|O1
zH*on~MrSW(JZQTj(qC~jzsPRd?74SC6t~&Ho{fJ*H*AMvXXx@p@_Al3UkBY^gXE<b
z%D_djRJL(fIXa%bMpsj*{ZO-5q)#*MZZPi7<Kx!_AoID@5bq4r$BXovGxP-soG)IW
zm3*n+J34jqi&Jzg7QaScX34Ll*fZ1g)sSzR{<uhAOL!Z-3;gvlT3PYet5Y|>8Bdj+
z^csKuPu+aSU<4<<b|Y4#zq-snHxQu;;<Z;=XtiwDk}BI)YLji4x@3Dd?UC(X+9%s2
z9gyuX9hdEKIsxkvX_S@iI9akS(EDV|zbyAb`lxJ6eo^2LU=y=-;Er!pY=|+xWQ>E+
z*bM#6<<w9lb%jEVwCIVZZ%)(S0U^Lp(?5UUCszLcC;R|PMf%sWX#7Oeze~~onVq?T
zvk3mF2YWMHeFqUDPpkt#nYqN3SR^Gwc`#ZOp3;fHc2U5RA8r=)rLCl^E*&i&6g$x@
z0yt?#tSE}ciVo|C*xX<);bC`*gjXbdQe-WHg1wsXvs(d>ud+wQMn*g0ivOoLF2sMG
zMX|YA+;yTTVpqi0qIi@1?JkN$!q*sv^Y<6Uy<Ogh?m$Dg67t0)3WA7GcSiIT#r+rQ
z(KX7NKuhq+<J|$R8=o3JR*MJn4NrZXf@_o(?~_kmq_y!iJg9dEu81Ut)+j|W9P-CJ
zEkOW@cj#8S15-Dj84URo-YIg*ZQ_3#y`E|oho;5h8_|$I<cnVsN1DZ3as3MHz=MG(
zn<@fx9y@v&?7ef4m$BVo*JklBEDAypjm_c&KI8I=qs<~yvUFrxjNPc-`6UW4+|Px)
z`~|PP7P&zo8l#h9R2Z^-1isDFS=r~7`)BEKu^D}CH=zG^dQSGa<^J>Z3E5ufmiwQi
z%d*cc_c?mG&n@>~qR-1dx7`0aeM9!S<^Jm^0J+aC`obd`xi4Gp$3(a6bIbj-cuMM7
zii;+o|1H4kBUC4n<PmA~g=DEZ@_ZLiO9u!sB7#f#4gdgn9Fx%%9FrQ0E`RM#6G0S)
z-?6|#DV9<|u%NhpwS{FZM$%AYVn|F#8a38n<ll6A*e>ix*$<2{av@xW8pXsPUVs;6
zJVT3+(1xAt?9Q3@Iqyu)%%8u%egjy8DR6vr^rrerZ%S*Q{Fc6<Tf6#-ZUtV)ab@fT
zzTpKe;&@0d$%uHeEhEEflYg}zC0?X&>`FJH6}@8{p6nQo%F$e3uUKnOSQ}Q)_}#>H
zIS{p_QQ;x^w&N3pj&F1Hkiv+)I9^?SyjnF{bf|wGg%C(Lf+V!)h2xUId=T2E9m<wV
z=7&&rIux4qz_uyWFeEU!Cl96RO5ZkLHTTGhHH-*MpGTiF;kRVdC4UX00>cN1L$QF^
z5g2*u_)h#xV5qoL+7?I^OWPS_a6JtT*$mPcAHy(mJmUtoz)Z1zp0^RJebf|pVGWIs
zQB0nO8D@fneP+6d6PT}AA2UVLt7UKlb7Ppryg<H>Ktn-5>!^V1XRwIrG!}4+mn=`W
zBk<_rS~lA<Y|ueMzJEovQoY~iYXas~$fZRtL07(a1=a?#TU!GSD_28(EFUP#hg|sL
z=D^Hz|L6K7D60g^T-8lJg#y_+AG()`*QD^R!cpOxY7iLXH>Zls_hOj;GnnAs;L$9u
zaRbuj_dhXN_<^afP)`ndO!qW}o+exVj;Uj$zv1Tc32vVWmrHP`CoJ`Zxvp@$E4=rv
z{Dp%8tK5(97c5fP{T{ZAA#Omvi%lqOVetgT%V6phEDiQ6oM7cL#+QIm<(v8kP)i30
z><Rn@JOTg!9+QD19g|)V50j3T2$SQe9FyLS6@M$1P(={Ilb|T{zS&HZZ8w{+o7RKa
z2k|XD2_Ad^A4;5v9-M{w_<sA%Ec^NO{s91E*kkar+1y7@JQi|^CgD>q=X}6rk(Ww~
zN);x^iv)>V)F>R%WhPu8Gn7lW${nB1g?2dLWg6t73{<@%o=iq^d`ejx{msu;S`%=Y
z2!BRo(WJ^CT4hqAYqXBuA|4G-hEb5<nm_x%7<3+rm6dp{G%`3UY#OFkBpSm<E6NgW
zcqgjt(mBjyjkXO92Kx)K7NHg<4R7NG%Bl@52CZ{tRCU4Nuy^wlP(@g8J^SzaGX`F-
zKkI@Ioes2Nhe6|tz5pX=lC6u;@nM_#E*`l9QjfHG{080E-#`tv!21SJO9u$+FkAd2
z0RRAMlR*$20WOn(mKF|Ba&K^Da&&2Bb4F=wWs^{;7JrRYTUQ%Z6#h<0GjS4HN}-f0
zHVuj)Bt)pi2yN9;D%b!Ou$X$mlgUXkFqs+8OrR{at9|fCv=92&*FJ@|tYsg3^WERj
ze<AJ@E(rmbX06H0*_Ur$&bRlUf4}@4z$iS1Cl4MhWPXh0xv?hfLTo%{6l2Ml;Z$7H
z;=bwFseg)75G0qv65JD{EOReql!dY8RV!X>yvQw2Bx7zVRpD;RR2ccOu@PhR3faoc
zzJIZ5StRhvJT*c`VV6u>2x;0SlCBHsQ7n>YhA$6iQU$Rd`#A*0pf5UAX^2~<B^ct4
zETv157c7z9klb~JOy7|Xy?j%6%4V9|q?8&041XP~e4VE)ZkN*Y`Bh=~8iEXGOTu5=
z^n6iicrsj!XY1CclU6VjgS*G7Z(8YD?oKd7n)MoVhM?)~rqvc7yca<P?K;9Z#n9dG
zopdaVB2#Uih7N|1sJQ+nAu^naw+4xz6K8dtK^H?;L)FMr!#N6j)wE6jdOhsj2+pHd
zM}H44F!VHMIAgn2f6<qMS2Vn(qO}xQcYRw&A1*QkEQc2u&Nqyj{Oh)t5L03L8BQ9O
z<B15~Re}33K-i63r@2?AQZ&SM463ApYhrUz_^suVh{_#8Qh}xz+7GETq^VV=FC_OJ
z$#CwF@64W@07ftx#{0O;(0Np^;R=IBY=4~-_x%VyM0*%x$WXO538=;Us7(|h%yCR8
zyQ`Fe?@$Mbp{=&NQnI~{k9BDHgdyx5aB4V&8;97pYp&rY(b@C4^u1-%FB4DVM==$X
zZs9W>Q<!FW!>i`Ky%f6RGsoueIc_WKEcM!=sZzkijF|}LFs~GM=v-1aFc3dl?tifz
zSiqvXmL+l|5-?<rar~c9cd@L9@D;=9s!f}~ESfxTiTVIU<1PF@IuG~owVH=-7%nux
z7pk^zR>ahOL%3?PG<>&D{-(~{sG3$mZG!I^`lqCHWOSn}?5JWosiW?}R7Hz45Z6M;
z|I3ZkC#9f+gJwObwvJ7+lKPKs9)HS$N-3eNAWZc~d`TP=sY$X_md=Li)LwW?#|kR6
zy$<GczNvnPI6X;gmb#p!tvXk&<b_;P?tx1<Nd#3tViQ92F#JHL*9ejZ_$^Vx=_k;h
zqx;!5dUCn!7T(-OUv73NnM-UTTEjavytj?P-0dxp@$d_Lz%ZM9fsYs-V}G1Jt}*21
zYWTEsvWA(*JFipp-4U)~Ha8xq;fr5){z~))hDiD)DQd_qKi&Bw@f_bi%RWUYN$9V(
zv69;c&m~qmjV%;wSgm1gXbbi$O0tW%_!C_8B3ge((T|6edOrs0=ZE;E{$`LQJ%u*f
z!o+r*z$5x55|i`<+WrAhOA7}GT_*Z(_5%O__LC5kZhu>#RzQ>|l?27Kf`O2bZM(f5
zT<@B@D<m5EAbtj4XkugH3qOD#$~fD*)6yQc$<6G}|2Mlkv-|7!kDmaLflUIRE-&-B
z4`Pv)&X`&jm&H;=oD)l0tu8Cnlr=S3)5;9zb*3<CFbr0ykt|hN>C9-<3~{+a6@$%*
zbtze+^?#(ya}=}LbSblhT0Q6Rm4>3=gi)o*G!B_6$tq*ItV%e0&U6FU!uj0%!h9}S
zX6NEZ9}oimg4WPW?76Hk0#QwuQj$)~3QJw+v|eX=>YZgbHMJs34ZXEzFL($9Pw6>L
zDO8nGd&N^$GQH4GKq$+GsmsL%*AWQpwp1!JQ-AyUofV|o;~RKj0^!|%nF=P~ai{JL
zHLC<h+ouXunpw&g8Z`pm_j29J#63$Jz!fhv{p_t=V_L%`Kz0a>ol`|FQ<H7ACEC{&
zj2;o_UzJtaTqDpMiysIu0;7KL!cE-Di~Rc5?)J%kVLN~Fa_`l)55@)X!;Jyxg9!qI
zPJgNR{tO@77C^9qcLfMo-aP?^EKd|52qEs>7a$D7+<QP^$YAEymC}V`S8K;N<%0pP
zPY@WEuIjA<jKtz@#T+)=#G|opZTz4+wN=s19M<f3hxTt<1Q@i=yMQ9&8WCPU<d2;8
z`Hl906|t7FBi0~<k=GsV#hzh<Lq>PR6Mx&`hnhg>;JWrBjTd0T_>aUBJK||PoA}xw
zjpy>>3&$74TY?_p_n~D4+YZ_`VA~<vV)I)TTaPw~9^N$kZs2GEvl6t?#Npxb@pl*t
z-)cf6e5VPM+?(RwbSN5Z!i=X0(XYUNA&5cTP7sD3`~&nSW}7hU#OEMs$3tlO0%m=Q
zZxH!nhvy;XhDRLyp({S=;AwY!(!n#X_@aX^x#Noto^{2i9Q=_xKIPy!SA5#RAG_nz
z4!#U4F8Iu6JG=@{y6^~g$HCX&sS6%;@Mo~@hTDzBdx_s3==}pwO9u#2%D71HlU|ls
zfBSb6MHK#qJ`zHBG%at?7=^ZJ((sU43aGSzR{EkTV2Xg-WRfo3?8e<qTR`xwp!j}*
z_(VYz6%@7=M1Jrbe(;a-cxN|hk~Z~lPEPL5%>C};yEAv@pMP)u1z-biGn_klvcL6s
zU`UFOa5WKV3&fLwP#~_QGqNI?vZjX9e_Ddmyv`La8Jre}B_kXk=J63Dn>GS%Nl7ty
zD3D2o(^4iZ3mZc%E$ibOHj%F0n#U)zib4~{uoPZTL$0P|m2+KIQ#3oub%T7-d~5T@
z=GJh6j|NV-!5BPIEvv`*E?MCW0ZmUuQo58-cw|hMG8wK%_B(RtIFDydO?RP^e__!P
zX;g|RlA4P24jtif(}ij>mC-fQG-YluEa|d!vZky=`ljZ$Ff1r&IZhWinz9xVW74RO
zYid$XF*J6~9#4m@lhthw1!$|R%I2dC^$n%=%E!^TkD;QWai13pu*d@!Y6y9c-dw2l
zpbj-&crkx2s<6ZhH|C13WnOqNe@}d^VDJ{l;le5kl8?)VY1pm@y|@qed$1aQ;y}@)
zL?Jvc0$AuFD-SZv*SVC~K`>q0t1Aq34UJs|`lF_(@D?xDV66bu6ClOSK1t`Q>F~QK
z56Cm(MI(a3aT7ypQO-6;vTAZ&m6Uwuwr6=LD-tLFL<H?6QgI<nMUFeee`!h#>&h0P
zIO1GPDmNp0`#UM72-bPfjP(o)4PIiAp{Ai!ThwhM9u`&DL<uH}l-ubHx$y`?ZK~9Y
zSny)Aps5aR4D$p{4&z6OhlZIU&Kh(n^INe^Fi%^r)|ly%VR0GLB7w)TU4+s;ErCAC
z9Cl;J%ml=O7rUGUo|x&)e_8KztUg74i>*e7r45@}qS>??T@1^nnVwqpqQ|k{%dq*L
zC>flElRbiyesX2Z>T19VbuXQiV{#@+&4oMF+fTiOA{>-6PSIjcOoKFS6iq+l;13qz
z9r6xO;T=vS2R}50ccv2#o=Q|h+CAJH)AW%6InA}KX&=!}FH#s5e>yTlWkaW!*oqO6
z8SU{JV<t!_QE63Z0+nG{L6-MPiky&4KJAovp^Nih2SeZnMMKz%tS~-GIAd0vqfK7M
zaa6#Mk#?a3{aMwdXm*ardB$m0&ohKNw5*cwtD5N-jmDqrZvH|m_9t~M?XO>B)Hl0v
zvZTX1MRnmt>R(Ase@{zh`Mq(VYx=EF{=B@5S3GzLuQCMxe}@eW>)Mz!MD4@r)31AQ
z0&md9FQ^oyd75EqanI>gGg*_2aw+Y?TZJByZ%K~Lw>>z6cc`nDyCqzBkH{8`(LOG~
zi!9q#KEQ__ypNCak(H{r@CidzT+zgq{Y+dopW-YvxkPDIf8F?;VQslqQT}{=AzZ6F
zxnZyS=YB7*X}^!B6yLBv)PF1Vi?pQN^vOp4KT@~m?Cor>*}GrNCrA8Eop<;|;99Y}
zKl%=)R=@D=O1l<mwxD~5O4l#uk1-K%m+V$iUDqWqc}LRIe1*m{9bVw@ndqN42mODv
za#=>zz203Idf@c;Io*aod|N(Ldvd&;<#t}{mYn$t?;DCw($YAa`5v;U*>3p2K6PL7
zys(f}dR3lZQ!YEl$O}x4oh@DO@qatRvqM}Vm)_j>J-94ELt=Krd$CtZ8|QKA>}y<V
zzTppBSX9LW9le(3hd0j1KXjU0al*-Yd#gZg-i8a0vX>s5b|I0wKk~(gw@WTg-gz-E
z-n{phQ@gf~i|(7xw!Vj%cOG@#m!2tdzIT#XUxY_=#kr=;#50FJdPiKX<yKFcy1o8k
z*Vhme*INA+^^Z{*Ov~TJEWW~&aXfWTC*PM_oA}vtD>;<6g%q5bcD(S^wB;}3Jp@7<
zZ8SLqRYg^%-#s)lqC8l`qOsgr%x+u3JE@b!<sSKRnb(=jHhwv9Qt@|Sucb<K)Afya
z%I_TtFMr7U>)d9qQ{Pr~%n=KFw@&Ec@m*Rq_0JbiJ-FiiY_(H~OychZCO!23^?kxr
zsb6t9-n)(!fBU=h#GNC%a*MbEeJ^QR$1+>KO}iv^@kf((?fv)jjy!#k$T;iB`fx9s
zvzxcKJl2e6tM1)!{qv34mp6vCtlhS;y6DDUlXXfveK%ZiQ8{u;>;0mt%BNQ^#D=u4
zTW8m<Wj41rPiECJU$+b^Nu{k<Mff%c&u{Mf55E3|p<Ve|=wyMpD_NNivD{ahyl-x@
zOis!=-#lQibu+MarN#g}sRRyO1tvQ#l$l&3AUb)&QUMwGZSBBY7K~980`FRIT&O(R
zPgokP5OEPT1A`5U!mFZSh3fN7SRq$=Cd?OQDw6~Y&YEv31HOR~=$7d~D^PVFQvfUC
zTVNuCxW|rx!4}2%Hf5k9&B-T~<w5R{MqHc5z+i!*@Y3Xq3qqu0K$mC%ZF2_t9MwaQ
zCp#?kmjPeY1niui1FA7X(I2f1cFnnkS~AEt>e!<wD%1rlGGAmagSeamJ&dCbfQpoW
zx9{+SoXiS2dj7&9QRYljhRFg}iogpjz%sJ%Bh!Hn(m}C@$qJ;>45Xh8a%S}8iHk*;
zc34jqTp|rTRNYt_aaJ*KIuAv!@??P}v9jPJZ-M46271&EMPA8~VY0rX2RK?0r?4_G
z=%c8Lbe^oZLUeMavnp62{G3T(ETUTH>k3u~IlNU5tQh%hJ`)sE-+Mq6Yk?H9f)CP}
zY_Lp}$-xIK5$7WgHUV@9%T1u`HvwI*i(<mRP_RPjFlDep#GV4+aXcsrts}q+C6*h=
z_<@!gaWgRd2W~!4LQ!-u7pO>Pa>H^(8RR7~s8;^31S^uMk^xyMjTmQSU{F9Y?c8LA
z6*jEkA*0EOD@2*(y1`E9U7;!i9~1$43N=S==mjf!yh29?-XUURV9-M`*{~m^2y+-k
vO&Z*)1cp)oP!FoJdnQj@>B$Ny9`3IcWx78NY!UY=EiM6G;6aIVL4^VU&1=uc

delta 34727
zcmXV%Ra6`cvxO5Z$lx}3aCi6M?oM!bCpZ&qa2?#;f(LgPoZ#+m!6j&boByo)(og-+
zYgN^*s&7}fEx`25!_*O>gBqKvn~dOCN!``g&ecy%t0`n>G*p<qResKK@r<&JI$;io
zL^$urU2VfYs_rt;3BbZ`P5liB>;ir0B{<{sUU9M>#WqH4lTN!~PgB@D;`rIdQ#hRw
z?T|`wO^O=zovKDMVjuZHAeratT0Q-HK<<x`D52Q}fPq1FSv00k0PD?K4^u2TMU^C1
z6_c`U_;HiQfYbD+RVjZCAZilbAS%cS)_gj{x+KlJ43*>95;BTTtc%A5Bo>Z{jfiz&
z$W5u4#(O_eLYQDY_i&xqzVd#y&cR>MOQU@-w1GN((w{b+PM;=Y3ndBGVv|>|_=ZIC
zB^E2+XVovHYl%!I#}4)Pma4)hM2Ly6E;&R5LmOnMf-Qz43>#K*j*LSWoYxxIR5Csm
zuHXA8{`YgmqApC|BgY0wGwj-im6rmS^jrAbN8^PEIHj1WH#AVVuUA2HXj&Vm*QD^#
zWX8+sR14XM!@6HrfzFpcC$ZXlhjA{<j&htWjfGaev85i~biz8$-l_SWti*k=VribF
z$5tT2bV0Enm^KPu*O4UE>{oq5cs&VRBUX2VwX$fdjO~`3n~1})#Bxr5Vh%KwFov=k
zW;Jy5qsvC$lw>?*BsoPIo}YgJN>u)C^4Abbjx$NW@n5S8aN_T0BeAXWjz#dQ=3v*#
zRQrjH1%R&krxBrfITop};aQdE=ZRgLN%n%+^y5BOs|pO6lg|I3prX{gSgQuRK%177
zlE#t+nHbT~VS<a9G1I$ae1OvJ7z=E^h+;|2mra>O995imTaX&SCB&pgp`Izkg}-NV
zI%~Z42T+^_9-gw;yOI&!oZf=H(Cot~)w4^gX&q(zg`7ekm4un&?FuaJQKIrLF$<_%
zR;ok9K%L!NlTYgW8?uhX&TS?ojtu~oLm(`7iY<5Ci@V)7+gRHbb!o0OipVh)`vKW)
zp9OVL<C-BR?~l0D$2r@5wc^8dKH<f~i)VbZ+#t*yr<}(oN?zPwm_#j1V22A2$Kr<X
zYl&iBHi{0I+N)&Q!q;(=__W$KIP4&WKsv5BBnt{-+hGdmZuu@?P|<>DkaP@Sn!ZRa
zpfwY36ct~JlEsS7_Dr%e0UL8^zRSsSv3K)+n<BApL8n3{ZtWdD3Uh8n5NP%`im!;%
zvwJZV-qR!cv0f7?dKiWvD#pw>$b@Xq9*^-p|AFj(*#}L-%5Z}D@Zl%y2gokn7l;Zr
z3CK}pP8BDR1$L~R{R^BwKH~@v9m;O_$00a5MMXTe!u0FG^=2=_f-XZR!DQeQ`5S_$
zO>mOUF8Y-Wfl3P|Mk-VDsBp`X&=kMQl<>nt9$C)^A<4v@xtW>qn@`Z)`|gCedb?$A
z^S(N0{?3!oy|^tx0p&<-D62OWo$gVhEodpMi;O#DM7P>i6bnTf$_=~8)<qRwr%lSg
z$YHAWlx%GOEW%$Xz?+5@;UP>PdQ+^h30pu>DfM=<dt<iZF%Wd^iWnodg_bpjHzj1u
zmR{hdP_rAyD&KsW!qfkGd$vNg6yHEfe4=W}te}}N@=8`h6e_MFzveJ3ghz-#0OGhO
z2<<C3kev<|JesXy2Z-Dk<BOW6PdtF}zX6|br%(j-jz@k^vt<ur%-RA>LQT20!&5)=
zGdR6}f=YHb45NFG9?dd44$Dm~B6k3w1%E%atidmZ`Kaw4q&8yb+5=wq<W&~!+gPDq
zH&}X5xRB%0YU^5G1!2~PjahmU5TsT52sk#OntOj}+d}$g><d0I3g%un8;N|V-#s03
zL=Yds%rWlp;Jp7k+phk%ZddABAJ5B$H+C)E3U~=KZNgUEx@Q3V&TOx;%#Qj6k28J2
zl?>e`pXWH0J%);cCo710p3&(EMuAI{aKjT^Z!u)Eq~b?HpnrSE9ftF4Ibs#HFpuPR
zyT$g5JIX12nSw?q!}IY^iHMikUh8V)gjx{JN@8Am6<$2Mz<aZI@TsvrH%cQ~(nRC$
zt=<W=isgz-M(s$~7{A*s_J_lmA`Or4_qGjHDc$H5J^#x&i^8tY`jAOnXOJo|5bblA
zesZ*TPfQe`IR#0B_!rSOGv+iOH33cL&x<-OU%gc{E@==rGVuPBO`#c;QFq2;QH=8v
zfmp)LAhZ3_k<g`I?t|Or+vC#-%6GMO6YoENpK{JLnnwOmo2JbpX&Gy3R9@(6LHE0N
zmNO5M;dW}+;2+?awOh+ha6tvEKHTFPw0LbNk;(eZ_IR~+(%TX^!&Avo1iS4kTldl2
zb5y-QTpX$Lmo1@q{oH391>^mHY*_n$LNj)%w6Vs2|Kwpq;J=(VFf`y)>|;A@J@8mL
zpw=k%oRd`%OdUL*1^Bd27^<|sYM9NqMxOfyc56FSDcG3u;oJKCAOsBvw)JlyBt5jT
zQZ;fkKI1}9MJMtnCEG?ZUph^R-lV{%Av1S91fH#pacM-EI@93$Z)d@UUxu6ru<qGB
z_;~0&UR8Oa{oB7NyMN8mw2Ys0k`?o`5D-Kq&&v+96RRq&qE+`BQh9I=c$Hd<MA+uV
zklt|&6gDTid^fGt*aD4b`C<u}9wU(~`9l@Awv8-Pb=;BBc3cF}b`d3(N-dFwftlm|
z)<9j>JMHVl=>YjT8reRi0SjW8t!4qJkSw2EWvi_K<HH&CnqIxcy15Aova;!CRXl58
zyy6+c3u+GkK;74O=vJXHuNNekO8tCZj4))mQaq8gkjN(B6cqYLX<YXEq{_`!GsLOQ
z3Tdt9Sr<PRCyvA8%@6^}8u(1eAIV*~r09l$(m{bIdN3Hi#@5{T=w)nm;yoKt$F~sR
zAANP{yoHRK8jQ4W5wj;GafxTtpU*lrvOTLTJv9Ns@lM+DyaTMb+%+?*jJ&8&=cclU
zF#?$9xUNoOKnVM7nOZm(hDKcQ(l&u|cdMp3hJAcRASIK3&r@z+fe5Q-82Q2k|M)ly
zJ6yjlibszENFezsy#9>%!>35@JDfw9#W$~G@9?4ubk&}M9<~>f3`r6~|Hun&D&#w^
zZ2xrK!I3O(3uNXz*JhWWdgESs3jPCOS_W_J;0ggAduavgNUuLi`PfS*0$=1$q$C-#
z>ca0l=Pm+p<gz_t)P>9&+rJQNFKvb%8vn0!qW9SGnIO&tjv!kv980`FquGKa<w&Y3
z)5JndS%D2(z4?UCnUa#lf?@)Y<?jk5r%Gk{?UmJ)$`Qyct&^>n<v;1NIQN1TQ(gIr
z0&hZ$g`Yp&{X$Q77aCUC4fxRx0XqS%6?FatTy|Z$=XEUb_WV6U`H*$Z3igU4SzEey
zu~AhbJ1oVsLkE?FizlkCjvabPczTY<STV;!)(;VMNR-2&mDoz?w|Azrd7k3u5|ukw
zvUF*YRtpB2_#%(n&DE>hc(YAwQTGx)(9c1fRnojjxST~<*=y|?<R^$NB<<1rj@4iF
z*9r;AkVvXOnj_Lwcjg>=9V1w`t~7Ag$5h)P#FwB7FM=E`e^youj?Nh^d}|GOC7mPW
z_H&16WtD5M9H)i@@=Vzo^f`%yIQZ-qGuCko?CP8h^B$X|UkaKazJe>9C00F82u$Iz
zFOjPU5)>;*KBg9UezT$OL$aW(Ogut^COwjSO2!@-ZbW#lHVfb_k?7DlEGcbl^tn{p
z#+go${sx^TPB3R527<rLT^t4ypz0EbhEfBf83w3L2_&>2wadT(x2lACj6Y4~LktAm
z<+#pEqlksdo%9?Q29%rP9C+LM*WZM-N-e*wX85OOu}J7Zrt%9iGjxN358Fy5GGaNA
zlr-b*b{4zqiK)A~_jjEnJhRaVOdID52{6I%oS^X6)EYS(>ZE6NKd-S?F}lIJNYkBz
zX=;apb)xyAi#nMFCj#Ex($CGiR?oF|gei))16?8E-mB*}o2=$UtMDZxq+&Q?liP(n
z&Ni8pBpgnCai7%!7$wG2n4{^JeW)f-h&_$4648~!d7<~p8apf5f~7e0n$lV_qbrLM
zH6T|df(D0@=>WA5f5yN)2BIZFqObOK5I*vhD*2~PZSt*83>fM))aLjXIEokDF;KGw
zZ_75?2$lhYW)I_!@r8QpYKr4p27lOeG~ESg#8)LE@pH;oozO*hv19;A7iT#2eow_h
z8?gZtDstc~s|f{hFXH|~d~zQ~z_94FB&hp$n~Uv_DB!2y<6&VqZs>-fmUU^yuJGdJ
zNCHP?2Q+FZr?J{^_M3`92rOWnrL2vymWZ&0dYxz>Kv&GXWgwxTKz)<+J43r&!q}II
z1DmfLl8nu-xGa?TgsrX45d}j{QAC!m8iO1JU=|Pb8D@9FE-V0hJEA?F)srec5$GqD
z8(`^KQozt$N;6ts8^+R_uiy|d8MO=#Jvd3z_#2aHXjF94XkEdq3myI_UvT|r>1&LP
zU*Mm7Fk}T$qbutLyH`@m{L57Mlkq!hAMe>2-o(8*axogLh^<?#hC=75g{W^TZF9hV
z)61H>b!!{|amH_{Hrdu!4kWol?jSB%l2>w;Jry$!mf_nbz9_B1#8bWJwL@w!No42F
zZ!YAr(^WO;wuxHb`%ZD(qK<WK!*MHJ{VL#P>IOW&)L%j)eAUf-WERo1D?D~FV`np(
z5x$@RPj8}2Rbm<>mRjfuPFJ`nN>>ltyp;oE9#K9I<eE2c_+cEmZ|}we15^eVMOca8
zOs^Kja&5G(Y3;%jv35=F>U>+pE$;Cq!IYr!NXvc_-MDFXBXW=Z9LZM(k9}OKqEKn5
zMk4%l_POO{UM$2M+YvQV#N~$?Ycqe>LbTz9ur0(-Wp!^8a^GDh7h{U~8h980RG|9E
z6RPnEU0ccY1fEIdJfnZ?3Nl4X0Ag>*m6>|oajhbexf9~a8(K`2Ys~o)z{jnuOj93V
zg4L4K@x2Dewt5Bok=03M@JIhBSWy2hwxcxRv7ukj`8uYPGrMdH0q!`qHJ^xDQ_bLG
ze*?ZCvMv^t`JI7rlqLPEo^WJ0b^>d@C~mI!Zv)-ljBg#u;uvw%ZXMqZsz8Mxdtvbh
zbK^eGn90ynsgjzKUOl)<k<4#6R3(K)zV)*K=J(8UhjW~IcI&*cr!{O+WX^o)<#_cE
zh=i3FDhL9yPcRn>O`l3#-uY%L?tj;+Edgz+awV<usc|DqwYd;zT>132>9Z-?mj*}u
ziM4~P{Pc$s;}v&zYF)Te5J7W2!$o`EH|~F3NfA2NjF&~?@K5S*f_mv2@wT};{Sj`b
z%#^~iJN17>qQ6aej~{ubsrhkBAD`C(j7{y)+hU@!^SU03F0Vu6vU3+>!lN@MLR}42
zLOtG<ZE~qfBnNcb9}T(GJ(fs6FH=m$D;xX`+6FOfP9@%6jy^qSFzILN>S+@f@~=id
z8&aK=-2+Pz*y)te)kF3xgyS?qgp@L;G(tM1&#!4p&Z$yX2<+lj>VWT1tiO4`_h^}*
zQ@WGd`H9t~sH>+NT2d{O5(~BeYjG#5=s&k0J)iACkpC8u;rFz@_E-w@s0bAs_;b>+
zeR6?5n@}4wjy}GSL@%#%!-~chg|$Q=CE38#Hj0u5P4^Y-V?j(=38#%L#%l4={T(Rq
z=x*H|^!EG)+e-leqrbec5?(g)@Op(cHsVg4*>F$Xb=B<Mj9i!OJf(gHeKzQm5F_*Q
z2HB(w_OGM*8I@Oiv=T*SE;gaYd!f==Mcj8;{^*ii&1a9eyfa86-a+HVGmC5_p_km2
z&Fb`{K%~ciBDz($MTKJdt-cTgB?=B6U^IkW4f<S$(a+jRT*h%d=RAL(b|1Oga!1}}
ze=0z<%Hubc9hq=4crNO7k`lr~1{2r~gN8`cxhTdH{$L|R-ENncLqfw5f8c<&5|!`1
z@6-eme({Mm)dlHqs;hn1{~pYa%fEjM?BkP|*>heCE*5LdSmdwZ-MSJs@@i{5t){y;
zxAVyon;`>Rns;YH^`c&M3QdxzNaJl(Byct8a9v38fkXaJ_<=8oe=(6%mZ}CJAQ}2r
z#oHZ)q;H0pGydy~@02e)oeVW*rQaD_OLr+)29*|p(gAHd<9*JxBnu0W61lNr+cO_=
zX$B`VmPwyz9?FV9j3-@v0D<tzqo)8jV6Wb<=%`8RDyhXV2!7Q+Y?1{kDTLBUSm61w
z=&ovZ4Tl3rA*k<@^91HxsHF?kmG)PfHk6m*q>7Z1Z}O;#KZ!@Gm7ZeKORcLQsPN8=
zAZRd8VWqow?b1Kp8!AiYk8acC$>6xHuUZWkNk~?EqKsUr2$iixV=zYwM9laPwn)(W
z7b-$PlwKh6n5^&Rs$#s&98P1ch#7FGNN6yU!Nwzcesp2Ylw~C1F@G^YA!PF|a$MJ+
z{<m@v(4|q^LvrVi0ydAjvRhtXkA_)46s4O#`ulfgzLw*)cGDV2<f#8~<gWfLWxdtV
z=8S7NK~EU$LhsNgEH*@PVf!36{m_}TSD~@Ceh-q=-{9pAzqHrRCr5_tNt?#Ba`+we
z7&bV<bduD>!r?468ju$sWQLL=o~SYP|CBJ7(3`;c^t;TL4ScL$Pvv>N+5iugRLdmL
zaD(CzY&3J+N)7MS)Jw`U8u*IevtEAUKN4~AiL82B$4Bl5oK#No3jGEW-o4`>c%G#8
z!h<$iX*efTk1lnM-d*7Db6h_94Y@IcQg@UJ1-g76_d9@vHWB%F55WG&!4DAy{K)Xv
zz~7iiiq(J#G*Jdb2F>RKFnc3y>bIwlQ_Jhzoc4h(EOVm|0C}@X1v`lf-*wuaH5_<D
zN!M1D+wH-t4<u?HMdA879=B2t@_)6cuR)c##-iwU+RjbSxOW`u*x}v#{I;pYJI|!J
z+GvJ1%z_X|5*f2zt|&=J6fNdmL0&-<j98xr7=t(FYmOev8S+Ni<Uqm~jwowjXVyxN
zJWetFubZ*wUAI8SJim^*rlhaN#<~-n9)=1k$Qs1zhTW{i3iN2?*g@bOqF7eze2__U
z!6wdI=Y()&19xI)>H)kg%$_&tAkc`-Mk_04t+f0A_7=y20O8`7#X)4WDMOUpG*Z~n
ziH5Zevf@*c28LS>z60h(QH92FxJHOKTj&>ep>z##ag+Tm*{QU<#Sk`f3)1y<#hgNV
zkGRx3`qggo)?FK!Vd`6U+lA@MVk3QlsjDj#M*^!8JsEqK;p+%l%NyiKg#EX^3GBuk
zlh2;u`5~mtZgY!005*{*dmF!OsrxVg*Rpvf{ieqF1ZPV6Mm4vb&^x06M8jn4XO#a*
zXJhi$qNRT@M;;!sLq`lbqmcnAsSvSakQ{XcfmP-CU5_ini_P>t3m1P+(5I3tq028F
zE8xAnu-M!FQ{&(q8oC{RXMCqw5&ri5tvt$=P|_J!<S}+D%O^Ku3l#VU^Bs2C?CSjD
z!u@>+#m6Iz;U2BaX7}7%E%i{`jgjM^OfP1@K6wN+iSJ-2z7%MfLBS2$+zC|(5j4tu
zq@N1d5n}UyXF>Bz{_%qT2O=&{@hkb|g++>5oZPMe%j~Ee^;OCr)Y7u{V4m&Qf@%WD
zEUKEu%teX>pmF5DMIP1<d`_a^o0v`h;r&H9&46g$nZ<4Cc58UVE!wl3&1UK``%}^n
zs#Zj6;EKRJa6T>!>pm1D);32{D-N5>U4W*9kTO|z(Tb#n-@+j!vWj-S8aRy<(xvQm
zwZ-#hyB%RQf|G(r&oI7iZhf^pG13lCEWA>mk}rI8IFlm%*!~#7;2xQps>NS2$f@g2
z1EoM!1ML(HjM)=bp<T>>Z>u=jEM5{Ir>yFJ{m8hLv-$1jxB4a{4HNUhk+Rj5-H8}G
za~r&Uoh}bQzyC)f6#o<NF@`zA;2YupMb7i9uP9`V&Ic5MjvIrX^e7n`5tNM2*&(=r
zcBW(162N{VdWZg4iIgmf4f-xR=H0@4UBnIfwaM>3mEkwFNhaD8_~{CW03Dv2Tbl4{
zAFamTS$i&ZYWmae1aCxVNIKrj+u4g3%D96}iqw8~HBu+gFA&*oRP5Z`MikjjDgYjq
zkf0&#_Xj->@bJ><aI-$0*PLQuc(&H(7C*+_g{jVZA)X`Q&U_8!UE*2H1T*_S|F5$J
ziXJm4bSBrBu)!Q~5f3`*a53rdG{a8qb$3a~`~72V%$H!fi5J(xEU8S>!}JGl=t1|~
zGIx9!u63fRtm^?=^0z=^H2SZA43p1deVixbphteFyrqycaRq6DLy2$x4nxgB;-Dug
zzoN<>vK7~UxLPDR{wE0ps6mN9MKC>dWM{~@#F)ne0*ExL**#VrA^|@km1xCtF`2N(
ze{G#meS3J5(rIs2)mwi>518)j5=wQ+Q`|O{br)MyktYd}-u+5QYQmrBU2ckYE7#Z$
z>MgHjknqi-2`)(Z+pJ?ah4UMg*D%PFgHFMnKg?{GSZZ*f<zs(2P3*mv05gRY3f;VZ
zH42XQlv-7u`8^6-{<L4wfN(KAOlA`&j>3V+g@129FH@79v%&$&v32_So*G$-3SIp6
zYTlLgF2}s>)U;QtdWf5P&xikI0p1eg2{G!w0+xXNuYf%n#X#fou<STp^-T+QP2D;y
z#0HJCu2=Qt=mvDi;%fD~{f1VD-v}qDs5zM<j>8}EYvAw$zmrjK&OZkS!$REMr$*aG
zyPPjsYd_SXp#Vt9NGI*R;-*4~Gz)&7!zq>hh7)i?8PzCAAv(pNcUGlPNf^OXS<esa
zQ<{y$w(c0U3<hbHk+iWpcl7(__cRea6BTne)!t6TB`3@3uN(fv!bJ+R35}v#lY*!+
zk1c8QYTG+S7#;<}0Yk(kycEC7h*N}A@+9IDkjme|(09U;3>$=bx(V#ji2eMF6q{U@
z9?ldp%YEsl;)d%}_Qs81OX>!2>kyChh!-n0Xd@2C1cI2qkRk&b4)(?@KY|?%qMoYb
zEi7l}n$O`v+T31;YZF(;FEwj`I8Dz*9fbKrE)8#&?joolVY~3YbZuJwfRt4-kCOM;
zcm34HXKH>;a?joGLqjIBG|B??@rS`LSU(l!vxSyfKmGa^x5&S$gvrsrlVT0@Yw#bP
z-3#zdbm1;n!DpT@>An<WN40~YDd1&uYv4oW6ka&<3Nv$70Zrxf1F9twp8ktp!suvZ
z*~bqbCL!B&B#>xkZ4llVa;h^fj?R3uN5?-F)SLb}a%TBE=HM5_U*{K=ddu;L7kJ##
zqyyGh;WY5rpvMm)$*xZHv!CUlc{zU8huQp`KmQT*yq*ugOu_#Kt-kRa+ODx`Va(;{
zLMO*lsSV`U%+u>-R9GmwqgWulP#>jO9|<YJVqD#QVLRDLG-z!-T2if+A3S9b{=p~d
zxzlZ!Q)Zwi(&xM+98Wxh#%rY|zug*yF^fukbAdvj#(a~ea9h$~8XfTJ&I^>V60TBE
z5ONjntHY2V_MmDJHr3CyuL<p*g6$AjWNnQJ&GscZgWq{EsV*%hds#Fmjpj-MxRdN0
zZL_c!Q+Qg?fwTm$8pYCpSOx+B*c8L=DW&*Nac!hO;^^n?bIb_te*RJ-?TF3$oJQIn
zL?mj4(e_Rth;5+g9~eTO;g`BKJsr+SP@K4sAm)s&4xG>5X%IlQKbDRch~>EBrwAM?
zvOJj&z#NzlWa*K*VEZgjP#cAQ-H<t~$O4)Xv+Dn@4zkOQ2m>R<SeNg{mcBHu?zxw`
z?TABihSI^x%xa8DdC74=aJ<5j`4VSZ$vzpQ6Ar6wdVdb-`j8>G&mC)aqyjY19GP$U
zSKm`d_gXzrLE_^a!9R<~vT9n;>{y3F`!rB%M5psN(yv*%*}F{akxIj9`XBf6jg8a|
z^a*Bnpt%;w7P)rXQ8ZkhEt)_RlV=QxL5Ub(IPe9H%T>p<I%Pv9HSt_N&~dQFyc2i4
z*{q@;(<#tCjMnuB^SURG&^7w&cO1q$8&mh6L5WAG>hrx_UNUT(Tx_Ku09G2}!K($6
zk&bmp@^oUdf8qZpAqrEe`R@M|WEk$lzm$X=&;cRF7^D#Nd;~}a8z$(h7q%A88yb=#
zVd1n3r|vPZuhe!9QR*ZtnjELX5i*NoXH%d1E1O1wmebT~HX0F~DbFxk=J^<<mSMS&
zX~x>v|BCiebRdAHYXxOo$YS#BHYecz?S6CX@AcF_k;#_IF+JIV*5|%lV=Y;Ql?=b^
zt}1qN)~qaKnz~KZRf9Aa7U5S&Opz~;SF2ojOSD3HP8WYTbvlEyYK~);#wr+UO8_Sl
z$-Yx3B~JYU!uChjzf0v1TKYAtsRkH`QZeF8Q$_`7iPJ79{8V(jbX4T=-LF59vw>au
zY6LS|t<r<VnsVIQ&s;WeY$v#8^*ZzqQbiPVrQ7z9WyBJ8wn2s>!~Zz>*ops1&9o5w
z3lQx<X86->+lhgdg^4d0r-%q!s(A$J%XYhUx~)v|ptx_cU#?44pnz*s$G%3=wh_01
z5l7f$uM;P6oqhM8F|$4h0me5--syUE%vI)HuhLv@kL`s1eP@buw&}80Umf5QOXBlP
zAY(8r9}paD1p*&Bir^3<@3Cc4Mr>EpoDHghr{U$hcD8$^OZ6bZS{UYhl_*Otp}Be}
z-P^9U7tc!@aodKCp{~TV6o}?M9xG$hN$Kr>|7e~E4mJK>_yjrqF@Kk1;fHw1PP`UI
z1Aoa$7yGRMrUVO0M9$rM;=Glzi>SO8!lqon9E_1^0b)CsR0%Nv-$st+be?a*qJkqI
zUNaqi*6Y^E>qlHH+*M=aj?)y2r>RGkG?X;Rv!7J<xSTYml}L_#*RR)+pg$b0oA9un
zo)O8yUD1vrV;CN61c<>G6Uz=^g7B`jEKEvgUq)s3Fw|zFMdak((XwlUaSRN4hGMrH
zn2xFaLH!t8txnTiQW;qUWd^m#<3zgCp(=5~i~xw9lU{R~o1qSo#Sh1_4W5(^hL%O9
zOauMH!uGL}u?hV!4V~#<c9qg6F0qxzvx=3D6+G|k8;iL8S`0fe=c@jIF2QN;HVN+L
zB8pb93U$en7x_kB_Ei6fSwz7l$cl<Rkbl7k#84KK1w(3TGvO>?F-<;)X<)4B$u1F4
zf=%}>{b#f`$<Mqx@^7UjaX9O&DqaNU1sV|xyPH70-`g8GQqh_7t~PKl{WGSV!-nI&
z5x^WkB^}j8!}L|E{Bv;`{kkp1KK|NWSTnA_T(FrcNt?CCIH{5Ynx)Hvva<Yi|Murs
zP_)yQ4x5DOv^6;`UMC`h%}P860Guy{0ER~1pYzMGp=j(@7ArOh^!a{EpW}TPYiA_l
z<{x`F9%Bk{k|nUza{FT^$G4~6>Ixo^Du_42V6Wir?Muh`(!izQSV9Y3d-MCQT|9bs
zIlCtJP7*;A%^1-=u(Laj97hG}uP6Hq0+DzAjB^|$CG(?e_adMTiO&^_9WwrW4H!ju
zWEYrjLw<{fSyh-yiPOP{O;c|453fxkp`E;k&)d^wYK=ipbD_kG$u*Ro!kQJOppV5*
zP4o#ab%r@RITbag_zHMKF5$z8fJd1L+D8G@m^`*H-><XW&!E2O*7MC?!{pUUn%wZ0
zrjdgM1OEvuEnjXiuI=?DUs_SGdd|2DO>XyF$E{x;d;A+T`A<t@;F&eq=W$ZFxBrBV
zBqrme_MfPkBmOrU8Dn5WSOqX4W!$tNzYlZR%Zn7##ZrayUxXE{zRlXwa=Kd0!jDsr
zf4YL-hi@HhvV*m%F!0&Af$zMNs(PRNhy^LRr+D8I-2$y{wRi=-oDS!GRD@c1-#lJ#
z?Cb1gSDw2npihN2`Sal|o|%oZY5h|#@0msZK@umog@e0;xZgufBsJ%42ZcnS+^HX>
z<K{c+<VKnbt`hUxZEbqOyb`*!E5D}Flprt{afEqT7(YyOvjxFg`Ntw&2EV1Q_xFEU
zaMawsUM+q6XCRuVk;HDXDNbTE<cJq;m$#2%XWCL-l*f(#(dy9EWEPhCL-j}ycUk#j
z*RNSEZpPU%&aEO&24(M{T6EO`ky;APr0hsmA~5-ZGg>R!1#O!ed)ai|TF054f1+K6
zTDH=fps}vL7=Yl3_R)o948I{CP*`f1v{E~-xX#PaLvb?#qQRElOF-pVuL>d8_&#0{
zSCu|?z-R)71@L#eM!y^Z6p;ZjzlW@gZzHJC3~O?Pk5QEa0q(aFy!-~pFZ%vBM{a0B
zOf<zFDgb$X4e$}V7x#N5F5SD(a{p`WV{ovV0bb4!FgRyRA>AZFmYc{!vg!PSF@l2U
zJK`=N@CTmAO4Wuqv6k{SNl?~rs-CcW0VFIdAj^B2Wacs>M@<wo1?4aI64ViehhHsW
zAUj6yS4-rN8cL+-MvV%PA|utXAn$REhv6+@4T|`dxoS7l8mV#f-CDCLyJAa}1^-df
z5SQ};kJ4CC##-gVCyL0NH*1Fyhjam2n$5I&nr5_a>3N&63=c06V6Rf2sR|QLucLaU
zKEq5=F9zA=+3ZT|OlY$lIrFmvTV4H!iv+MxhtKJ%j}wlD3qAoT@g^}Cw`#0dsQnXX
zETbS9p{IGl{fkz7ld(7^$~HEkkh7pv3NYi8<1qwOw!a|xaQ$TntGU7;01Z4?b9D8N
zBh&aOYgatY!f;X<$(oO>v=8iOcEG%aUvS8Uu1du6!YK*G&VLOXlHRCKu=FF(IkNo_
z!128k!z=B?9(@872S5v{*=6WjNH3gAJAUYkC%^7Y;H4r>$kZZC%?&3E-qa#4n-YG$
z{5tlV`bCK=X~Idzr7&v8p)y!whKx;pP;V!X^4&igR1g*2j}8HyVC+>KqbPFthf}+i
z5*V2^NBvmwfWIU)3;IBGEwFtYFWVWUoB2RyvL7S*E#d%FT_ytxM895Q4V_PCQh+><
zlu~L{SuQcQ?il+AeFdE87H!P8>HgIJjkGW8@`{o5wNd6uVn=dNX5$aDi14$pTSR=`
z!YTmifM=Cy`Z=%xX-u&9>1bJBw3nKr0@mO&<l+TM{hJ>YfAp~^V^fzVJyvwMY(hM5
z=T^FaQL~&c{7f<wuV`~sK_KLh@eGlVHvH7HREDQ97dDe5T~F|au^qLp<0$Fl8^Zr4
zq*D&BSb={+vh(RbAt4qJ03}SwL%-mJO#vNOfsT%zrxYk^?BL4i$B@tPym&b9eFt1^
zO2f)Y91tAIJ28J0d<we%4eEUKt?uq^582L>IT@FE@vI;GbS=Go0=v=3x<1AaB@b>U
z;-hwvu#U||CUj!>9G3YgO6yQX+H)L6*ozXXaV=U_b`_DQWq#`f$?cZ;??y9(AcTLq
zHrc9U_$w&NRKgWZ>e};_T#tf-g1TX#Ttj{JjKjCJqlf63U8$=~02ty9Nn<E<Cyz9x
z)R9Y|BUM1ApbuuO;Tr4`Qu4ujP})2wZf}V70WS*Y-F&%WLSp&!fP>3p2WX;CqqYS%
zz5QZEArIj!d6Y0VI^JFWKudu=NFUPF=6TxRR|reQB5_2vIn)qBV}S3;MX1}04E3Mt
z#5d$zK8z>OW^i7tXPB6e%UCqcK(le)>M}pUp6H17YHZ$`4urRAwERt6^`Bj>zwymc
z6H+f|4zhQjlg1Gy%93Sw`uMScxrA;vQE~ta!zM?jz@&c;IxYkrPHXB+h4)S0@SIgF
zdm{UTZqxJaxzBR!!`71;K*uco18U~X>AK&Pu-C&`R?B-Aj0=_$cxPzn{MlJK>ywJq
zsw-Yj{^>7%vDCYw^iw(od$~o-Pz6ks8aQ}A1JFWnE@Ez_SYh@cOMFVY`?D$Y&Z~a1
zd&GTzg|c6+o8_xSfEUIvTsdiN&WOe=n|xS;8X;CYLvf)|=u($Yt<h<O){z%>Ou_6J
z0tW_ukuKXj2f=f}eva;=T4k7`&zTqf{?>lGm&{Fe_;9R2b^^i}Krru0>ta|4^_A$H
z7DO?PFho!p<t1h0o<lp}=TX|0u{hgSUb6BokyqC>4A2C|$W~JYbWN&eW(4R;;Tmhz
zkr;EbZ4D?Birca@{afZpp_|p2YAInGJ`1Fkz7A$droV0#{h=lZdX+xO4B%I?B_3ac
z=7FC<vao7w{^76u(1+qZSECo$h1pU(P{5D6ty>kf`P*_R`SaCnBPG1Jd|Abx!brVL
zIt?Rv1@qnIGKpG7W-M54@Oi;BujL}Xdacfmc_9q?u&4#P2hPg`({??ZOOjRFnps_D
z-f(IqU)UUW`f&U}`A@568jBEz<~CX~Yv+1et@-+dsV3RVrNTx?H9ht?VAAS0D1{G?
zJbr4_B_Tqy_Ag;Xppzr)KXQ9QX}21eoMW|m_{|BBHJ*=OjhvNq(4HgLp`u-X3tw>X
z9A?^?H5zIU4r9K*QM+{?cdUL9B5b=rk!&F@Nffz-w_pG9&x+7;!Am0;Llsa02xfYC
z*PtggCwO@a;vLXCgarLHOaCqh;)QBGzd)|oeVtn=&wvyz)rOR3B)bLn=ZqpwZHq0G
z#6YvZtco3reVEzgsfMR6A16B&XJA|n?MuIu8bp_){SA_{zu;H?8<Hoj+YrcNwzl45
zynPmOqX0zDq;9dy5xgg6eBT{A6<^}^RZb#xBhd4Vxl3^&vJ8dSE<6UJ%3uCR2%e}^
zaNc1cB%&_=$n4q|jDW9LisI_Bwoe}~;3;AThsohJE5r{ZwVGt_I*nAasZTu{?Pc;S
z|0cWz<?<J}ZI1+zX?Z#X`5u#6ab0%#a0<qQE-pTvnHg>${rR&r^T3v9C(nb5F3yeC
zBCfU1>1a`bLUbS{A0x;?CCtvBD58$7u3>y2A_P<b?b$MBTdJ{GC)Nnl`LyKG_*Hop
z9lg0)0$>9vigNVLI2|Lin+b~C-EytjMOHW0NTui}pkxXdFdIJ$-J+Bm$%CN%mac~u
zc65u)RMsVt!-|8Ysv6BvqDBlFKElp~B6L!lpd@XpeV9f#ZPtB*A?b!2cQ>(0KpkD3
zcX2g{WebJL!6EmdE>s!+V>?WUff2Qb1G0)SgHlNwmhKjxqoM~UZ>S=G#3}dZqbOgm
zLQr$%IH~rG-VibZjQxA+wx_MOF@JC7m(z5WFp@?e-&dnA^W!f5(1q_mx7SHG&7Mjz
zJ*FkzBLiO~YXM}_WN$-^LB=)#9j0}Ig(60{oTJ7L{`hY&|LX}pO<rT+|G*9Gf8a()
zOc~@n$A%+pwZYN;A*6cm#eAnEr1ayEgf1qlgsiMYz837C8965n=QwPBWn+vN^1o5S
zo>&lXsa+ZJY)@FOggOhohsSKci~64T#~a*U>?#ib&8;moQD4mX2U+S(Fg|)$9R86W
zITbI3PGBmng{xAMx7@wkfPyHgTBnY--U-MN(8g4;hg*?%-H-2y9+fMsROmUruu~DJ
zD`y+zHt;&kEmb0pX<MKk9VeHzIKFG@)kXA-6x*e8YXX=EG&)H)LXrcR*35lg5K6?+
zlpgs)C!z03;6L3-C)<NlGDA`MyU(j}{a4Dl13elcAiBf<7wo7OVQ1_&dLFbxpf+fi
z{v;-ON6qh4_w!Buw@b&@)CVPDFK0(&dXB!y`%}`87whx<QMLyII#VOI#?|-f9<QBU
zacq><5f>5axt7b!mHhGZrk)cPJl8fFV}4Hof{DHc?nmlNe4OZlh%Hw~gDORC9fFH@
z(dp|iOIbEM2+*ogN5G5IIj5N6dcX2{rbl=|y=_lReUu(wdD=vfPY1!pN@X;H)!7M&
zsVSTH?G;8EjqWqJgt8F<T>#raa9{%Ig46>|d7k@)*edY9u$q-2MD_g(YtesUb(fF@
zeIca^`q$v%I*l@1*pSA^WwV15>IOc#+Fmv<?fsgpu^Kx3J`#R~YS8+9AP9ZC2%`%P
zF`-q_w(>`%pKtg3<1=cn#Ja|#i_eqW9ZRn2w?3Zu_&o>0hrKEWdq=wCF&fL1pI33H
z5NrC$5!#iQpC~<a0scbNdu?P(QtIkCpkta4+IX@92<1%sjPtvPX$(f7^k`k;viMi4
zGDq^Wq?|OP{&)nL5VfRRj=-&8b({DfVdIY(JXO;_3=;9;+@L34WjrTXgnv|ShZy8S
zn)kl2)cLW+)Ya5+mr<919TL0KfAOPW^5EX<RMpJV%&D(fMAM2ZnBGP<3uH4?fjs?c
z1#I@Di7*A!^O^Pp=+-ZD-_J$)-{;JUGncaOj2MXxP&0t~x_T)J2;t5M?rzKuubhi1
z)ctYdn(7!8I?JbTtc@Xp%l78@FUY4VmSsRQ39v>h3&=-FwKV0nX1y6cWqW7`fBi39
zRr%M}*B_mXH{5;YJwIOwK9T9bU^f*OUt#~R;<BY?Gvoe+h7<-uF3JcwFA)XBYN$ES
zY2&=H*#2I0SCA*7(@a<>VnR}qpl2)y`p76Dk90bpUnmP%jt$sr^*lRURZhg{Jc|t%
zzJ@`+8sVJPXQ1iJ<*|KHnVaNh6Bw9w7(H5d@A2z)pFDaQHfA+~;ft*Wl5TXgXt$X+
zw>HuHuNiPuH}l);i?tm23b}z`d*)Fc#9aSTR0**x64KPFxH=waD^aF`<3*U+;u(Jl
z%Vml|ibUgNPW@Mu(3F&xqqX`Ywa;f)vz@_@ai=KchFb+T#v=)>bVeCp(|;s8%<x{K
z1+gE;eojqo{p}lEKqy;wChO!^*h%eEOKb5YUw7d5u_fLZ(~;C~X6+BCg~O#75!y~9
z-H)#h{UBi#^5C<w*R5gX=!nQT%QnJx3?D~H1=W0oh5KXibBxVm4w0BtjT~PD?r%?u
zYNdoQ{j(EB_`3-l_lXRkO8QT>R{-yG(vI#MB|PpTf%;Q_dytxihYgUEEp*4UnBD2i
zFzwhlAsbs^rvyOn1@$Y4a#xL*#mfe*-%9pKM;rMxBrQ{x6g=Z)-ac6r2QHFaIB3Cb
z)MlIq>|a&HnWt;JF7aNioc_56#kOM7`*3HQOh2zj587o#jVvMmd0^Lq^}+G*kE4L@
zyr1bonUrLt{25*}164@vq<IF=>#vyAHWXa=#coq+BP`G?NvJ{D6iI(?WK_#=?Sghj
z1PAobWSn&T1J<yFJz2T@``FrALWxKS9H{AyqTRHIDHy0u)-h56#Q#pAJ^20|=V!Zy
zxH)>N2+aDKWLzLa-vkU}op+rSMu-^54o|YB$BNlXsc4)Pk+N;1Zjv_2G@*gdMul2v
zus9!wq9-nM_j*C2j*4}T#EOpQH+mG;>6M45k1Bv!l)vdjfmgsSe9%ze*37SC0>9_L
zi$J!Ziite+mT#sPW;8{9EdmpRcM_V2yctTOVr}V45Ya@X%iVpnLr%`<6JxcpQZJW7
z8cdPFktXB1WhRl~Hl4PUPw4E0+n*{!yDCO9mja<K?7YHVAt+PjQ}o$iu<=t6BZZ@X
zL>l(#n-Se<rS5Rx3d?iy%fA8sbcl((#*cETgJAzxMc?PB5$It*eAtKkZ<j%mlLLK9
zNX5wiy!(o$IyW0_Ft6SzhRM1;qG@^dxSdT?=E$Y=TMn5c&Od@|`=@}ubcU<{EP?2l
zYk2gWwiOjR?dYccWz(bx<I|s)Q{E4Ix+dNo-MI=qi^%KV<ir}|HqvU*_TaA-`aBQJ
zOLCe98mb1!UtLsG8-8_#s^JZx)M|sS8x<4RawF^))C>E6ATb`3BWpmcOoQt<y1p7$
zt?<Bia;U_>W0YC&i_4DFt9eMt#<$YtDl1dXA!$_EIQN?X#w1#3P}!YVg2_+D)GMjl
zY@_EZ_ZKP?D)_w?>J6RZnB*Q7Ruv~$QHEOp7abg-XyAe)|FAORoics58~_N@dE!<o
zjG+SJj1*ts?22N1%Pi=br&C5CP^%wzU~CPX{^~Yk3H~PBUL_t>`8kvn*VMyv=fg8F
zE;Y1gK-hU9#R`_&5n`$v&+@j=#2b-LIZsY&v=}NAOjfOB3*&2UItP}{OqgRpGh>_f
zh%mJf#U&@U;;T#cyP}$M2?X^}$+%Xb$hdUMG3A`>ty6>%4yuP<(Yi8VcxH+@{t9(T
zEf55zdju@GID-2&%(4Va<|Ra3khy_F5iqDnK(rPsYx`73WPueFWRJV)QFt_0MR4ew
z^AAwR<vg|=phzs5Z-rG4)#1-FHb)GV#IjdQ9|H@5yhjZC9oGs)C<v(m{yc1GdE_Pk
z$^aOMeW@%vNNsR2L{&5WOJ6IDZE(7S*?fuKG(m90?jP@YAC@Lx&mVnuYW{T)lk6W`
zAQ3MzQJLOX6%1(L8WkS8<?1*;{fg{lW+Www5FFAWaiI5{&n``aKBE$<1{P9LalEU_
z&sy}m<B_~{^w2ST0-@f;1xoM32LBK}ZVb_r`Lue%V(tkD7>M+u8@ln#u7JFYkT)O+
zi#|KR&In+^((C^Qz6W~{byGrm-eEQBwWk;Gru$Vq&<u>12PTBnehngdy#zSGdTlw|
zntnZVw0Zw8@x6+gX%7C`9GLL`vpHbla6TX+B7XSrfgEy0hYHbG<OluSa8hV+gjKL5
zkq~!3FU99p%AYRQ84(+ysZfaaY<OwNu=29X$e0i-A&tP#-&Ir4!l{ia<PqmZ#Vps?
zAB0sCQd7I`M%U~t-^yB1;vFS?nfrUQ=G^`7GTM9VPxr&}ExHK6M0k>enBTju?E1^#
zcPx@a{i?zW3ISa;V@%Kjgr2)Vx3UHv;v0j#v5i!do{bld!wDqWoiXLi;bP20NC_Q1
zWmLa5QI~_)A`d}#*aQ+SfANbQB7Qd!Nc<ekUktYt$*ga%z{jh}tUQnDlwKTt99w`|
zFk})FuepBq(fkVhrxEi&a30QDw}R*z+*&Yz)oD7fs!s33<p7$KX$q|wplSumKQL0t
zONh_xqAsDG9jPgZBT2}K#}BuO{Uw2i^H`3a7|7<hYwc6|DZ$NLg9K(oVc+M{cG?S(
z7cf1zy5K((FXmU?lG7)bRyd%6!jm+|+A1h<c`(qgHfruImOB9+D&=a*m=P9-Tue2W
zMi{ldbHBI$76Kt1;bq$2jCA0*k6;?{#MAYuu(XLUXxgJlxOyt}ppV!0M_bZa>l(>6
zheiX141UI3v(dtiSKg*zR;+|a*Uv_OU@_I@u$Sw%+tp%rqDxg~Va^*|OD%zXAYe6!
z!Osuw69pNHQ-?@qEDa7bt^Ga?Xa(5g6(KJGSSDy#r$D2V;~$a?q6O+}b4^#6wsf5E
zX_GK0Km%<HlfwbJjQ2byBr6UlrV9H<25o35`%b;mtW*Zdevw_qa>Z@vtZr~zNs08B
zzlMH4(M*)#G<G0OP%!AQRn;1Oc1IcLsxCFw)xHS%6phyx`y=4WH1g5T)aFezNxz>5
zynvFiw~srA#@cLNhHk`!r@!W}8-+5UBM7C2P^oZ%kc0uzbTp>FHRO=xYa=v)0aQul
z9UgNxrY#bF^%AFxsI;{sv#0ekRc8}5bc+e-tghcK-OU0FGl`O!q9lk-bQK3kz*s7?
zV*U~Q9=~-fem_OJizGL{$4*=a7|@ZKwLY%<s$>#p@2?FP3Q>15nTl#b(ZW{k6q`Nx
zOMo<A(ndW=sepF)&Fx+z(=sVRa8tkMI)Py2b8b<D9oGr<p&Oh{*&L^l2K9nuMBlto
zRP<kZ8~skowo&2+Tp8oY5PVg4v}6~-itMhAuk1?gp=P9zbX6|Uky}~sK;&wp*haXQ
z0Q@}*LJNr-`UOqaW2|ka6i^#yjJTb3Gup4S7537+)$?I7x2Cx!$1P7z{=l%SYop;D
z<n!%=Mb3qZ-i(D7r%y6rDsj$r8(o$zPrQX$lGiF)iupV}s^@3s`_O$SKRYakQu$Ai
zIZk9KIl4$M#$!AvN3%b?9M9%khI?VB{yW>npItf;aZ4(|66znCH7E27N)R9I&GsIJ
z*ClS8kTkcOvZ{S>Fv|`^GkxEX=rkW1(MQX6IyC;Za75_)p3!=|BF|6pLRs<RXy?`A
zJ|vFj&qbl1DrixxS0ure?@9dkJn9ehLi>YUq@}YIj4k#cwM<(2dKCeZZpd6cJ$fz6
zXU8ca+ou~;k@S379zHDD8S5)O*BT7~{)Dj3LCoshK9dt=*UEKo$P_!yxozT=ZtBkj
ze<b7Li1O745yhqcLl}bgBcZj8wCh%U<9;2whZkQjI3nT4N_YCEn6G9cOsxA$!ptH<
zk+sox?+76vCZ3qEp`^&^@0Ek%Yd8w^LmHh68T^C%JyIG*QQpkMADJslfqSI>v^`G~
zc4AoF3d|9i#^@>JywzuSvW7krJ{v(4IX&@ZU5})Jy)F_p647?_s=B2@mHHAWI5l=-
znNFit0x5-AIV}8zv2z;Y-K9Mc<V%@0y=flu%hYEOI|)T4RiUl#tILc_^N<|FA2LB|
z>GGqK{hU0@PjRaEJG*_X4Jo*Ua=DamQ8b7f09*Mazbhhn6LBj%&=C`Zw8uz@XoMbA
z<gok`sF1c-AN@`7K_+EI)pBe>%j)N=G34Q-&zQal!IQE=*PWyC%Nzbkc?SQz^J9l>
z3}_mkctbvtd6Vvr=Tx5dQ|k=lg-=zHk76OjP=g9IPH_%tWed^LXiY9Cazf??c$snr
zz!4}Hl4G4@_xpkYJf2FXoKOO9-6J)oiWYVXuSJAY&Q`aFnV)5L@nU~x9O9VuEbZmm
zRJHYpRyw?}bQVa47oYcRa)$0@{Whq+Eszd#|A;H146&zmxR5#?^3=Qdiij=KX-Bvd
zk&plq0|^#&B~AjImXrDvvJ40$v(^a!JSp>w3$@6tFc)7&spiek=YVmKkS2(%uo;S;
zqBCrWkh+zGsP=MQ_NEL>&43-zSnE7k>kbEB)jJWqRV5}k>J?*Rcn)jx=c`6*MZ~|i
z%~^le&(UQK^+n_>?xxUQts<>aPR-TgOJSE6Uvk5ZUkP+>VveCD#mghIG(nOynL#Rs
z2$vVgxk2{9-OsO=D`|Z%@x3w)&CjCgeKN0P_V|BE-c%IL`c-nXVk9#S-YNj3*P!-C
z^7XvFA|<DHf*{bQly~v+dl(xgtdsP(I)Vy@Ruo(`Z`-T!_;wcK`ispIQbWSL^D>Fc
zQxCIu-q?|)UMe%sa3wKx=4brU5@->gWRLT4CltHUIy;}a|KrUJ{a?72odi_$Jtv~g
zkQWC&u|Ui#HM<rmxV&N`x@`^bRq)id9+AKsYgupsL+M|J!d|>R{#IS~nXxMkhhGSf
zY@Od4)>#^qTHlZOA6ih(()g<+OnN3wb6{Q^(N3|JFQ>wk@<G{R8zrPWC?Z%rEfxR1
z-(mUSU16C7kOpU9O23WfX9q2z_S{jg5IF;}sJg+t|I*T8f5j_!{O^Vs2v-NNMEdZ7
z0qeh^o4^+z!d6BJQP;);#qLT-nFXtF7a+{(W9Ma_T%3P93AFsy0{-7`vMA=k(*J+G
zXA`p<!piABmF<4n=5@ICFlGF4eK@MOV{h-<UhHPtVg$_Bt@-Mp?wYR!WNo>M>uhX)
zr)h?8eW=WL#|vUm?PV9~lwWnXh-FzzJ%!x>#?s)dgZwur=+ie)NL%H#f~c%;e2_O?
ztRDfj%ldcOwjk(ny5_GYpz}QMZ&YY${hM|O2AyZWre5QzFI62O!>~tkqcDdtBY{-$
zuP(XeSh@3Xk*0o^Wa)qAsTKNxZe}ik_%<ITtF7MK*xRq{?$xp8JF{l*eA$@U<y5wE
zaZV;=kF5C>)PtKt<$f>wWvxMo*99^R)3&;*5cJd|r=q^}Qw~=ZGkr7Dg^@4b4T-b$
zv#R2Xe!$2km%(4C))AfZ2<vvzmz9G3HsrRveOZ%|Z;PX=dga06t?K>6hixuAF}-+f
zZwfDSoMo+1_8Bu$7xPtlaoSMSxTLFO1~#1+>uc(Djj`l$TpKz(SF{%R8<nT}+i_x?
z#}K5+NiPTlj5XG|bzp<5;SYn?V{*74^Go|jUY$$u=|Wa#_LukXf|o&&Ov9%*ZleEz
zS}}Kgq?LbsqTxSuq@~LbLh>g%NC7!}{IaPsNc}&S&M`WZu4&tu*tTukwv8*!#C9^#
z72CG$WMbR4ZQGgo=6>GqNB3UctM{K?)xCF}Rdo~rsc4{MqGT*X7Wi1f9<rfK_LyS$
z&p>D7k%cwP1a?U&RIrc`PKXV&fRKgI#_d$X(&SXS1O&!lRovJGQJQVg60S*AF9wDZ
zh9=X$yV0h)E%*z&CuydVyRSQ+JH9@TQ=dpevf`7)2Bn*IUCx&ilfbHu<}m{SoElh7
z39m})DpJWpA<R`)7BU=ZY!!k_8i86HD}pRv059_SBANH%x_AfeTG8;Lmz@UCfw<rq
z$|Nv!r~Bf{@>R!Qp@x3%)%4JbzWB4LPxVLQRSboj0EXO)iCbQ->>+)1T{T~oy%}-k
zZPiD;=v1*g?z+0TArLF-QXVcw-NDyEHfrSg<C~_Y*HCG>jtgkt>ep=3P%Q6WnvrJt
z+4RwtdR4Q#<r_gbK6Yf<NL4?}zS+yh-m;s4B41tG<8L*xX6>RUS7xS~!Qbs=E;lje
z53Oy>LXWHQ$2v+95NE2^FeUsgp1y4FyvUw1VadDrg*G_B4otGbMYIlWq>so@%yJ!C
zV+>DAk}A<r?`OB5rOq&CO9`+Y3r`;jHh~pS@+$4Iv4IXgiPtJoJ5#58eIv+F{ON2O
zU0Y+9G`Hc;nWv~_Mfe^$zhPQw;=Dhl_$Cc%qK>XSYO|>TXO$oecP3UZixgcI-#ccF
znJq7up8Zjx1AN0)D-mL!udb@{XsbvCrCnAgur+f+WxIfw{$K!<B1!TmjYEd+3H>o4
zfn|*egR+@Cqfbd)SeHLedNl(erm}_}Clq=82-p7cA`8%vq@&iJlk<}*b;&T@mm@wX
z<w$)y4OnS!Fs1)(9_U$Qa9%2Dty&R~$<S;+uj<8m2rShU$q!i35$9_Pz9~gm!M!@(
z((s5#1(eTGatrGNCxjhMO}qdF?sq8*pNE;ymFl<v9i4+M)a+!|1M>}1cA((mK@yos
z<RVS_mN`!sMXYjs7Gu7Ki3MMhgI>PW0ZW@JX#qtMNijTe@pH1gG4`^<{AR@h;s(T}
z&3#(~u$Qi#%j!zW{ss#Xsm|DQOrmKNB0cK9N~^$rZJLyDEKoClR=V$R;aujtgT#1b
zA`U4#ht`VKoHWuito?@~br1x@B1L^j>cuo=exM!L_g$Gz0SpZ^`C+o-yaA}LPlf0=
z^n~1R7J(vVSULvS{$R8709Q#R@ZbWBjZyY(AbHaC(7|(oHtzZ@NbtoHn;_g=+H3fa
zy!pe)r}Lf|tftQ|FMWp`rny9H<W7W$0AB!qmDVbaD~@9L#kn+X>Z;N&8jH3-LHf6@
zM&!|x^O%ZcPJiq#EK4mpID>Rd469b;u>zA+kvrUva9OQIDXPl_*T6IGn29GAYKQ0n
zASA;!l#^KpqRw`sb%#}-2}Ud`ZK&<)htt;RIog2CA2(DI+sP*f<UVz1J?mH?f9td)
zzdeNua(jfm=DFmD2W4F^d-U<|)=F0aU)80;Ir7>^;yl%Jzz6%{0}^a#h=NyKLgPR?
z+h)#g+PQn_^B*+snviZU(joHWllOKpV9D$p5IwQbs<S0JccDYV`BRCKg3`|{Iyv6D
zD{$lCQhE0De1`P{-?u=x#L}>oi6pC_`)m%$bm~s>3~@o<?8)o{_CkC?kFl2O*R9i{
z);ZyiSB}yRq@}dyvnfj)M?a=7jsgVN%eR~f+Zk`qaZ`Brn=&Z%jyOWoM9?20z*uGo
z!MnB*Lg@5aDOQ9C5N@3uq2dK*0r(nlP(CK>HT|MFt~;^<GiAL+doOiIH8Cj_+=cZU
z*PU*<Z##<L&s^tDKfW1E4ajuJuVa(we-KeuN;qcwIbF4$rz@`~$xr_I<&%*s$vOF(
z?yHam0%rCp51eUO&nGNb;~eMXAD!cUR!-~md0n|xyx=r{L7TObXl)CODd=Hi>&e$k
z<m>`!AZ@c$^%MzW3|Jt;kr?yNKC`4g;qphv-mowYqO~qxIDHG&T*1Il;sp@iK|H~;
zRY8%8d5`6`s8oac%2s^AFKN^&{3cN##QttYZ`4w%O1kG)vS3r_nko@(3WSWY^hy%k
zD_xZkb0hmkTBJdfu$mY-P*DN?TlRxM-eP1OB3FiJK5ogaE%S@t)Zzn*d&`8NQU6AL
zC9qU0aDA(=vpOu~8PPvMOGiOGcbw0<rp-<9m97+w{AtS-xxLex>;i&OIZa_^2(khD
z;&117LsI_yz=<&pOSpyG0=nv1z6nB$uqp6DxHM4~*{6ytIT39}>Z<;BowyqFU@THt
z9tvb``MojCN=M7LPJs?9k>}02!$N}>-Hdf5sj+7zPsGcEpJ72v5=@DH<P*>xVbShM
znTCaXY66l$r(TQRo{5JpXcn1GZ4$yFyu=I%t%@xcR3pUKP%~9_4y2j%Q(-)PkDfn}
z9I;eUk*#9=IplZ{KjMiWV(J5dk%FI*g!Mq0g2h}Kb^c8wfG~@54Ml|sRB_zCI<@{6
z^>GrT2@cGf?mzHC4F8I^S9r33+|on(dnh|1Z>%)RxVYT~j~E*AoAP*jexWIP76myS
zPmxHAcOLo4+KFvX7l<VO)YYuXI^C@OT!8$6y6#B{iS?>eBb75ClA;yi&nJL{!SU3@
zWMvA{qx5Pu{sRs@9^q`F3_ray9*Q&n76E5u$F_G0Tl}P{sn+HS)^78+pUqFXayKO{
zi^~-OJkHkEj&_t9g1Y0<`H^--_8B+x!zqT9=#17`5WUA@RUk-mPwZ;c+8RhB+N`=K
znJs*ymvdg07$&iKn$G*<XbgK-hE+hXCw!L4)7~SC(Vb=~1qJ%g;n(ymJ7MDCgbU9s
zHyCCo;6uf7$%kx@e{0p&FjgT2y_5CW*)>Mk6>^D1*zhr9ipPUJ%R8Yk{s78rc=2jq
zx?!bk{FtF%6OeF@OlMxwiOa{3JZqSunUzIK$Krxk3j28$=JhtBU<A{w1V)M@i+MfS
zyoBQBFdgnJ-Qpxw*t(w^ldGwG>VAPyC$e(tOs@2&>aIiai+vP@s~9<ky^D*G;e|=i
zym>CD!K+B*cxuJH5{ZoroEdkOb07;B!(&?FM&tYiDzMEi^#Kvu)$>mUMf_&sIXt9V
z1`|{6PuR}`LE+?M@z!%&B1y|M_RaF73@U??hm`07>sJ^Y!2lLnd(8Vpp>y1ny1lr3
zl!y`Wp!J+)z{ok;P0$-LP(J+_fL&p*f0=;J+-ts3-7_(rS04#pN+)SQz)n%tOxR6_
z@iS9s7}z{TeV+AZUSI^TvB)a<)51kpw?}19ciIMhgxJi+fk$dzsUIxLVQ}Nw6>zz%
zYtr38Z538+YKBWeW51rNm{Tpg2qKiX&!^s#!ve?C(NY6ft*#v{M7+r!kFvwni9Vg9
zVE>1ImnPXi@nY&lD&bwEzxTI{dNtF18pL$JC~#UVZdYp;{nAd(+?7ql2-I0p0a3h^
zdE7VU7KJ<gSN0#yB={@0x(Sa*-@-62y)FS_T$-c6jKk^G;u4ki*zjt5N5q!3Mz_b2
zl@mKyBqe`#hpIPYIA`$qwBZkiE2-*csTvNr8y1`EtZ?veVe(vs(U%OZ)|don^|e}x
z0-(f@-Js`glt`btYLu>)trJ-z)<va54l2RNUreF>KsCRt^QH<g`+e067MEg0Z293_
zO<MAYCE1&lsnAr6T+MeHzmW&nM^Y$`VoS&A-J84LU-~Jge+Z)iSaDYxZ@;wJ8n_~j
zccz)Ne-Wuk>%e#W!F~rPh@w4+*$@<sRsesZx0)y69F03o56Pt`XU5p_TXRAuBqPQ>
zK4)>+_gDsG){RQP2XFWefCz@LxK4qr#%x=W<xZcani+D`VZKw*_R@DCQB+VMB&1Ap
zdKYB@XL^w_KGG0Tf#&Qr%_zNZ+Qu*b9j%3#xG<B6C%)7_yW&+pG5$19ID}_b!vZy)
zt;UOES)D?GTgSFT0EH~h$sl33-s4@ErCqjZK9cgObjBljYhrL3iH?lOrZuQ-p@%$m
zzo=bv!1v!fwG5V`DOLx}%tJ|lkfGkjFw{sRm?9U~5Qqh54e+?P;tR{K)$(F(1?qQ!
z>mPy&Qi9cIKa_7gh__E4y<?zsI?(6}#j{*D5&C?OW?b_wGVx&?^#qIOFUKguc)BZj
zS#e+Ny>=^U1@#vNfA=^ut28X2_ieyr<^WqKZ6Z-Or8MH|Ad<`?oNVuOc^D;a300H_
zM@89Pv5h{>T$*iPbD?^mIOFe&5u_Bf2CQ{5|AFdS+Fwi*XSv_QuaOXm*g$E@V6`8E
zQRKWE^)Z_$Y0gO|a~q&cE+vcV=jv9uS%8|>#SnVFD4{g@06WNT*HBsw>2!tC0{d{{
z-?m)$6BB^p0Jsu~0e@^&+QoxKB>XGk((rAyZ?!zC_Y&)X*aR~{dd)P4=tBS}&bgS2
z{qy^PL8LkzJ@}LlCE)1?0?<p4OU6yLdk)N;Kq=zWQ3p_Jw8z#f+jN;B2$opOAoA;!
zeBy9c_FUk=ylJP<Uu-rZwMw0`hPtDbIyA9FLprhHNbn~U>Rcsi(8&_kltfWR6M$DM
zB@k7TLP~t7P?uK;Ts)*HwZe_wZDjbBZM%!6b?Jhxe7&{7sfsC;9!MX@l+!aDwGefQ
z4x^TY#)Apr3tC6<q!ze3&_v!WU1LdD>_!dw?x(%AL$?5VUr|4VvE0UoX+_onVuhyG
zjno6xQ`GYfpa&yn`;1$$&NDY>HXLD&5<y;Kap95Z$GXLCn(%38VzTiyQ7L|OdP+}a
zu7451!k+S7(I5}L1rAla9ZX6D2Q~D@gQ1A)Q?o2U$Tz=VT;Sn7SHn^)@p8UolA$6F
zcs7^fv?I!?$j4NO(^q_w4s3s@^vSb4j!(6!$h~{1{)_Ii6nb%)(rH_VwT<)qu;~Q1
z>4al2@3A?<mo{$#`>CO|q4u_Avv9^NpXV^|y@IoDy42y31Z)~eiGpE6<O#H86x=I>
zjFQWawJp?DvP0va!#N^er>_g=QN4?!$QgS^+?fbZUO$e-pB_^&i#<6xi*}@zikhr)
zQ3p!<HJhi;{0i4(3xTZg`Gn>O-n4OUat{Ysi^*BT_O2f8jyx#;l8S9XRMCoMZ2A)_
zX({EoS{qBU0kjhm%{)Y@gbA}dPEho2-^nP_{xyxl3R{(C!oi@~ily18z0RaLa0~`Q
z-}?ov&mj*bb++L+Cn&la1{QW6ioeY&-ik0^fbt>FeFp7$E%vk?b`~WsQnvbzyglt2
z9`}pj;QLZOF2GfJW`1Ani=s|17tLg$8U+`!R+s>XANYrUg=l>KXV@4VJI=(f0lM4q
zc{QF7gE<z@FTyJ!hnv-i?+gSUFQ;~pYVfl-`Z?LKZ<ELC2>fqt;%le{C3*5Z;l{WC
zFSAqZwN$9H)7C|NkiQGy?ue@E(A}7Xg?|NcL2!wKV2fX9dAtshHJ||p-F=%=!ny8q
z6#06TOF*fvSQIa|E4OQ!zt_m$j8YEAXLb#*=)p7dhKLDe#O1>ypGw~Mhuiss4SE&o
zUCOJU9zDRJ%X0NAEI1iD47H_vlSGZkF~C$89(cGGOkm&MeNlaq=G0Z^LGoC#&+(5;
zaLHJmE~eLwe)P>Soonm@y#9COv=j>${%>Y)XCS}#)W(vgsSVQX`2E(M^D$y3#n~@U
zgV@<MLC-IUI+{qW77bca+;u;vou!kPAOml1;#fUBLKLrq^Gzg|80~UC@f-tgBe6LZ
z!hSFAGxlHF*1eK%!Ow@bpIB$;`|fXMllQR9LFG8)zQI}{0$pC=vjW!LwJ3E+j*sq0
ztw2N<ycu4}6w)T*L@;gxs-rUhFfIg_QS?r>DGaFc@HzP4;aOZH2b_Z$V?;5?hCMg*
zn!6cCC{y}g^m+AoL?$;eAC=f<u@)*RZdAn8*t@_xWT~*WSLRzgqJ8i_u;wrx1UdM}
zKLTPt>(GWM_EJYNcPYf@<v0gbU}9e?eZVk2#7DP4!5WA`!ats|4$w?#x5%*q+n3c%
zu8g*)`*?8Pw5EwrR++0-RmlpI-~+^LQ>{mDE%^ugN=T0ugCc2Ib$OHbSS~)R(7Omi
zjZ9k3U(d1-{M$k<#<4`~+j1kbgN}?&yxq;C&cE~NugdUGNRR`qr}^`}2t-ziw}9Yu
zND&z4NgN_teN~?NfvUpDyi>c_B^0D$$U%w_9IM8HxQLYy){J#z<i+Z6Lzt^x`W%PQ
z0tWKbe=qP$ex=97+^OxyV<mcBH!GieIDchlgbZGjDl$%m#nJ3aCJntxH8c?1jNM1I
zE-v`jQz;A{N}0>v$J|XC2k3T=4g!TR3r2+)_P(#EJsgpZU#ejJ820y9k*w+P@sqnB
zl9o~obFSN-5jU6z9D=9cynbWie^HJCnF-Ek_hYH71W5_lcLsNLo|gKJBcNoqk5c#`
ze{rg+LtS})^(X{gJxq+Am1Jg{hJ6adCBk8!+}{d>I_;u1kC3In1Oy{5Hv>zNHJZs5
znjAml*}FNZQo=Ul=BGBKuJg#6S6Zrl<MFo)yrWxUq%rpONrcr;ig~VIq$~~AG&gzZ
zr)On)NUZwno3N>Zyojk7hV6B@O&_H#+`Ni^H}s&=v1+EevijAm=O*FaVtKKpajjc}
ztaO=b1DMn~BYxd*1Ljzw4}l3A@`qiyNuq=mV%qB(#Sat#fi05rT^EFLO~bNLgjSc>
zSJeJCu>K0517vo(tmJk=ys?J>M|?&{ev!nS5H~cObS#1rSXcN(j8<2c>5`D6w2tf7
zjkvK{8I{la@AP+{l|PZ5ymZ+vIZ)x*a@lgzr?3`tKDAD@Y<ZX2cEA}yezBS96PK(<
z(#Q4dE4Dl>KBNf+PeRun(}CTCE(QK$%Jyv^`vksei?l5pL8gQ{6s0E?fw#I?&W!G9
z+C)pZbxWvq8L3$`GAe}p$97nO+37R48}bxo#dEr&Qg2J#ZMnsBo=g#@IeASh%rv$3
zCyobcB()INWZIHZD`1NqVUEe;JpLx>!$#$~`lfTHjZNvIt*&KmP29<5qHD)>(a~>x
zDT_5fVT~3K%Ybc3xNBC1#@T$N^+~ISZ6!Z%293?xQi>N0^`8#KfX@*0`rA@o@8FAT
zsB`&GEUOCN_|)~=lHXT#bL%f2XZWAqP55N5u%n`YbLctRQH>0A*QR;vQFGqagnY<R
zLBJt){v&=~X>+W1#k`J)!VJdJRaXokyH%~~(F{OUSN8mX&?MrQyK$stRrJN_8j?Wp
zkvR4O{4Z^Vqxx%u2m=IUj^=*~`lcNV5Y9)}4C60QCd=D9OJJjRd!f6-KB(4iLqL0d
z06RKXrX;z+KDpkwUBP~_lcJsC)qGnR83P3c9A(LFOs=@F++QC+{gdCcPuUTcIvlZ|
z1hzapkd$@yJ+ay<ZTk6DZdPFTu&d|sd-nas?`v-m1T#_tbd#ymb~;h6vh!&UNJ&Om
zi>MyfQFU1*rdhojeGzLl{LMmVJLfqNj@w~3XBub!DJCFknUoW~z8qjLV2$^@+>HX1
zzkSZ4A3OtiiMH9G)F{x8-`pxn7O@+>p8bL7A}3@y3{7A@M8Vy*CAVFWIF!T1<e<L~
zi<w?dt3(C`bf(A$M{AfbA*Y)IDM(`yf(c`BV|-z{TUVvoTZZhU;v`S$m6eH^or-#N
z9HKAor4QHj@nYhO`pB5|V<`#PHn1BH3QS3jhjK>DH%dJu5FlvnwyLF0#cSdT1$M6#
zZ18qzTQfAt9;sl^A2aK%_~@pCg>_Qp()DFxmpa6s=1SZ4*=uzdMYCjqo;X(5oMhv{
z(dB(zEBvvp#a1pisvEaXUh>{EKF)%>rO~fl_8B-_Ime(8ne*<ahm9u$3P&uP+_!p6
zvdVy9(PZy}g7jWW?|lW}dlz=t{TIh_6ioV<;UdHqM^_y@8wYhcDs}#x+85>WlnsG*
z=ur;WDhz}R_=p6&Me__0Dnqa)Vm(Gjshb;d)FwR&H(;EMbdzAFeKFCT-Ig4E$-4aK
zGi-#-;?EInxP?iXbRq=$>IBkhmhdo$FOD!Kejf)(j0kQ2kZL;=o?Rn5)dp>0x9TTa
zCPh;SH*Hd8zFU~s1yV6Aqabc3g)G)YP&0~_iN4(1;c@Mm-(~T@_R?w9F6{(DUIimi
zp3cI_mO`0P?HWD-gKBwij}GDE1U1oqsx#4xf_P&!$(ge3=p}rPpg(z7QtSLwVp%wr
z)b0###i4ADrG59KZ8H5jrgmQYIGWL*j+|7cc$#s65id0@KZnq(3&wC@I#!RvrVJD`
zc}=SdM#lo1wY7qQ?%8r4UAkOF<H1gt!y<9Y6UirX>5s^!cBg2nM=0e+U=;dHNa8Rk
z6OSdR1P^6%75kui(xcdvAns#PwNEUe)W6QKvx++Gk|I@P=%B{I!M1%mN#BD~Z&~S>
z$J6!HZEokW811c<M!MF92<^bPRckg)lsU7N<NBt$&ND-R*e|4rQAl-ZUCb@<wwqDn
z8*r@MKH%9|HI~T>=}jB3iJ%ga)vN0pvV7DdI!MQ|gk(^k^%8^T$}3nBR>8|jLy4Kc
zE=NuJDc;yGJK4Q)RVO0FMbi#2d?W{tqrvP2@CjY;agYympLu+8SM^1Bm^UyXv=)A)
z$BGy?QAf}MC3Q9vaj5ue2ht+%CG->!2?Xo*aAjdD>+D7_N2BVDezDXJyMf0#@!V-l
zodn=f$EwhwvPjP_`FNCTC?>YxIjNyQ{JA`OmQ^H@t*Ugyq^(r<Nir@@GPdaSzYR}B
z-;z%tNio<OnCuPFr8zhcPHwI@m4|h#wjU+%IoqWK-px!?G4%{C8<E{i6nasrq5GsM
zZ#QT*akVy?irjlg%Xu7rqN`k>Ox@Jb)%18SEeuX)K#ChV<yN`SzrBNf#b1A-n7Od}
zHLPz=4F8p0_Zef^@Fco9jS*7BiedM=k>AWHY=G3=!Nw39B8L}Up9V)+ma4^A&pH?m
z!ZxP?A|<ry)Ra+lcE$vw82mhIG!T$KP0q22c%@`>Ow92k*S%zgJf&B;)6NY_3^}60
zB^*Tq4Y^#YePB|#FBZNY8^FhrqL)yz@kIB=2}87#%Sz7pTM@ebhNF*?h-zOlGaGfv
zZQ6P7qKX#@;EeeS%nI0kqiA2Vr6}63Y&%v5y0ML^&*z*~kj@ok`vxQmDwUd}iS^e}
z-?Z%5Rm&l#PM70=N&Wo!2i0KZ&gRQpo@dtJqbT)p_hI@y$KO)<o|Z?7aZ{6DSh6Q|
z7^mIEPHEsmt~C?5mubqKv9LdkhaUp=Mz(Idj^K15to{`t%WI)IKst&K+IkpUF;AQX
z+!@%!T`u=%#9)k3%3dq}r~|EayAG?=n8CmH!2&W3?B4C1ZBQT6zER;EY1e2HX~21b
zMPnz^k=2P1?HS_kjP{Oq3$hWmeAr_AEs$0byE-$^?(?#)b(j|LD%@_Pwi*(%LVjlw
zJo$#AvDP=|cR8ud59?1(&_}1XmuVCL<~X{@KF@WEVT1(hQZX7-!-n7=I#-O=w8^|o
z*w96qZj!M>UOh{V+3hcj2VhIFR<ufU>)|`=Pg4tx(@};;bTtOsuNyB$QXe9pmHv*L
z1ben*Fi>HnWoMC*FSQmeJ=SCE7~<Ksz4?BG%_~1rP?N%7Ma5kt2+PT<jlgLH=H=SV
z##9CN@NYY78tLS+1As%>L=5TdT2brdx>Lpwa+1d|$6We068K6Wxxe&F!baQ|&s7pR
zl$NXuC6`oi3J}9TYEA17G5kP5aP5fSaDISnI#xzANK&8QAygL9p|IKcF>Js?yRHxU
zXvzf=6iuHcb=PWBZ^DVxxF3fDUpU6wevU*hwgyKVtY3u>XIdUCa0x^aO19CqYHPS9
zu`dYUXsTy$uB%DR^04ViJd4h7l#|9UlYmL0#XJR0%{SPhqaVrB&z{5U&dg+Rrx@9o
zO385wN^)BuxZOicKQ)$`=k7N#;9Rnz+VF@5%Y`gGshFy8Hw5qg1W|DShA!yJt9nJq
z$TD$(FaiuiWu6WUWb_!WUy*ZE@V4svwd&C@-1t~Z{HSQZ`B<j4+R)e_SuO?d3}Gr+
z_`2&Hq0Y(AZ!WFFSh&^zeEu{vQ+Sg4^(`*Q&xtvC1282DPfQ^tLE4=D6X=TDp~G%8
z><(gJ*A@AOX3QZPVwMQNTn>MiKs)cfbC0;XP9g$wQ(ssw*!|cIBS)~BQVg{XNM;6Q
z;Z4vGuyho7&kMD)b8KPy{I)E0CA9=YS*^)sySa<+o<MZQ2aM7^Td8|wM#S=OOXEL{
zM#8>{t^_`#Wr&9lM#6YQ7DV>6?p(hnyN`!Gj7pUlUK!ybM`VhCQNEdRJw0<yAzDvF
zKFehg>Ukd^J@oN^+6;{FFz;7a!3hiE!Py)C;^8Cbt>|>vA@hw*yV9$+*+F}_|C^C{
z^$4FY6yp6QXa@b-Xbg5FDP(X<&GfJpd+IZhw5H3X1pyX`UgqephJAD<7@yKcmyak{
zBe-1l&h}3?t;+`H{Z5<-0A-Ed?nmf4oZn+6q=JKLD0`|9;b#lCP+P-NR`c8`gG}~o
za_Wop;jix$On;U>r}s_Z#~q-fxnlbMCTVSaw6-|ETsY)HQi$+ZohweoYG;J!#MmYU
zJ-&E}<7=c5?zK`~6X1y;X3s^0gnjdu`^z8PyA=m4zB2}%OVJ><lo2sWr@?)j4M_M!
zv>2-(KV1!c_UG5tvz;-b<-P>67PMe-{!%S$+ge-~q#h{~r!iBIm0yR<I-DC(fu<J3
z&D8u*rwX~k$rE+L#?00aGNF`kA!1ky!p$p_pMoui=*$NPld#WQP@HF!jc9jGt!sMz
zN%~EzGv@?+QrRa$eWsb079m!AW_!Nvr#BSglnu!-GwDwsDzB@Ni$LQ&`i4Q{DVqk~
z)?30pm|>$+-JIM$&8J3`IN$zZby7XCwIYN&KX**xR?3#I`P@$25sP73{J~Fr{&VSx
zWjo4(!WZY0!WRLG+&5_hs+36ennIRCGszV{g{c&nVv<_CY*JB76~&P_B3|dIkxj~o
zswLyq+@`s3IgBXdfGL(JNd6+zp~TOG2=b5kop^*4-kRP~>$H7FNTn$aAkWn2(`%K@
zrFm>^ze(m-JNeWHOSG8y%D)sDXEXClyF~dn{9#!|`|qY&trq!g^80r!*MCE+{w?so
ziMQ>7@&6_Yxnljhy1zm7fOt$qRr3GE8*nPAj(P{1Ed#RkgKMS8Kldx-Y36B97IYsk
z|9}y6IW9i}gPJn_ITCs#0(+!0^=F_B17!!Ja0Fejsus9etsKjEH{|gRobo=RabqWx
z+E&({i>_*%E@=1X|NH^2N9Z7gBRCL{zZm~NrH23ixJRLXwVMH>*4=hnF@c(Vhz6L?
zfp{Y5=prJH88g|6MHz78O^o71L#>V^fpA29VW_j}65@zQ*^j4uK+%Uk_aBf(U@o9>
zNJyvCe618gc(S4%qX--Jg9r=UYJd}3g)VM{2sg3JVv3zB=}QO#SbJNpmK#M~YdHii
zU{sg3c`hw~d2=^L3ugw$bl$tWmJOz@l-DIhqBt!HD{X}KbwYy==H+zrbaN?|>TEYr
z0CKrru|C>d!2)@Ga^_fEG(5+9tE4#&&R_0^_9d@-J|c81x}VBM4}h2AIy2OFiy9l)
z2iDN_TbnQHnDsiZ1q<~HtUsOfO(hHZK(R8@n&|X&-gme5v8YW}j;=D)lv_A@`oA1+
zNUKZ`vXjqpP>7Wn$t?Ru;6+8)qSGP}KP5OAm_7UIg5B&VzSzLZ|8a+!1NZ5<@uMGk
zC%5@!@%x4*mY3luwenb&Jx8X{=A`6&qZX+C^T;Z}lVq*`rMsN|JN}nXopeTxk#y!Q
z1;nHgX~8#Wp%Il5CkUX>H2{TkrZ7rd*OxBTr?aAamEB~ISQMB2*=}#sQIjND1HPa_
z`VzU_VYSd?wZLZglgn<APT_V?<qsE#bUgTR({dToZ?;GClWFh2pSyTHFEvU#<b~Iy
zRA&z%aA6(->%4^}vuEa|9P^noEhB(MO`zY_m{qND#(h`HJd6D$kG_kme5{oszd&i(
zEO$uPV&<4Nk5pW9Y~0A>hUeCvz*EBZtGT4R@XC&cP9DRNGq&SM(;Fuyixh&|s@)*|
z@R`oGyCdd^huhWJ8piCIg>D{fJaRF-E(BkVkmZr9$R)jZlgrWyD^K@hc1=v&CD8pe
z|GW*rcuG~5uTj?g8(^WxCdG#oo4vAFn|A@Rd|ExPvW?j!sPofTRq+M|eN6jwD!arC
z+^(8p%`i9gjQ87zSIaT_w`yIkE5IZBJF{Y3?WWGaHoew93sB1j*FTe;A{Yecfk@wu
zpS8McksjKqHCMF1dFHK)V52~|0NiRI9G!n8<DqvDq8vlB7s4#YXp$un;(*<F{5!X)
zG!0u*IzkL#^$YCXQXw96sn5^@T&BS6tN9<3?x=EFx78kl9q<@v7Iq^eYk{jtMWlHn
zvx?XmohfkLs?*iJ^}-^*-dfbLnYM^8rR>tyZOz2fMkVdBpl=JIp<Mr=4HRk~Ao=(;
z=tN*uFBRC7v4OrJ{t9iKPzbR)=Juk~j(-OU&*ujVXFd0Lcq5K_3C^LRn4HKT3Py&m
zQJ!OhJZ&6|Gzb&3|AO{-OHhn>ar9_Zchau!WviRC`DxWD%D3h_317BbUl44j1a4&^
zGs$RKV+L}b>ga6jc(uQI1uWd|5+t!4_96Io%_HvJhrg2uY)acmo&SFF&mSd9q|{<V
zZj4C)H3V!goY<<crQVd69#>jTx^fJvbGU$-P~^aGpDRPn#1$1;sIRL24$V+`egtex
zE0k}VA5-#zF0nBs%l&y#BhpJ~zUqR^x<O=u9E!l@(xb;H{^6xu0QB>co=d$&7V*PH
zZ=(514Nu-@FP;;Wg?->1LF)jYHi}1_6XDz?5r0lRq0^lXaH8k<3vAvt#)oP8Jqopn
zrAsa?bw*t^03OdK3HpRM0`p{7XB=%X>0D6C*+UeG(3y##xz;tUM1{^fo^F%pfTlLd
z#?dCv%;ETjo#!e$C)Lv`iA+?t?z5~zU%{cd-;<foAx$LdUMLFmJ>DX>v_MGiYDW9<
zxgX|zu<79r0gb4~B!MrWUytBX=pu9m7rpvVIlw0`O1cN41Fb?v&Z6_1mp2eH4<WF0
z&j340zs$qlC(`cBX-pS9LkO6;9B@z*u?&qs4By0=#O6x^MG<o(*fB=fGU0N*({b^S
zu4fj(Z63gf7I`M;gP!!WiSWH(4{$1&IKkzfA<y-n>{GvQB3CrHZWyrJ;VnXLHO@%E
zN}Lo;kSiq2fzh`?=X#gM-#%8;q(d{1S4eY6v`^npV%ZZaTx~x^K8$(CSiZ=xP0G{T
zc0(O^50=d&>c_p$N43*lVIrBX3n(=G{Ivvw*be|0`dVQ&l^=&sB&pxb7BL=}$~X|`
ztZcSIzQG9LxDz1?LIBcJ3y2zUcP~kNIxR=HnK=<JV64ZQxDd_7MI1|YOcVW}I-M>Z
z$Wk>Vx#^8P+vXHHZAm8UFFR3!#hHtX@Y<}(s$-Omy#$v~zLk0N7ajAJ`o~JX()PFc
zWrpRbuu*pK0Y{Qv34&GzdRHoS@k8)D4bmvj40_&)M`F5^D#&F=<StG&G*pq$wDL@Z
z<q2b0V9@yC#N=|d-7(5>t-fRWF}}{L+uiU-6_d--48;;BRMD~TQn3cBij`+7B^`ye
zsH$AndXoEoe5G+SztfZ>ycU7WwiDI7j(Hy<<)HI8pVpN-D@n?jWThZq|4u{WT}l92
z<uud|;Z$lh$3OZR9O6__g_R!aY7J&gMQp7cu&g}vvc7p17lfGlrcBvs#`xN?-!-Ny
z79dY_>gM;60dekYz?-Rl2H}NbCJEz1jbe>FP6mCEO|J<sr;C5@^NSE1ssHkf_lxy2
z5Mg<RQ5Ns_831|Q(qLnoX;|u#g`wjmVi}QJUgij?W%GD<TRf(xqGqqt#$|^4wVk>H
z3_(<5pMGGP-K>)xQsP2Z@yxwywe=+~J8hr?y<61l@QJh!w3q+x(#_Sz9{Bx!pLVXL
z{iT(lg=r-K!a?=*bUB9|;0<!lC|&2+=ND=K(Lk>w>|#mOz~OgdS&|qCbH}A(#|zMe
z6uhN4%e@WH%s+CNx4`g<@yk+@jM2&i3I*YUczoxe{`UFds_i7|K$3OrDWvUK^)PS?
z(^0gc@Mr-vEMRId6m`k1!K4<uL_+@{{U)K6$^fyjfN%><YF5x{pZcN?`TSz}hUt7!
z+D`#MeVosNw7N*=GQSx*#(ubb(EjBgu8Pk>hmkN3)Qk5^@QXnC&?+bWtOgAP#?ryk
z<U^i0r01a^8N?ogeCH4cAb&z_xs8ve=JoUsCvxBxJ2>-yqkXeE_ZvHcB`Ny<X-@Ph
ziHnV1U*WL}-v7Q;hHs%M`y~FR5<3<;>#a<B?*EquPc&9EFzlk`vG`LCBDJD3M+ymP
zq7M*zjTE4v(E225fMIW_?6L0$1dT^_i-z-GT4jl4WhC|iF$7{@Km`*u&)6BH_|1c?
zu^Gf|gy!=N!Zl^=B1D>zmP1R>8^$}PRZmr+)@s90MQEgqYX4H|wG8~Ib$fDbyeKRg
zCr8v{0HDv)uS^-HK1K0?s1#GqxSF3QK#J<u``IJ%)u3HsprGOj|M27oK3m5o+|c;n
ziFB2yvuV9+-gGXRhod`{wM8)mjGCd{WiTEoyArs$c3PnGK}ygm2b?Q73dW5bI|?^x
zKwHk2`ZYl4@^pA(b3oEIiX9I{Lro__+y)L2Z%Bxv7^8$()&J$06m$WX8K(8e8a7fM
zl8^#(y%4YM<2f#}py)DA`UoZjZabco^A8SpCzXIIU5NyQjenkWgQEa=!JL@<<5V+^
z4RHa|CnYML4|au8C`jQ3^vw9R{C1tpu@}VDAN|ScICm(2btQt6;$5Wd!0CE{ZZ7jg
zE|`)-Cw>A|7|!-3K+AsTY$58G27<7Yzi!9C&IH3NshKKtMbEHyh%yHtJl3+Aey;<O
z_hCMFaX8q)wNc~x!ddo7`N&ocAE=3T0oS?2nRqxXZ1|xOtFGWythPwP!B&q<KE7r3
z38YRY#E?vWt)3&Ldh3xj2R?F~)4hI?YhCQwC{N+N=HpS$i@!8n<Q8G&Z+gH4hiKRi
zDV%IJLWD7#PE+7G4=M)go`OSO$`71cdE8RJ{CJ}IYqBKjP$Hn!Q;YCUl)Epvn{#BQ
z{oKXU9D1{O?c&Cn8|-lH;zt##AVO0BXDVhySbZ_!b)#jmv<DH>Lh59(yqb??B4IeD
zm9F)fMrB^tbIcgRMuM#3d^gvtS4S7aPR#7$h;)>PH|;*1>MMn6A&JiwkKa5Ur9(F%
zL1dS_1Db1u`Yo_*JP-F_C^XB9Z1L%C4q+orHgXL8I<FW>1Qz<vpaK)mfSi-?zDs`e
zQu)$$;H^}h7RO3fVV+F+1vRAT;j6QV>x`W4jrt?5EU|8G;!NSzWeNG&Hjli{v-u-D
zK|+c?Ehk)<>H{WSI-Kn-rf=uD{+^_AaB*JD!npc%U;;R6;)=QgB=CEuocaaljF4O^
zzh3^FZZYf2_(J=uj?=7+#$yjMqav7#SK`)IPa+SN+=qlo_e!s_>W_|fWSCEG>IbO+
z4~)$s6yV~rwtl@A73o)$Yk~A`&@)zpUu5o!>pQ^bK5JG@s%yBlD8XJoz4WyhRr{-`
z?Y1%AV;Q(Y+WnWiWpoZI&hV+9#4!9`FijOI@(C?1UzJ^>n9lL#QAP-l!i{zRSv<6R
z-q_H#O;B*_X_3TXT$HKUC@(K30Wj4E%Fq<+eqfFlpWALXdOM@zUE?2&^x{Qy^^Dtt
z*Y?F&^c#zfut^`~ypB85(1^?KWviDYa?{pmRuWi<*D~0!==#k1&d;P@9dzR${4gPB
zwpXZ4yV+KSPcXZie_65QSFS_9K!xMM7Tp>3_QvsJ%!ks=-y`(=P~s!T>LVL`=9Fn(
zwrA;<@ShpH%kZK^?dCHz9;K;XWzc*$k8w!=)r;%MyJB`A{(L~!RKHz5kLw!7l}#vm
zfdT(gIdpqd2PW;L{|mA*)jiC@ld6k!y~x7Vq+SD5%{FE28WGgeY&{kY))D6f*D25Q
zZIKpb)^m&1>KPLxb=G4OC^kX6rCPowoo~yKCR>iMApU@GvgktHya9$ou^;6|xY1)2
z77Yy*2*QhNRl*Z61(u(lX+Cs`!LhAByn$as6T5%IiG(Yp|Eglf<XL}k(R}RwW@F=y
z+RO8*=lZ?eicIn_#0!#~A*UB5p~{*ZRw%JglLKvw1wsGbZ?0mvA=_~=asMFFpf*kF
zpHw;=S!h{(R{sYi3vY^o|4K38E;3jtvRXp9UJK37oet!|?4^8d%u-74{xAAyNE@(|
znv*NaTM<LzDsv5h{yMRHQz%XD6JyK`1gdQ99^0KEvb)le7|ItCheNxSNf@f|du9+C
z7FEMEf#(UX6U=qoSM2|6_N3muoBD_Cm$bSU{GKuc;291Ed3o$*N}E{5sG^67{YfvQ
zfF{02+?Mq)dRTE0BLNQZ$tbofYytDR)TR%{lDT=&5Z=Xl-Z-49b-KV->-rG+vBMiH
zNSRL~4z>Ds_`*DKHWA$IFyjUaiNWXB=oR<b80)wf=vgV`q)La*<ez8il>PVpNREz~
zJdb0>;6p5v6{Ap$$6i?8IF(M#@^o+V%BY6TpW3(m|8$-~te>WSGA)dn=IQI+0JCc+
z1Y5UG&yN3{fgyr)pIgp<tDZRid&Z#<<Vdjf3@*;{sK>UQ2yMG@mf>~r-@em=hB4Fs
zPb*keoJx*#qEzubR$|G;*rVNlJ}u6i+w3bM2#6>C|3n4uC`O>oe;pP>cTvtnX++y$
zFws|ab+tA7kWz5b7Keh1RemB!_9(Q5T@M&c7%-2FA?<6G&u6~%6Ya&Z<`zguZ-j1N
zUEO57^4w-*X9xj--;nh%YI{#dM+)aj25BoK?+CuStuN0U+pt}!hZAcsK7(+$L-+A|
zi75A`YLcPL<iJa2*)HkboiuxK8?Q-D{&iOTl%NYGLaqzlY6Q8{FTaBh{P4_$HD%OY
zcb~$!d%IXdHS7kgQMpUqONt_q(T`IV=m1v+Y0)SHZble-$O5~K0^2rIKWMWmiGqJM
z;aQ>xgP>|q589cvPj-(Q-~QFwVzNdrq#xNZy(E{6RzPeFY#v$sNQj|a;fsnxzI(QS
z{VxM!EhB2fwQ1s@ODoItDdL!WmT2NhHhUwuspBfFUp5T@DIKRY>vG>{lLz)G7BuoJ
zwpEerKA-82becp1o*+DJ>_L7^2=fnU_9O77RM<8@$jNktpD?X$roUS71EkVyD%j1m
zi;9B(0p=z`tb2#kAf~F~b4j)G>2^Cov%uDKasoo}w8VVriKr*Tw%&Zqj7~!Sy7;1^
zYXoZCSciBN^qHn`ZBGtWsl93LukGbpBV!*@Rb@_{ngsW<rSHw}_5RX3#FNI_{X3+7
z16A59s;@I;)KWF>#*s99n=UBvfoEUa;`FK47AVK3Z(Kk(<sN)Uu;1-5%!H4weabTI
zP%mx#+POv>`VMK%yB0i<nz}jm8YpIAWL$4p8`EqMjr5~v!sCqSKbz8jX?EcIS9ebM
zf4~JpWTb!S66hqu3jCz+7z|)dSW_f%AeD&9neXq6e?_O9##}W}4M+#No~Zo)L&l*9
zaKk;`f4^kuygXihgMla-#r02`yATQ7YmZT61}n8^KmJIQFra0i)kr61LM69XDRPuf
z%Ww>sQfAzy_3+`v+SvC`vx<*mRenZ{rYe)+FRhOGb8<>o1JfoC4lLp|Q8h!ZVWpYp
z07yBY#DyLjqm#Ft%nC9?=7gD;Q5ew0z{kR7g;rohjNHvfHj3lzM9_A+B0g#t*@*@9
z{}HX0C=Zbt-1H1+v=)mJxzxka&}Zhp+WrDpM_JLG{nPm;I$-s3wqsAM49srLc&@FG
zsSi5S^wPxDXRWkHj_AgJiOi0$SLF4XOF4+)uII;p@9csmNs#=Xu4Mh=zwZ!?83ZP2
zzXTmw?U#$InVqt;gQJ<VtCg8cl4BeW@PByXSOq>O)TX9nQFNFeHunGU#0U(YKcfCc
z84#4Am^@i|WI`3q8)xJJ+WL)Ocu)OW2EQ`trvMLoSx7zacwbm6zN#CgSZU@pQ&aCR
zzPAo}yMO;2Yk{QA8Ljy|n6|eiR65#dv@I{WPE?jW&`jF2*oHy1oZ>3f(Lw{$22i%J
z$ZZ{W>v0DF&zlND9Quc`Ob->B+m;Wh#&kr5&d1KptP&lKZ9ffd_z-{i1>s?(MC!Kc
zlN4XC!04kblxYWJQI%0fNorJ=_(cb@oSD@zFgPu`gNv;sJ&Wo;RFc77Cbj}ZF(=}_
zh1nhC;t&HEzIbjDwXMUM;e~)lHeGv;tp?ha{OFqb#^J_IjDbO#@TZH90(P5p<wk57
z*FX8{a|ZBV@!+~R1|7eU%S9}(JFGk1?^p(fd0m)dxns}6_Yp!pdzBCdi>*I5hvP54
zxh0t^54jbYv)5d@)6zndct=vo?){V~T9*+g0?@lE_Ss9^nBNUh9nOK$dv>AWhxfFD
z6#^xKpSd@D+*JeQIFJmZj}rJa8ls@5H2WI&ZS<fR#l2ME(?j=+l*#+v@S`sg?55a-
z?!@Fs{Ns+!d3NU*iipl*qwyjA%+A`i1%3G_yO_g8#IaG>G5fxHg^_xo<z{>apOW%|
zOow14uOw#3p6V1%SNXsjPT39#z4-#;Op=pZXA{=Qs?W9GHMIeh)t^7o0(woLngo8H
z4+<`;3k_TF3ii8&u70}@15*aHJ6uf>^L}bt?G_vGHDOJ#Bov{K;>*h3QRG}&gQA@e
z9uuwy{Gu;!pid-0$Sm*--v8_BhG$5_$izneQaowLRi9<@l0X3jTqMppT7(t&mgqZd
zDr(dm2mtDIXaq9!9H6->&ZG}aZPHH0aT{I$=!Spg<h)&b>V87(Dkm)+bc$OZ3T-qn
z!O<S``PAw0D<k20zJyErj^%_tt^6|c$fD)F87RE``LAN@<Dx7ib}K)N(HSvli0Zj$
zpG+1Q%A5124_OB2KW&S};?fhuB^GUG!u;A5<+P}Gwx^B-<HF*QzK%E(%#C#*8vgVT
z&bc+w(}zB&Ccii;1%F}^o{?ZfV$Z+*F`0k6uN}@bbuJyQE9CH<!ACHT)*&8<e4JvT
z+k2clD<qa&569HmX5-#qVonsDPT+%g5QfaZD)LNmoYqH=Q(YALJN>MiD!w1mEJvir
zW2aB4yS38ZKex_!?|*;5l|zc^%zwxkMacgz)ng?gr$HrASK=q_C1C*z{EtQAsZzj)
zn*syk<Lx@T3H5F>J8fjxA4I<3d*+5lhOqoVgp!?FJjzN0Y?J=AZu#rr?qUAAdP^kq
z!-%j2#;2oW!dx)?7og3^T15{9j>1Wj-ZG`KT3Kyn$y9=lHG4H<puC@1yHv7K**pZU
zNRwqK1yuu{lT5S3G(;1a#5&vmFbOy8gWK#ivM<LW(GOE3pX8!fDBC!Z&RB&yvyx%I
z2jI@jP?$AOl+eTy`tV1-J8jA|Fq$<BK?%3+NKSMGsB2%SmMzmRs@>9e)>KgFRGv=@
zc=wADdn#VCmndt<5**Fy^goF*{V1TuD`h;j(UT&s-&L=ek|zL~ziK8}$2jZ<zy!bk
zHJixr8NKe{TB1k8w$GVJIsZCPt<@yi^JUVik>C2=^h57nb&+Xj0;6<U9@I3hPdbOz
zIU&=wjAFi^*61l%_%^e8;)FNgM*B<Jp9K3Q2+RIZ)4-I=<HchZ(WP_!cN$ckyDu}X
zKau^j2vRi4nTITJ_|@WVuNEW_ql-zn?|~4S+2~gxhzPXPZ2^ce_R$U*C>SK0M{Not
zdZz(j4-L_ilW$;OzN@|ih7mQU2i-~jJ|$tSoAseoPDM>*%W1v2)MgWKlT^6ZZHGNF
z8c*EwJ6_0X<CF^kr8xu`iPa85mNaN>#_|qDK*Y&GQL+Wb5n00*6lHD1u^afa915W-
zT?Loj+aB5k@$jc%8FKd!@1Q<G_aZ6Kt+nj7{MbZX!_3-kTJvfWdAcjz_kfeKnv$K9
zL>nC~E88_D_bL04aMukP?cxyVom601|3fVoQoI-RZwN7@6Q2ln#~spKR=Ry(6IxzC
zF#%G+G2D|id5_3Z6hUrCG9IDR-DvGwThMI#;US{nZ6p)-TOnW1-kx0TTX2w&(<l`_
z|6!yO?^`3E;Q1b1{Y9XXZ_A*~T@zTGkq5pH0jJ(wd5}<$0@s#3{f^w1yU73bOFlsX
zAHVsx0Z{%w^M6m}0>1xm(aP0F71hR_K*TMY<5a+Phx^w{W=@t17gH^mSK(im&ZG=(
zHY+&j8`#KC*<lO_6?NrwP1=W`)4L#G^5~~|BBhlY(&^FBjQ6dd$NP=<Yd7#u_cNA1
zLfbU6`-iK;<9MGxI?;hOX*~n75~OHATk6bMr0GN^uA&VPM)8qXtIgCAfS(-g=o3F0
z7Hzu$Z7U}m*)J9#Pn(^}YOJ%i2d2wK0m+$IyOTXi^*d4&Z6qJvfJuERx!SpQ(mK*S
ztld7IDbvAzV{Hjv@ovA5h6_80s?zM4dzXwZn<W3dLRvNr6*eyVOqFu*d5lErhVb~l
zy5gKsos}NQPl+IhBB835a1-#8-@Zdxp_H{lGP86FA(VokMR6rLMS6DW%RTfRf?@RB
zM@nsl)I=V4*-1fRf+jRHcKy)mw_9V!bOA{7Sf#DtgtC^Qb)64B0u&DI1s<Xo3lW@v
zV?k*A>)CXO1mRNQ2prSNv<OD3=l%%(ee)C?(n%z+4g-GYfLl*nLgYbZof%=%Ef4GU
z@CTCSpb|cHW-@i~sRRfdzv(ea=r7(h)K2J98z|S1f|j0wB4OYXI>ye;Fm5%5KQCx;
z+dA2~9tVLR*2#}wl3kX<%G~y*mW&hYC(@b<wN;6Uvs*9pNTw18M|t7--Qu*2!4+dp
z7TgNJ2xI+qQgo^8D4ApPBVh-=Vf21pq|EwU<A8oSde)_-H0!7iyCF)Ikm+QjLh1ID
znRvW7W_sBa01BLeEe89t3ErTdNYdb&(?NlsdH8Qg{Rtm9cjyzVO9oc+4pVKtktXRq
zrz`Y=CPle?DORZMH4e5P4SU0cQ~^}xUM?%ZO@b<=gk6)Wc@e9@6NY))jTppGvqgEO
z8n5}|wOjKwFQw$C>49;<ei^2AR&%%JU6^N(oMbd-O4;cUzGXh~?qJfZBsRr)6GeGn
zb~|(hp~Jm6^nHSdkFq;Ns>C3o^Z~v_7$_x*N|I|v`&i45IX|B1=4vaVd3PpNY;;~A
ztC*Q@XS!v7{8;phXUsnbA-TMXmOWsCxte$qib6tBnljH_wrg(qy)J~r(YKJKiI^@L
z32i1F<J2-KO$8t84y{<9TEsz<gC=vk$SKz;bNLazfRmw${HxOZL!#*Zv?Hr`F7jJO
zU+(jA1=~%*KAZ9UPEkeQGvPx^b#W1xsN?5=f0OP<mn_7@bclguFi-{G|998;6Uxm_
z95?@E|LJ^HfIEcC@(@csa)E!czNziBsVbvdMzTHGeZNK&X}pzu^kkDTdysEQV{#jn
zu}jJnZp4xZYfmE8j*e(g3~6Un>U~UBL+>rPfVS4sWYUk4F-yrQH&d^$snQ<kGgIH9
zS49o%=|N`fHC<aTc@LwYnEWPd<T)cc7`>+bh=Grrl*yp_Y6P_G42ksY7{XDy!@BpD
zR7o?eFWUQz?llUyQc1AcFyYNn=wV8H2Y518w=C)>qG}Dt!QVs|<Ef*&q=rgMUDEo!
z>`{G*hTt>yKL6|Aws-73L-7Tq6n*O^57tyDvcRy5%UYtiLUv~R9V`;&h>u37{T3v<
zEBXKCudNlzz882L^h?Hd@5OHmzJA%W>qTRDqg3I?%i+B{zU6xQGfmPHm>A*ke=<XH
zBCA&BxA(^qk_|+9dJmg--ilb0Ez_N!^wL*nf9F&&Ih+3OhY1#DpWSy{V3FGvP=7yD
z(Ph50PR>Wu%L&yh?jK4PyH&G0^GizJmh0C&7taf*Z*5)C+PrUhW`)J}iYwoBdLQi!
zymZKrJCpl-q=9Zvghi#~YAfIYX<?Pp>mtHkldpVts$g2*daUr-xl%9PhOn4}vooBx
z>sA*WndWYo;?1g_Qz?|5Q#tKlD@&m0iOKa%0)at}MK@K>9kr5nK3KR%deeuEts7sf
z9Dg_AUd*L9mK#SdF{`(~aW#FXyi>J;`E;$gPED!!y#?=?Rxim}-+3Z4@##G+!MZhz
z50xuMN%s8Om$^jdSm8%LMah3l>iHvAE_{D<+mdXX^!xL>&-kvnt+rg?s><9=mrW;J
z&Qr=2>`l|(aq0Wtdz>+x-?%TZ)a{LWl(}xNs*L|lqZ_YV_D(#0Z&u%0rJSw3cc&kg
zTTm!^QnsnpO-XUv+E03`riaII-*pXraqE>~$i|mBB|)aSMoyPc3anhatYF66U$rZK
z@Pj%~f{}?Yf+zRPUCBB*p(;Xgvemp~mc!G9W=>u>PmIY$U~=F*naQ;RqLUx26kvti
zt^R+WC=<UhSb~26`(%G%X^^B0`1WXE+bx!zfx(6Wc!UWYTo#2Z77<ecD+b@g$;QBt
z1RO%KMNwQN2~}*v3b{`)V1X#pQ3bdOT?<TP5LeNm>uynoD+HdCGWoQ!JlHzW4QPvi
zy~J8z<!XUq-FY<>4dn~9WW=t+?#W_cFh)`QKm$p!HY@l>rpW?}M47_1;Syepv}BO)
z$+1T<Azc@)aD%QoI8ecNPfUIfG$p_QDhawyhac>4#Ch@z3~DGQ#h6Y$uviIrMFm75
z_%L*!57z*(4vNChmOzE>vXH}}85rgOPp3!q)hcU-$qx2Xliyn_gY1-rpH~bFEJqZh
zgzZ5py}_#B$KL`~*`cTsa%7ln@8|(`KjI`-1_pf;RUXchA1oD}+`rUR8gbAhx`j5A
z?=OvI1)s+^*>RaD(_NscOXVhOdMbiVM;w*|Je&{3bX^~yLfOd=mdVS&4_g5`R2N0j
zt5C2L43-<qAT|vEkKRF1q#glP#5Q@>axH1|&#=Wr3=B#r3YSm5zuZm+d94eoZBHsE
zKUgk1*`f-PT@V9^3=9e=25qVaDwLVLbA`MNVnm36K^{dBLpRu2{@vi5DT5dWK~E<W
zd%+6hSL(<hdRGh#z=0BY{$yYf>IW&pHfkaU4roNf6g>=uCr>T__Rcg`=}3c15@4P_
a%EQ2*fnt2><os0*Ttd7I4B~S^wgLca-h3he

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e18bc253b857..37f853b1c84d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index f3b75f3b0d4f..faf93008b77e 100755
--- a/gradlew
+++ b/gradlew
@@ -205,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
diff --git a/tools/localization/package.json b/tools/localization/package.json
index 25427fbe52a2..3ed9a81d8583 100644
--- a/tools/localization/package.json
+++ b/tools/localization/package.json
@@ -17,29 +17,29 @@
     "author": "AnkiDroid Open Source Team",
     "license": "GPL-3.0",
     "dependencies": {
-        "@crowdin/crowdin-api-client": "^1.41.1",
-        "axios": "^1.7.9",
+        "@crowdin/crowdin-api-client": "^1.41.2",
+        "axios": "^1.8.4",
         "dotenv": "^16.4.7",
         "extract-zip": "^2.0.1",
-        "typescript": "^5.7.3"
+        "typescript": "^5.8.2"
     },
     "devDependencies": {
-        "@eslint/eslintrc": "^3.2.0",
-        "@eslint/js": "^9.20.0",
+        "@eslint/eslintrc": "^3.3.0",
+        "@eslint/js": "^9.22.0",
         "@types/jest": "^29.5.14",
-        "@types/node": "^22.13.1",
-        "@typescript-eslint/eslint-plugin": "^8.23.0",
-        "@typescript-eslint/parser": "^8.23.0",
-        "eslint": "^9.20.0",
-        "eslint-config-prettier": "^10.0.1",
+        "@types/node": "^22.13.11",
+        "@typescript-eslint/eslint-plugin": "^8.27.0",
+        "@typescript-eslint/parser": "^8.27.0",
+        "eslint": "^9.22.0",
+        "eslint-config-prettier": "^10.1.1",
         "eslint-config-standard": "^17.1.0",
         "eslint-plugin-import": "^2.31.0",
-        "eslint-plugin-n": "^17.15.1",
+        "eslint-plugin-n": "^17.16.2",
         "eslint-plugin-promise": "^7.2.1",
         "globals": "^15.14.0",
         "jest": "^29.7.0",
-        "prettier": "^3.5.0",
-        "ts-jest": "^29.2.5",
+        "prettier": "^3.5.3",
+        "ts-jest": "^29.2.6",
         "ts-node": "^10.9.2"
     },
     "packageManager": "yarn@4.5.3"
diff --git a/tools/localization/yarn.lock b/tools/localization/yarn.lock
index 32c7418b9a1c..35bf1c3b7caa 100644
--- a/tools/localization/yarn.lock
+++ b/tools/localization/yarn.lock
@@ -384,12 +384,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@crowdin/crowdin-api-client@npm:^1.41.1":
-  version: 1.41.1
-  resolution: "@crowdin/crowdin-api-client@npm:1.41.1"
+"@crowdin/crowdin-api-client@npm:^1.41.2":
+  version: 1.41.2
+  resolution: "@crowdin/crowdin-api-client@npm:1.41.2"
   dependencies:
     axios: "npm:^1"
-  checksum: 10c0/cfea120da1daffd6a3963864d00ced528323683db8c480b22c875027fb78067cfb2f50f51035c356e7b9639945aa4f3b547da2a22bcd9c69f8826bf09cde5a79
+  checksum: 10c0/eeaf31e8c751afe79de3078ffe6039fc2ff33c52c030d9dfb23b7ba08dfe4d749e9c559fd07d525192f485cbad8496915798333e38ea971a9df7daac6b503e3e
   languageName: node
   linkType: hard
 
@@ -420,38 +420,36 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/config-array@npm:^0.19.0":
-  version: 0.19.0
-  resolution: "@eslint/config-array@npm:0.19.0"
+"@eslint/config-array@npm:^0.19.2":
+  version: 0.19.2
+  resolution: "@eslint/config-array@npm:0.19.2"
   dependencies:
-    "@eslint/object-schema": "npm:^2.1.4"
+    "@eslint/object-schema": "npm:^2.1.6"
     debug: "npm:^4.3.1"
     minimatch: "npm:^3.1.2"
-  checksum: 10c0/def23c6c67a8f98dc88f1b87e17a5668e5028f5ab9459661aabfe08e08f2acd557474bbaf9ba227be0921ae4db232c62773dbb7739815f8415678eb8f592dbf5
+  checksum: 10c0/dd68da9abb32d336233ac4fe0db1e15a0a8d794b6e69abb9e57545d746a97f6f542496ff9db0d7e27fab1438546250d810d90b1904ac67677215b8d8e7573f3d
   languageName: node
   linkType: hard
 
-"@eslint/core@npm:^0.10.0":
-  version: 0.10.0
-  resolution: "@eslint/core@npm:0.10.0"
-  dependencies:
-    "@types/json-schema": "npm:^7.0.15"
-  checksum: 10c0/074018075079b3ed1f14fab9d116f11a8824cdfae3e822badf7ad546962fafe717a31e61459bad8cc59cf7070dc413ea9064ddb75c114f05b05921029cde0a64
+"@eslint/config-helpers@npm:^0.1.0":
+  version: 0.1.0
+  resolution: "@eslint/config-helpers@npm:0.1.0"
+  checksum: 10c0/3562b5325f42740fc83b0b92b7d13a61b383f8db064915143eec36184f09a09fad73eca6c2955ab6c248b0d04fa03c140f9af2f2c4c06770781a6b79f300a01e
   languageName: node
   linkType: hard
 
-"@eslint/core@npm:^0.11.0":
-  version: 0.11.0
-  resolution: "@eslint/core@npm:0.11.0"
+"@eslint/core@npm:^0.12.0":
+  version: 0.12.0
+  resolution: "@eslint/core@npm:0.12.0"
   dependencies:
     "@types/json-schema": "npm:^7.0.15"
-  checksum: 10c0/1e0671d035c908175f445864a7864cf6c6a8b67a5dfba8c47b2ac91e2d3ed36e8c1f2fd81d98a73264f8677055559699d4adb0f97d86588e616fc0dc9a4b86c9
+  checksum: 10c0/d032af81195bb28dd800c2b9617548c6c2a09b9490da3c5537fd2a1201501666d06492278bb92cfccac1f7ac249e58601dd87f813ec0d6a423ef0880434fa0c3
   languageName: node
   linkType: hard
 
-"@eslint/eslintrc@npm:^3.2.0":
-  version: 3.2.0
-  resolution: "@eslint/eslintrc@npm:3.2.0"
+"@eslint/eslintrc@npm:^3.3.0":
+  version: 3.3.0
+  resolution: "@eslint/eslintrc@npm:3.3.0"
   dependencies:
     ajv: "npm:^6.12.4"
     debug: "npm:^4.3.2"
@@ -462,31 +460,31 @@ __metadata:
     js-yaml: "npm:^4.1.0"
     minimatch: "npm:^3.1.2"
     strip-json-comments: "npm:^3.1.1"
-  checksum: 10c0/43867a07ff9884d895d9855edba41acf325ef7664a8df41d957135a81a477ff4df4196f5f74dc3382627e5cc8b7ad6b815c2cea1b58f04a75aced7c43414ab8b
+  checksum: 10c0/215de990231b31e2fe6458f225d8cea0f5c781d3ecb0b7920703501f8cd21b3101fc5ef2f0d4f9a38865d36647b983e0e8ce8bf12fd2bcdd227fc48a5b1a43be
   languageName: node
   linkType: hard
 
-"@eslint/js@npm:9.20.0, @eslint/js@npm:^9.20.0":
-  version: 9.20.0
-  resolution: "@eslint/js@npm:9.20.0"
-  checksum: 10c0/10e7b5b9e628b5192e8fc6b0ecd27cf48322947e83e999ff60f9f9e44ac8d499138bcb9383cbfa6e51e780d53b4e76ccc2d1753b108b7173b8404fd484d37328
+"@eslint/js@npm:9.22.0, @eslint/js@npm:^9.22.0":
+  version: 9.22.0
+  resolution: "@eslint/js@npm:9.22.0"
+  checksum: 10c0/5bcd009bb579dc6c6ed760703bdd741e08a48cd9decd677aa2cf67fe66236658cb09a00185a0369f3904e5cffba9e6e0f2ff4d9ba4fdf598fcd81d34c49213a5
   languageName: node
   linkType: hard
 
-"@eslint/object-schema@npm:^2.1.4":
-  version: 2.1.4
-  resolution: "@eslint/object-schema@npm:2.1.4"
-  checksum: 10c0/e9885532ea70e483fb007bf1275968b05bb15ebaa506d98560c41a41220d33d342e19023d5f2939fed6eb59676c1bda5c847c284b4b55fce521d282004da4dda
+"@eslint/object-schema@npm:^2.1.6":
+  version: 2.1.6
+  resolution: "@eslint/object-schema@npm:2.1.6"
+  checksum: 10c0/b8cdb7edea5bc5f6a96173f8d768d3554a628327af536da2fc6967a93b040f2557114d98dbcdbf389d5a7b290985ad6a9ce5babc547f36fc1fde42e674d11a56
   languageName: node
   linkType: hard
 
-"@eslint/plugin-kit@npm:^0.2.5":
-  version: 0.2.5
-  resolution: "@eslint/plugin-kit@npm:0.2.5"
+"@eslint/plugin-kit@npm:^0.2.7":
+  version: 0.2.7
+  resolution: "@eslint/plugin-kit@npm:0.2.7"
   dependencies:
-    "@eslint/core": "npm:^0.10.0"
+    "@eslint/core": "npm:^0.12.0"
     levn: "npm:^0.4.1"
-  checksum: 10c0/ba9832b8409af618cf61791805fe201dd62f3c82c783adfcec0f5cd391e68b40beaecb47b9a3209e926dbcab65135f410cae405b69a559197795793399f61176
+  checksum: 10c0/0a1aff1ad63e72aca923217e556c6dfd67d7cd121870eb7686355d7d1475d569773528a8b2111b9176f3d91d2ea81f7413c34600e8e5b73d59e005d70780b633
   languageName: node
   linkType: hard
 
@@ -521,10 +519,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@humanwhocodes/retry@npm:^0.4.1":
-  version: 0.4.1
-  resolution: "@humanwhocodes/retry@npm:0.4.1"
-  checksum: 10c0/be7bb6841c4c01d0b767d9bb1ec1c9359ee61421ce8ba66c249d035c5acdfd080f32d55a5c9e859cdd7868788b8935774f65b2caf24ec0b7bd7bf333791f063b
+"@humanwhocodes/retry@npm:^0.4.2":
+  version: 0.4.2
+  resolution: "@humanwhocodes/retry@npm:0.4.2"
+  checksum: 10c0/0235525d38f243bee3bf8b25ed395fbf957fb51c08adae52787e1325673071abe856c7e18e530922ed2dd3ce12ed82ba01b8cee0279ac52a3315fcdc3a69ef0c
   languageName: node
   linkType: hard
 
@@ -1075,12 +1073,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:^22.13.1":
-  version: 22.13.1
-  resolution: "@types/node@npm:22.13.1"
+"@types/node@npm:^22.13.11":
+  version: 22.13.11
+  resolution: "@types/node@npm:22.13.11"
   dependencies:
     undici-types: "npm:~6.20.0"
-  checksum: 10c0/d4e56d41d8bd53de93da2651c0a0234e330bd7b1b6d071b1a94bd3b5ee2d9f387519e739c52a15c1faa4fb9d97e825b848421af4b2e50e6518011e7adb4a34b7
+  checksum: 10c0/f6ee33d36372242535c38640fe7550a6640d8a775ec19b55bfc11775b521cba072d892ca92a912332ce01b317293d645c1bf767f3f882ec719f2404a3d2a5b96
   languageName: node
   linkType: hard
 
@@ -1116,15 +1114,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/eslint-plugin@npm:^8.23.0":
-  version: 8.23.0
-  resolution: "@typescript-eslint/eslint-plugin@npm:8.23.0"
+"@typescript-eslint/eslint-plugin@npm:^8.27.0":
+  version: 8.27.0
+  resolution: "@typescript-eslint/eslint-plugin@npm:8.27.0"
   dependencies:
     "@eslint-community/regexpp": "npm:^4.10.0"
-    "@typescript-eslint/scope-manager": "npm:8.23.0"
-    "@typescript-eslint/type-utils": "npm:8.23.0"
-    "@typescript-eslint/utils": "npm:8.23.0"
-    "@typescript-eslint/visitor-keys": "npm:8.23.0"
+    "@typescript-eslint/scope-manager": "npm:8.27.0"
+    "@typescript-eslint/type-utils": "npm:8.27.0"
+    "@typescript-eslint/utils": "npm:8.27.0"
+    "@typescript-eslint/visitor-keys": "npm:8.27.0"
     graphemer: "npm:^1.4.0"
     ignore: "npm:^5.3.1"
     natural-compare: "npm:^1.4.0"
@@ -1132,65 +1130,65 @@ __metadata:
   peerDependencies:
     "@typescript-eslint/parser": ^8.0.0 || ^8.0.0-alpha.0
     eslint: ^8.57.0 || ^9.0.0
-    typescript: ">=4.8.4 <5.8.0"
-  checksum: 10c0/6c760a5f90748774f79a1b701f85fe6d99e89f289bc33993009987b0ffe2d13b3960ce595d452a937f3413af3918c76830659317242c05e49db40ceaca593033
+    typescript: ">=4.8.4 <5.9.0"
+  checksum: 10c0/95bbab011bfe51ca657ff346e4c6cac25652c88e5188a5e74d14372dba45c3d7aa713f4c90f80ebc885d77a8be89e131e8b77c096145c90da6c251a475b125fc
   languageName: node
   linkType: hard
 
-"@typescript-eslint/parser@npm:^8.23.0":
-  version: 8.23.0
-  resolution: "@typescript-eslint/parser@npm:8.23.0"
+"@typescript-eslint/parser@npm:^8.27.0":
+  version: 8.27.0
+  resolution: "@typescript-eslint/parser@npm:8.27.0"
   dependencies:
-    "@typescript-eslint/scope-manager": "npm:8.23.0"
-    "@typescript-eslint/types": "npm:8.23.0"
-    "@typescript-eslint/typescript-estree": "npm:8.23.0"
-    "@typescript-eslint/visitor-keys": "npm:8.23.0"
+    "@typescript-eslint/scope-manager": "npm:8.27.0"
+    "@typescript-eslint/types": "npm:8.27.0"
+    "@typescript-eslint/typescript-estree": "npm:8.27.0"
+    "@typescript-eslint/visitor-keys": "npm:8.27.0"
     debug: "npm:^4.3.4"
   peerDependencies:
     eslint: ^8.57.0 || ^9.0.0
-    typescript: ">=4.8.4 <5.8.0"
-  checksum: 10c0/f9e0f83a6dd97a9049d4ce23d660a1d4d5f3c57be8efc68e2258e6b2d5b823086d188b534f791a3412ef10d211fe4916b378254728150094c4f8b0ab44aae2a7
+    typescript: ">=4.8.4 <5.9.0"
+  checksum: 10c0/2ada98167ca5a474544fada7658d7c8d54ea4dfdd692e3d30d18b5531e50d7308a5b09d23dca651f9fe841f96075ccd18643431f4b61d0e4e7e7ccde888258e8
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:8.23.0":
-  version: 8.23.0
-  resolution: "@typescript-eslint/scope-manager@npm:8.23.0"
+"@typescript-eslint/scope-manager@npm:8.27.0":
+  version: 8.27.0
+  resolution: "@typescript-eslint/scope-manager@npm:8.27.0"
   dependencies:
-    "@typescript-eslint/types": "npm:8.23.0"
-    "@typescript-eslint/visitor-keys": "npm:8.23.0"
-  checksum: 10c0/625b524a4fc25667b20f3541da84674af9c2abfac6596e30f7a40085513172bf1aac125488b32885894e3ef6596a0d06dec9a65ed4562884e0bca87a758600fa
+    "@typescript-eslint/types": "npm:8.27.0"
+    "@typescript-eslint/visitor-keys": "npm:8.27.0"
+  checksum: 10c0/d87daeffb81f4e70f168c38f01c667713bda71c4545e28fcdf0792378fb3df171894ef77854c5c1a5e5a22c784ee1ccea2dd856b5baf825840710a6a74c14ac9
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:8.23.0":
-  version: 8.23.0
-  resolution: "@typescript-eslint/type-utils@npm:8.23.0"
+"@typescript-eslint/type-utils@npm:8.27.0":
+  version: 8.27.0
+  resolution: "@typescript-eslint/type-utils@npm:8.27.0"
   dependencies:
-    "@typescript-eslint/typescript-estree": "npm:8.23.0"
-    "@typescript-eslint/utils": "npm:8.23.0"
+    "@typescript-eslint/typescript-estree": "npm:8.27.0"
+    "@typescript-eslint/utils": "npm:8.27.0"
     debug: "npm:^4.3.4"
     ts-api-utils: "npm:^2.0.1"
   peerDependencies:
     eslint: ^8.57.0 || ^9.0.0
-    typescript: ">=4.8.4 <5.8.0"
-  checksum: 10c0/a98dc2f2f75ec2132176428011ba620ad5b641a04e9e18471a7b9f979f6966a76aeaf6e51072c5364de68f83832a3a77b04518ec65c3092dadbd033d03fb5e35
+    typescript: ">=4.8.4 <5.9.0"
+  checksum: 10c0/f38cdc660ebcb3b71496182b9ea52301ab08a4f062558aa7061a5f0b759ae3e8f68ae250a29e74251cb52c6c56733d7dabed7002b993544cbe0933bb75d67a57
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:8.23.0":
-  version: 8.23.0
-  resolution: "@typescript-eslint/types@npm:8.23.0"
-  checksum: 10c0/78737a14e8469e33212d9bbc26d6880bca3f8e47764273eb4c662f5ed38d0b35c626d646d4a8e9a6ee64a0e352b18dd36422e59ce217362b5af473b79d058b35
+"@typescript-eslint/types@npm:8.27.0":
+  version: 8.27.0
+  resolution: "@typescript-eslint/types@npm:8.27.0"
+  checksum: 10c0/9c5f2ba816a9baea5982feeadebe4d19f4df77ddb025a7b2307f9e1e6914076b63cbad81f7f915814e64b4d915052cf27bd79ce3e5a831340cb5ab244133941b
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:8.23.0":
-  version: 8.23.0
-  resolution: "@typescript-eslint/typescript-estree@npm:8.23.0"
+"@typescript-eslint/typescript-estree@npm:8.27.0":
+  version: 8.27.0
+  resolution: "@typescript-eslint/typescript-estree@npm:8.27.0"
   dependencies:
-    "@typescript-eslint/types": "npm:8.23.0"
-    "@typescript-eslint/visitor-keys": "npm:8.23.0"
+    "@typescript-eslint/types": "npm:8.27.0"
+    "@typescript-eslint/visitor-keys": "npm:8.27.0"
     debug: "npm:^4.3.4"
     fast-glob: "npm:^3.3.2"
     is-glob: "npm:^4.0.3"
@@ -1198,33 +1196,33 @@ __metadata:
     semver: "npm:^7.6.0"
     ts-api-utils: "npm:^2.0.1"
   peerDependencies:
-    typescript: ">=4.8.4 <5.8.0"
-  checksum: 10c0/2cc8defb3d9b25b899a62c6b6ca26c442433bf95f626f6275935e2754d9a74abb0015c737de27038b0f378273e67e61120d9cf2941c44848e4bffbbc297fdf74
+    typescript: ">=4.8.4 <5.9.0"
+  checksum: 10c0/c04d602825ff2a7b2a89746a68b32f7052fb4ce3d2355d1f4e6f43fd064f17c3b44fb974c98838a078fdebdc35152d2ab0af34663dfca99db7a790bd3fc5d8ac
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:8.23.0":
-  version: 8.23.0
-  resolution: "@typescript-eslint/utils@npm:8.23.0"
+"@typescript-eslint/utils@npm:8.27.0":
+  version: 8.27.0
+  resolution: "@typescript-eslint/utils@npm:8.27.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.4.0"
-    "@typescript-eslint/scope-manager": "npm:8.23.0"
-    "@typescript-eslint/types": "npm:8.23.0"
-    "@typescript-eslint/typescript-estree": "npm:8.23.0"
+    "@typescript-eslint/scope-manager": "npm:8.27.0"
+    "@typescript-eslint/types": "npm:8.27.0"
+    "@typescript-eslint/typescript-estree": "npm:8.27.0"
   peerDependencies:
     eslint: ^8.57.0 || ^9.0.0
-    typescript: ">=4.8.4 <5.8.0"
-  checksum: 10c0/8967cf6543b1df2fb8d29086a0d35f5f7623e935706ad7c5bfcc6123e6fb08a767be1770601d481d815022bec43422730c6c8035892f23cd11cdadb16176b418
+    typescript: ">=4.8.4 <5.9.0"
+  checksum: 10c0/dcfd5f2c17f1a33061e3ec70d0946ff23a4238aabacae3d85087165beccedf84fb8506d30848f2470e3b60ab98b230aef79c6e8b4c5d39648a37ac559ac5b1e0
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:8.23.0":
-  version: 8.23.0
-  resolution: "@typescript-eslint/visitor-keys@npm:8.23.0"
+"@typescript-eslint/visitor-keys@npm:8.27.0":
+  version: 8.27.0
+  resolution: "@typescript-eslint/visitor-keys@npm:8.27.0"
   dependencies:
-    "@typescript-eslint/types": "npm:8.23.0"
+    "@typescript-eslint/types": "npm:8.27.0"
     eslint-visitor-keys: "npm:^4.2.0"
-  checksum: 10c0/a406f78aa18b4efb2adf26e3a6ca48c9a6f2cc9545e083b50efaaf90f0a80d2bea79ceda51da1f109706d4138756b0978a323b9176c9a6a519e87168851e7e16
+  checksum: 10c0/d86fd4032db07123816aab3a6b8b53f840387385ab2a4d8f96b22fc76b5438fb27ac8dc42b63caf23f3d265c33e9075dbf1ce8d31f939df12f5cd077d3b10295
   languageName: node
   linkType: hard
 
@@ -1297,28 +1295,28 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "ankidroid-localization@workspace:."
   dependencies:
-    "@crowdin/crowdin-api-client": "npm:^1.41.1"
-    "@eslint/eslintrc": "npm:^3.2.0"
-    "@eslint/js": "npm:^9.20.0"
+    "@crowdin/crowdin-api-client": "npm:^1.41.2"
+    "@eslint/eslintrc": "npm:^3.3.0"
+    "@eslint/js": "npm:^9.22.0"
     "@types/jest": "npm:^29.5.14"
-    "@types/node": "npm:^22.13.1"
-    "@typescript-eslint/eslint-plugin": "npm:^8.23.0"
-    "@typescript-eslint/parser": "npm:^8.23.0"
-    axios: "npm:^1.7.9"
+    "@types/node": "npm:^22.13.11"
+    "@typescript-eslint/eslint-plugin": "npm:^8.27.0"
+    "@typescript-eslint/parser": "npm:^8.27.0"
+    axios: "npm:^1.8.4"
     dotenv: "npm:^16.4.7"
-    eslint: "npm:^9.20.0"
-    eslint-config-prettier: "npm:^10.0.1"
+    eslint: "npm:^9.22.0"
+    eslint-config-prettier: "npm:^10.1.1"
     eslint-config-standard: "npm:^17.1.0"
     eslint-plugin-import: "npm:^2.31.0"
-    eslint-plugin-n: "npm:^17.15.1"
+    eslint-plugin-n: "npm:^17.16.2"
     eslint-plugin-promise: "npm:^7.2.1"
     extract-zip: "npm:^2.0.1"
     globals: "npm:^15.14.0"
     jest: "npm:^29.7.0"
-    prettier: "npm:^3.5.0"
-    ts-jest: "npm:^29.2.5"
+    prettier: "npm:^3.5.3"
+    ts-jest: "npm:^29.2.6"
     ts-node: "npm:^10.9.2"
-    typescript: "npm:^5.7.3"
+    typescript: "npm:^5.8.2"
   languageName: unknown
   linkType: soft
 
@@ -1513,14 +1511,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"axios@npm:^1.7.9":
-  version: 1.7.9
-  resolution: "axios@npm:1.7.9"
+"axios@npm:^1.8.4":
+  version: 1.8.4
+  resolution: "axios@npm:1.8.4"
   dependencies:
     follow-redirects: "npm:^1.15.6"
     form-data: "npm:^4.0.0"
     proxy-from-env: "npm:^1.1.0"
-  checksum: 10c0/b7a41e24b59fee5f0f26c1fc844b45b17442832eb3a0fb42dd4f1430eb4abc571fe168e67913e8a1d91c993232bd1d1ab03e20e4d1fee8c6147649b576fc1b0b
+  checksum: 10c0/450993c2ba975ffccaf0d480b68839a3b2435a5469a71fa2fb0b8a55cdb2c2ae47e609360b9c1e2b2534b73dfd69e2733a1cf9f8215bee0bcd729b72f801b0ce
   languageName: node
   linkType: hard
 
@@ -2274,14 +2272,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-config-prettier@npm:^10.0.1":
-  version: 10.0.1
-  resolution: "eslint-config-prettier@npm:10.0.1"
+"eslint-config-prettier@npm:^10.1.1":
+  version: 10.1.1
+  resolution: "eslint-config-prettier@npm:10.1.1"
   peerDependencies:
     eslint: ">=7.0.0"
   bin:
-    eslint-config-prettier: build/bin/cli.js
-  checksum: 10c0/e2434931669d211663c0493f2c1640a670a02ba4503a68f056a7eda133f383acbbb983a4a7bd0ad6cb3b2bc4d5731c3be8b32fe28e35087a76fea45f7061ae70
+    eslint-config-prettier: bin/cli.js
+  checksum: 10c0/3dbfdf6495dd62e2e1644ea9e8e978100dabcd8740fd264df1222d130001a1e8de05d6ed6c67d3a60727386a07507f067d1ca79af6d546910414beab19e7966e
   languageName: node
   linkType: hard
 
@@ -2362,9 +2360,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-n@npm:^17.15.1":
-  version: 17.15.1
-  resolution: "eslint-plugin-n@npm:17.15.1"
+"eslint-plugin-n@npm:^17.16.2":
+  version: 17.16.2
+  resolution: "eslint-plugin-n@npm:17.16.2"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.4.1"
     enhanced-resolve: "npm:^5.17.1"
@@ -2376,7 +2374,7 @@ __metadata:
     semver: "npm:^7.6.3"
   peerDependencies:
     eslint: ">=8.23.0"
-  checksum: 10c0/0b52ffed0b80d74977e1157b4c0cc79efcdf81ea35d2997bdbf02f3d41f428f52ccb7fb3a08cf02e6fed8ae1bf4708d69fdf496e75b8b2bd3e671029d89ccc6c
+  checksum: 10c0/25a77159b363814384b141d6f74b2c2e5787c58756c936f5547c01cb0e3b28f7ca4f32d77fe4214af6f1359dd35693380921395cdfc14c72595d89117ab92e9a
   languageName: node
   linkType: hard
 
@@ -2391,13 +2389,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-scope@npm:^8.2.0":
-  version: 8.2.0
-  resolution: "eslint-scope@npm:8.2.0"
+"eslint-scope@npm:^8.3.0":
+  version: 8.3.0
+  resolution: "eslint-scope@npm:8.3.0"
   dependencies:
     esrecurse: "npm:^4.3.0"
     estraverse: "npm:^5.2.0"
-  checksum: 10c0/8d2d58e2136d548ac7e0099b1a90d9fab56f990d86eb518de1247a7066d38c908be2f3df477a79cf60d70b30ba18735d6c6e70e9914dca2ee515a729975d70d6
+  checksum: 10c0/23bf54345573201fdf06d29efa345ab508b355492f6c6cc9e2b9f6d02b896f369b6dd5315205be94b8853809776c4d13353b85c6b531997b164ff6c3328ecf5b
   languageName: node
   linkType: hard
 
@@ -2415,20 +2413,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint@npm:^9.20.0":
-  version: 9.20.0
-  resolution: "eslint@npm:9.20.0"
+"eslint@npm:^9.22.0":
+  version: 9.22.0
+  resolution: "eslint@npm:9.22.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.2.0"
     "@eslint-community/regexpp": "npm:^4.12.1"
-    "@eslint/config-array": "npm:^0.19.0"
-    "@eslint/core": "npm:^0.11.0"
-    "@eslint/eslintrc": "npm:^3.2.0"
-    "@eslint/js": "npm:9.20.0"
-    "@eslint/plugin-kit": "npm:^0.2.5"
+    "@eslint/config-array": "npm:^0.19.2"
+    "@eslint/config-helpers": "npm:^0.1.0"
+    "@eslint/core": "npm:^0.12.0"
+    "@eslint/eslintrc": "npm:^3.3.0"
+    "@eslint/js": "npm:9.22.0"
+    "@eslint/plugin-kit": "npm:^0.2.7"
     "@humanfs/node": "npm:^0.16.6"
     "@humanwhocodes/module-importer": "npm:^1.0.1"
-    "@humanwhocodes/retry": "npm:^0.4.1"
+    "@humanwhocodes/retry": "npm:^0.4.2"
     "@types/estree": "npm:^1.0.6"
     "@types/json-schema": "npm:^7.0.15"
     ajv: "npm:^6.12.4"
@@ -2436,7 +2435,7 @@ __metadata:
     cross-spawn: "npm:^7.0.6"
     debug: "npm:^4.3.2"
     escape-string-regexp: "npm:^4.0.0"
-    eslint-scope: "npm:^8.2.0"
+    eslint-scope: "npm:^8.3.0"
     eslint-visitor-keys: "npm:^4.2.0"
     espree: "npm:^10.3.0"
     esquery: "npm:^1.5.0"
@@ -2460,7 +2459,7 @@ __metadata:
       optional: true
   bin:
     eslint: bin/eslint.js
-  checksum: 10c0/5eb2d9b5ed85a0b022871d19719417d110afb07a4abfedd856ad03d9a821def5f6bc31d7c407ca27f56e5e66e39375300fd2b877017245eb99c44060d6c983bd
+  checksum: 10c0/7b5ab6f2365971c16efe97349565f75d8343347562fb23f12734c6ab2cd5e35301373a0d51e194789ddcfdfca21db7b62ff481b03d524b8169896c305b65ff48
   languageName: node
   linkType: hard
 
@@ -4730,12 +4729,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prettier@npm:^3.5.0":
-  version: 3.5.0
-  resolution: "prettier@npm:3.5.0"
+"prettier@npm:^3.5.3":
+  version: 3.5.3
+  resolution: "prettier@npm:3.5.3"
   bin:
     prettier: bin/prettier.cjs
-  checksum: 10c0/6c355d74c377f5622953229d92477e8b9779162e848db90fd7e06c431deb73585d31fafc4516cf5868917825b97b9ec7c87c8d8b8e03ccd9fc9c0b7699d1a650
+  checksum: 10c0/3880cb90b9dc0635819ab52ff571518c35bd7f15a6e80a2054c05dbc8a3aa6e74f135519e91197de63705bcb38388ded7e7230e2178432a1468005406238b877
   languageName: node
   linkType: hard
 
@@ -4990,6 +4989,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"semver@npm:^7.7.1":
+  version: 7.7.1
+  resolution: "semver@npm:7.7.1"
+  bin:
+    semver: bin/semver.js
+  checksum: 10c0/fd603a6fb9c399c6054015433051bdbe7b99a940a8fb44b85c2b524c4004b023d7928d47cb22154f8d054ea7ee8597f586605e05b52047f048278e4ac56ae958
+  languageName: node
+  linkType: hard
+
 "set-function-length@npm:^1.2.1":
   version: 1.2.2
   resolution: "set-function-length@npm:1.2.2"
@@ -5343,9 +5351,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ts-jest@npm:^29.2.5":
-  version: 29.2.5
-  resolution: "ts-jest@npm:29.2.5"
+"ts-jest@npm:^29.2.6":
+  version: 29.2.6
+  resolution: "ts-jest@npm:29.2.6"
   dependencies:
     bs-logger: "npm:^0.2.6"
     ejs: "npm:^3.1.10"
@@ -5354,7 +5362,7 @@ __metadata:
     json5: "npm:^2.2.3"
     lodash.memoize: "npm:^4.1.2"
     make-error: "npm:^1.3.6"
-    semver: "npm:^7.6.3"
+    semver: "npm:^7.7.1"
     yargs-parser: "npm:^21.1.1"
   peerDependencies:
     "@babel/core": ">=7.0.0-beta.0 <8"
@@ -5376,7 +5384,7 @@ __metadata:
       optional: true
   bin:
     ts-jest: cli.js
-  checksum: 10c0/acb62d168faec073e64b20873b583974ba8acecdb94681164eb346cef82ade8fb481c5b979363e01a97ce4dd1e793baf64d9efd90720bc941ad7fc1c3d6f3f68
+  checksum: 10c0/2a79bdb2631bbd004cd6ec171d62dc3681b86e7d1c20eece7f56e7c3df11a0f5a14f4831960b1ba8d1836787395c8f9dcbd084fd7f59246bbee8048feb93f892
   languageName: node
   linkType: hard
 
@@ -5506,23 +5514,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@npm:^5.7.3":
-  version: 5.7.3
-  resolution: "typescript@npm:5.7.3"
+"typescript@npm:^5.8.2":
+  version: 5.8.2
+  resolution: "typescript@npm:5.8.2"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 10c0/b7580d716cf1824736cc6e628ab4cd8b51877408ba2be0869d2866da35ef8366dd6ae9eb9d0851470a39be17cbd61df1126f9e211d8799d764ea7431d5435afa
+  checksum: 10c0/5c4f6fbf1c6389b6928fe7b8fcd5dc73bb2d58cd4e3883f1d774ed5bd83b151cbac6b7ecf11723de56d4676daeba8713894b1e9af56174f2f9780ae7848ec3c6
   languageName: node
   linkType: hard
 
-"typescript@patch:typescript@npm%3A^5.7.3#optional!builtin<compat/typescript>":
-  version: 5.7.3
-  resolution: "typescript@patch:typescript@npm%3A5.7.3#optional!builtin<compat/typescript>::version=5.7.3&hash=5786d5"
+"typescript@patch:typescript@npm%3A^5.8.2#optional!builtin<compat/typescript>":
+  version: 5.8.2
+  resolution: "typescript@patch:typescript@npm%3A5.8.2#optional!builtin<compat/typescript>::version=5.8.2&hash=5786d5"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 10c0/6fd7e0ed3bf23a81246878c613423730c40e8bdbfec4c6e4d7bf1b847cbb39076e56ad5f50aa9d7ebd89877999abaee216002d3f2818885e41c907caaa192cc4
+  checksum: 10c0/5448a08e595cc558ab321e49d4cac64fb43d1fa106584f6ff9a8d8e592111b373a995a1d5c7f3046211c8a37201eb6d0f1566f15cdb7a62a5e3be01d087848e2
   languageName: node
   linkType: hard
 

From 13005d81c1f4f4d48ab9be4574ee723b47b190b5 Mon Sep 17 00:00:00 2001
From: Spencer Poisseroux <spoisseroux@me.com>
Date: Fri, 14 Mar 2025 12:29:07 -0400
Subject: [PATCH 138/200] Enforce user-facing locale checks via lint; fixes
 #8917

Added lint rule to ensure proper locale usage in text formatting

- Implemented custom `LocaleRootDetector` to flag `Locale.ROOT` in user-facing
  formatting methods (e.g. String.format, NumberFormat)
- Enabled `DefaultLocale` check to require explicit Locale parameters
- Fixed violations in AxisValueDisplay and other components

Testing:
- Ran `./gradlew lint` to verify new checks flag violations
---
 .../java/com/ichi2/libanki/sched/DeckNode.kt  |   2 +
 .../java/com/ichi2/ui/AxisValueDisplay.kt     |   3 +-
 .../main/java/com/ichi2/utils/AdaptionUtil.kt |   3 +
 .../main/java/com/ichi2/utils/AssetHelper.kt  |   2 +
 .../main/java/com/ichi2/utils/ImportUtils.kt  |   4 +
 lint-release.xml                              |   3 +-
 .../java/com/ichi2/anki/lint/IssueRegistry.kt |   2 +
 .../anki/lint/rules/LocaleRootDetector.kt     | 111 ++++++++++++++++++
 .../anki/lint/rules/LocaleRootDetectorTest.kt |  79 +++++++++++++
 9 files changed, 207 insertions(+), 2 deletions(-)
 create mode 100644 lint-rules/src/main/java/com/ichi2/anki/lint/rules/LocaleRootDetector.kt
 create mode 100644 lint-rules/src/test/java/com/ichi2/anki/lint/rules/LocaleRootDetectorTest.kt

diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/sched/DeckNode.kt b/AnkiDroid/src/main/java/com/ichi2/libanki/sched/DeckNode.kt
index 6c4cd2c7d378..d526be019271 100644
--- a/AnkiDroid/src/main/java/com/ichi2/libanki/sched/DeckNode.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/libanki/sched/DeckNode.kt
@@ -15,6 +15,7 @@
  */
 package com.ichi2.libanki.sched
 
+import android.annotation.SuppressLint
 import anki.decks.DeckTreeNode
 import com.ichi2.libanki.DeckId
 import com.ichi2.libanki.utils.append
@@ -130,6 +131,7 @@ data class DeckNode(
         }
     }
 
+    @SuppressLint("LocaleRootUsage")
     private fun nameMatchesFilter(filter: CharSequence?): Boolean {
         return if (filter == null) {
             true
diff --git a/AnkiDroid/src/main/java/com/ichi2/ui/AxisValueDisplay.kt b/AnkiDroid/src/main/java/com/ichi2/ui/AxisValueDisplay.kt
index 794ec0806567..bdcf69a9b11b 100644
--- a/AnkiDroid/src/main/java/com/ichi2/ui/AxisValueDisplay.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/ui/AxisValueDisplay.kt
@@ -25,6 +25,7 @@ import android.util.AttributeSet
 import android.view.View
 import com.google.android.material.color.MaterialColors
 import com.ichi2.utils.dpToPixels
+import java.util.Locale
 import kotlin.math.abs
 import kotlin.math.max
 import kotlin.math.min
@@ -62,7 +63,7 @@ class AxisValueDisplay(
         set(value) {
             field = value
             this.postInvalidate()
-            text = String.format("%.3f", value)
+            text = String.format(Locale.getDefault(), "%.3f", value)
             if (isExtremity) {
                 extremityListener?.invoke(field)
             }
diff --git a/AnkiDroid/src/main/java/com/ichi2/utils/AdaptionUtil.kt b/AnkiDroid/src/main/java/com/ichi2/utils/AdaptionUtil.kt
index c0fc96c6512a..5427d10b220a 100644
--- a/AnkiDroid/src/main/java/com/ichi2/utils/AdaptionUtil.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/utils/AdaptionUtil.kt
@@ -15,6 +15,7 @@
  ****************************************************************************************/
 package com.ichi2.utils
 
+import android.annotation.SuppressLint
 import android.app.ActivityManager
 import android.content.ContentResolver
 import android.content.Context
@@ -132,7 +133,9 @@ object AdaptionUtil {
     }
 
     /** See: https://en.wikipedia.org/wiki/Vivo_(technology_company)  */
+
     val isVivo: Boolean
+        @SuppressLint("LocaleRootUsage")
         get() {
             val manufacturer = Build.MANUFACTURER ?: return false
             return manufacturer.lowercase(Locale.ROOT) == "vivo"
diff --git a/AnkiDroid/src/main/java/com/ichi2/utils/AssetHelper.kt b/AnkiDroid/src/main/java/com/ichi2/utils/AssetHelper.kt
index 53950ef04f6c..9d320d07e6a3 100644
--- a/AnkiDroid/src/main/java/com/ichi2/utils/AssetHelper.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/utils/AssetHelper.kt
@@ -35,6 +35,7 @@
  */
 package com.ichi2.utils
 
+import android.annotation.SuppressLint
 import android.net.Uri
 import android.webkit.MimeTypeMap
 import java.io.File
@@ -46,6 +47,7 @@ object AssetHelper {
      Returns the extension of [path].
      It uses [MimeTypeMap.getFileExtensionFromUrl], with the path transformed into a Uri.
      */
+    @SuppressLint("LocaleRootUsage")
     fun getFileExtensionFromFilePath(path: String): String =
         MimeTypeMap.getFileExtensionFromUrl(
             Uri.fromFile(File(path)).toString().lowercase(
diff --git a/AnkiDroid/src/main/java/com/ichi2/utils/ImportUtils.kt b/AnkiDroid/src/main/java/com/ichi2/utils/ImportUtils.kt
index d45a841af5de..8fb48c11c76f 100644
--- a/AnkiDroid/src/main/java/com/ichi2/utils/ImportUtils.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/utils/ImportUtils.kt
@@ -16,6 +16,7 @@
 
 package com.ichi2.utils
 
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.ContentResolver
 import android.content.Context
@@ -84,6 +85,7 @@ object ImportUtils {
         FileImporter().showImportUnsuccessfulDialog(activity, errorMessage, exitActivity)
     }
 
+    @SuppressLint("LocaleRootUsage")
     fun isCollectionPackage(filename: String?): Boolean =
         filename != null && (filename.lowercase(Locale.ROOT).endsWith(".colpkg") || "collection.apkg" == filename)
 
@@ -419,9 +421,11 @@ object ImportUtils {
                 DialogHandler.storeMessage(dialogMessage.toMessage())
             }
 
+            @SuppressLint("LocaleRootUsage")
             internal fun isDeckPackage(filename: String?): Boolean =
                 filename != null && filename.lowercase(Locale.ROOT).endsWith(".apkg") && "collection.apkg" != filename
 
+            @SuppressLint("LocaleRootUsage")
             fun hasExtension(
                 filename: String,
                 extension: String?,
diff --git a/lint-release.xml b/lint-release.xml
index 5518f8a788ab..47a3ee9853e4 100644
--- a/lint-release.xml
+++ b/lint-release.xml
@@ -347,8 +347,9 @@
     <issue id="InconsistentLayout" severity="ignore" />
     <issue id="InflateParams" severity="ignore" />
     <issue id="StaticFieldLeak" severity="ignore" />
-    <issue id="DefaultLocale" severity="ignore" />
+    <issue id="DefaultLocale" severity="error" />
     <issue id="LocaleFolder" severity="ignore" />
+    <issue id="LocaleRootUsage" severity="error" />
     <issue id="GetLocales" severity="ignore" />
     <issue id="InvalidResourceFolder" severity="ignore" />
     <issue id="WrongRegion" severity="ignore" />
diff --git a/lint-rules/src/main/java/com/ichi2/anki/lint/IssueRegistry.kt b/lint-rules/src/main/java/com/ichi2/anki/lint/IssueRegistry.kt
index 0d2cf1e7a91a..b60e1fb81085 100644
--- a/lint-rules/src/main/java/com/ichi2/anki/lint/IssueRegistry.kt
+++ b/lint-rules/src/main/java/com/ichi2/anki/lint/IssueRegistry.kt
@@ -35,6 +35,7 @@ import com.ichi2.anki.lint.rules.FixedPreferencesTitleLength
 import com.ichi2.anki.lint.rules.HardcodedPreferenceKey
 import com.ichi2.anki.lint.rules.InvalidStringFormatDetector
 import com.ichi2.anki.lint.rules.JUnitNullAssertionDetector
+import com.ichi2.anki.lint.rules.LocaleRootDetector
 import com.ichi2.anki.lint.rules.NonPositionalFormatSubstitutions
 import com.ichi2.anki.lint.rules.PrintStackTraceUsage
 import com.ichi2.anki.lint.rules.TranslationTypo
@@ -57,6 +58,7 @@ class IssueRegistry : IssueRegistry() {
                 DuplicateCrowdInStrings.ISSUE,
                 HardcodedPreferenceKey.ISSUE,
                 JUnitNullAssertionDetector.ISSUE,
+                LocaleRootDetector.ISSUE,
                 PrintStackTraceUsage.ISSUE,
                 NonPositionalFormatSubstitutions.ISSUE,
                 TranslationTypo.ISSUE,
diff --git a/lint-rules/src/main/java/com/ichi2/anki/lint/rules/LocaleRootDetector.kt b/lint-rules/src/main/java/com/ichi2/anki/lint/rules/LocaleRootDetector.kt
new file mode 100644
index 000000000000..a78bb6c570e7
--- /dev/null
+++ b/lint-rules/src/main/java/com/ichi2/anki/lint/rules/LocaleRootDetector.kt
@@ -0,0 +1,111 @@
+/*
+ *  Copyright (c) 2024 Spencer Poisseroux <me@spoisseroux.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify it under
+ *  the terms of the GNU General Public License as published by the Free Software
+ *  Foundation; either version 3 of the License, or (at your option) any later
+ *  version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ *  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ *  PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with
+ *  this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+@file:Suppress("UnstableApiUsage")
+
+package com.ichi2.anki.lint.rules
+
+import com.android.tools.lint.client.api.UElementHandler
+import com.android.tools.lint.detector.api.Detector
+import com.android.tools.lint.detector.api.Implementation
+import com.android.tools.lint.detector.api.Issue
+import com.android.tools.lint.detector.api.JavaContext
+import com.android.tools.lint.detector.api.LintFix
+import com.android.tools.lint.detector.api.Scope
+import com.android.tools.lint.detector.api.SourceCodeScanner
+import com.google.common.annotations.VisibleForTesting
+import com.ichi2.anki.lint.utils.Constants
+import com.intellij.psi.PsiField
+import org.jetbrains.uast.UCallExpression
+import org.jetbrains.uast.UExpression
+import org.jetbrains.uast.UQualifiedReferenceExpression
+import org.jetbrains.uast.UReferenceExpression
+
+/**
+ * Flags any usage of Locale.ROOT in code, requiring explicit suppression for valid cases.
+ */
+class LocaleRootDetector :
+    Detector(),
+    SourceCodeScanner {
+    companion object {
+        @VisibleForTesting
+        const val ID = "LocaleRootUsage"
+
+        @VisibleForTesting
+        const val DESCRIPTION = "Avoid using Locale.ROOT for user-facing text without explicit suppression"
+
+        private const val EXPLANATION =
+            "Using Locale.ROOT for user-facing text formatting is discouraged. " +
+                "Please use Locale.getDefault() or the device's locale for proper localization, or suppress."
+
+        private val implementation =
+            Implementation(
+                LocaleRootDetector::class.java,
+                Scope.JAVA_FILE_SCOPE,
+            )
+
+        val ISSUE: Issue =
+            Issue.create(
+                ID,
+                DESCRIPTION,
+                EXPLANATION,
+                Constants.ANKI_TIME_CATEGORY,
+                Constants.ANKI_TIME_PRIORITY,
+                Constants.ANKI_TIME_SEVERITY,
+                implementation,
+            )
+    }
+
+    override fun getApplicableUastTypes() = listOf(UCallExpression::class.java)
+
+    override fun createUastHandler(context: JavaContext): UElementHandler =
+        object : UElementHandler() {
+            override fun visitCallExpression(node: UCallExpression) {
+                node.valueArguments.forEach { arg ->
+                    if (isLocaleRootUsage(arg as? UExpression)) {
+                        context.report(
+                            ISSUE,
+                            arg,
+                            context.getLocation(arg),
+                            DESCRIPTION,
+                            createFix(),
+                        )
+                    }
+                }
+            }
+        }
+
+    private fun isLocaleRootUsage(arg: UExpression?): Boolean {
+        val uRef = arg as? UQualifiedReferenceExpression ?: return false
+        val receiver = uRef.receiver
+        val selector = uRef.selector as? UReferenceExpression ?: return false
+
+        // Check if receiver is "Locale" and selector resolves to Locale.ROOT
+        val receiverText = receiver.asSourceString()
+        val resolvedField = selector.resolve() as? PsiField ?: return false
+
+        return receiverText == "Locale" &&
+            resolvedField.containingClass?.qualifiedName == "java.util.Locale" &&
+            resolvedField.name == "ROOT"
+    }
+
+    private fun createFix(): LintFix =
+        fix()
+            .name("Replace with Locale.getDefault(), or suppress")
+            .replace()
+            .text("Locale.ROOT")
+            .with("Locale.getDefault()")
+            .build()
+}
diff --git a/lint-rules/src/test/java/com/ichi2/anki/lint/rules/LocaleRootDetectorTest.kt b/lint-rules/src/test/java/com/ichi2/anki/lint/rules/LocaleRootDetectorTest.kt
new file mode 100644
index 000000000000..aef5d461a696
--- /dev/null
+++ b/lint-rules/src/test/java/com/ichi2/anki/lint/rules/LocaleRootDetectorTest.kt
@@ -0,0 +1,79 @@
+/****************************************************************************************
+ * Copyright (c) 2024 Spencer Poisseroux <me@spoisseroux.com>                           *
+ *                                                                                      *
+ * This program is free software; you can redistribute it and/or modify it under        *
+ * the terms of the GNU General Public License as published by the Free Software        *
+ * Foundation; either version 3 of the License, or (at your option) any later           *
+ * version.                                                                             *
+ *                                                                                      *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY      *
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A      *
+ * PARTICULAR PURPOSE. See the GNU General Public License for more details.             *
+ *                                                                                      *
+ * You should have received a copy of the GNU General Public License along with         *
+ * this program.  If not, see <http://www.gnu.org/licenses/>.                           *
+ ****************************************************************************************/
+package com.ichi2.anki.lint.rules
+
+import com.android.tools.lint.checks.infrastructure.TestFile.JavaTestFile.create
+import com.android.tools.lint.checks.infrastructure.TestLintTask.lint
+import com.android.tools.lint.checks.infrastructure.TestMode
+import org.intellij.lang.annotations.Language
+import org.junit.Test
+
+class LocaleRootDetectorTest {
+    @Language("JAVA")
+    private val invalidCode =
+        """
+        package com.ichi2.test;
+        import java.util.Locale;
+        import java.text.NumberFormat;
+        import static java.util.Locale.ROOT;
+
+        public class InvalidClass {
+            public void invalidMethod() {
+                String.format(Locale.ROOT, "Number: %d", 42); // Should be flagged
+                NumberFormat.getInstance(ROOT); // Should be ignored, static import
+            }
+        }
+        """.trimIndent()
+
+    @Language("JAVA")
+    private val suppressedCode =
+        """
+        package com.ichi2.test;
+        import java.util.Locale;
+        import androidx.annotation.SuppressLint;
+
+        @SuppressLint("LocaleRootUsage")
+        public class SuppressedClass {
+            public void suppressedMethod() {
+                String id = String.format(Locale.ROOT, "ID_%d", 123);
+            }
+        }
+        """.trimIndent()
+
+    @Test
+    fun `allows suppressed Locale ROOT usage`() {
+        lint()
+            .testModes(TestMode.DEFAULT)
+            .allowMissingSdk()
+            .allowCompilationErrors()
+            .files(create(suppressedCode))
+            .issues(LocaleRootDetector.ISSUE)
+            .run()
+            .expectClean()
+    }
+
+    @Test
+    fun `detects explicit Locale ROOT usage`() {
+        lint()
+            .testModes(TestMode.DEFAULT)
+            .allowMissingSdk()
+            .files(create(invalidCode))
+            .issues(LocaleRootDetector.ISSUE)
+            .run()
+            .expectErrorCount(1)
+            .expectContains("String.format(Locale.ROOT")
+    }
+}

From f10e4acf463c8253cff3667210525a86f701dc23 Mon Sep 17 00:00:00 2001
From: Sydon1 <64132834+sydon1@users.noreply.github.com>
Date: Sun, 23 Mar 2025 18:16:28 +0100
Subject: [PATCH 139/200]  Fixed several Android Studio warnings #18104

---
 .../java/com/ichi2/anki/tests/libanki/MediaTest.kt          | 6 +++---
 .../src/test/java/com/ichi2/utils/UniqueArrayListTest.kt    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/AnkiDroid/src/androidTest/java/com/ichi2/anki/tests/libanki/MediaTest.kt b/AnkiDroid/src/androidTest/java/com/ichi2/anki/tests/libanki/MediaTest.kt
index e0a58ddc4045..70ece1eb27df 100644
--- a/AnkiDroid/src/androidTest/java/com/ichi2/anki/tests/libanki/MediaTest.kt
+++ b/AnkiDroid/src/androidTest/java/com/ichi2/anki/tests/libanki/MediaTest.kt
@@ -123,13 +123,13 @@ class MediaTest : InstrumentedTest() {
         }
         // check media
         val ret = testCol!!.media.check()
-        var expected = listOf("fake2.png")
+        var expected = setOf("fake2.png")
         var actual = ret.missingFileNames.toMutableList()
         actual.retainAll(expected)
         assertEquals(expected.size, actual.size)
-        expected = listOf("foo.jpg")
+        expected = setOf("foo.jpg")
         actual = ret.unusedFileNames.toMutableList()
-        actual.retainAll(expected.toSet())
+        actual.retainAll(expected)
         assertEquals(expected.size, actual.size)
     }
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/utils/UniqueArrayListTest.kt b/AnkiDroid/src/test/java/com/ichi2/utils/UniqueArrayListTest.kt
index c06025b5153c..085a1f96abcb 100644
--- a/AnkiDroid/src/test/java/com/ichi2/utils/UniqueArrayListTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/utils/UniqueArrayListTest.kt
@@ -546,7 +546,7 @@ class UniqueArrayListTest {
         val uniqueList = UniqueArrayList.from(longs)
 
         assertNotEquals(2, uniqueList.size.toLong())
-        uniqueList.retainAll(listOf(1L, 3L))
+        uniqueList.retainAll(setOf(1L, 3L))
         assertEquals(2, uniqueList.size.toLong())
         assertEquals(listOf(1L, 3L), uniqueList)
     }

From 773bdadb50fc1afa330254019ac2d3effce395cf Mon Sep 17 00:00:00 2001
From: David Allison <62114487+david-allison@users.noreply.github.com>
Date: Wed, 19 Mar 2025 13:19:05 +0000
Subject: [PATCH 140/200] fix(sentence-case): use 'sentence_' prefix

* tag_missing => sentence_tag_missing
---
 .../src/main/java/com/ichi2/anki/dialogs/MediaCheckDialog.kt  | 4 +++-
 AnkiDroid/src/main/res/values/sentence-case.xml               | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/MediaCheckDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/MediaCheckDialog.kt
index 99d3e736244e..04d3a50c53c4 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/MediaCheckDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/MediaCheckDialog.kt
@@ -100,7 +100,9 @@ class MediaCheckDialog : AsyncDialogFragment() {
                         setNeutralButton(R.string.dialog_cancel) { _, _ -> activity?.dismissAllDialogFragments() }
 
                         if (noHave.isNotEmpty()) {
-                            setNegativeButton(TR.mediaCheckAddTag().toSentenceCase(requireContext(), R.string.tag_missing)) { _, _ ->
+                            setNegativeButton(
+                                TR.mediaCheckAddTag().toSentenceCase(requireContext(), R.string.sentence_tag_missing),
+                            ) { _, _ ->
                                 (activity as MediaCheckDialogListener?)?.tagMissing(missingMediaNotes)
                                 activity?.dismissAllDialogFragments()
                             }
diff --git a/AnkiDroid/src/main/res/values/sentence-case.xml b/AnkiDroid/src/main/res/values/sentence-case.xml
index 8eb2eb3b58e9..b7f6d57f74af 100644
--- a/AnkiDroid/src/main/res/values/sentence-case.xml
+++ b/AnkiDroid/src/main/res/values/sentence-case.xml
@@ -42,7 +42,7 @@ undoActionUndone()
     <string name="sentence_gesture_toggle_whiteboard">Toggle whiteboard</string>
     <string name="sentence_custom_study">Custom study</string>
     <string name="sentence_empty_cards">Empty cards</string>
-    <string name="tag_missing">Tag missing</string>
+    <string name="sentence_tag_missing">Tag missing</string>
     <string name="sentence_reposition_new_cards">Reposition new cards</string>
     <string name="sentence_find_and_replace">Find and replace</string>
     <string name="sentence_all_fields">All fields</string>

From 6f219b776fb7515a0cce5cb75e4055d688ee2fd6 Mon Sep 17 00:00:00 2001
From: David Allison <62114487+david-allison@users.noreply.github.com>
Date: Wed, 19 Mar 2025 13:20:56 +0000
Subject: [PATCH 141/200] lint(sentence-case): enforce 'sentence_' prefix

This makes it obvious to reviewers that strings do not
require to be checked against `GeneratedTranslations` for
duplicates inside the Anki Codebase

**Context**
My bad review comment:

https://redirect.github.com/ankidroid/Anki-Android/pull/17943#discussion_r2002135876
---
 .../java/com/ichi2/anki/lint/IssueRegistry.kt |  2 +
 .../lint/rules/SentenceCaseConventions.kt     | 80 +++++++++++++++++++
 .../lint/rules/SentenceCaseConventionsTest.kt | 61 ++++++++++++++
 3 files changed, 143 insertions(+)
 create mode 100644 lint-rules/src/main/java/com/ichi2/anki/lint/rules/SentenceCaseConventions.kt
 create mode 100644 lint-rules/src/test/java/com/ichi2/anki/lint/rules/SentenceCaseConventionsTest.kt

diff --git a/lint-rules/src/main/java/com/ichi2/anki/lint/IssueRegistry.kt b/lint-rules/src/main/java/com/ichi2/anki/lint/IssueRegistry.kt
index b60e1fb81085..4ecc772de4f3 100644
--- a/lint-rules/src/main/java/com/ichi2/anki/lint/IssueRegistry.kt
+++ b/lint-rules/src/main/java/com/ichi2/anki/lint/IssueRegistry.kt
@@ -38,6 +38,7 @@ import com.ichi2.anki.lint.rules.JUnitNullAssertionDetector
 import com.ichi2.anki.lint.rules.LocaleRootDetector
 import com.ichi2.anki.lint.rules.NonPositionalFormatSubstitutions
 import com.ichi2.anki.lint.rules.PrintStackTraceUsage
+import com.ichi2.anki.lint.rules.SentenceCaseConventions
 import com.ichi2.anki.lint.rules.TranslationTypo
 import com.ichi2.anki.lint.rules.VariableNamingDetector
 
@@ -61,6 +62,7 @@ class IssueRegistry : IssueRegistry() {
                 LocaleRootDetector.ISSUE,
                 PrintStackTraceUsage.ISSUE,
                 NonPositionalFormatSubstitutions.ISSUE,
+                SentenceCaseConventions.ISSUE,
                 TranslationTypo.ISSUE,
                 FixedPreferencesTitleLength.PREFERENCES_ISSUE_MAX_LENGTH,
                 FixedPreferencesTitleLength.MENU_ISSUE_MAX_LENGTH,
diff --git a/lint-rules/src/main/java/com/ichi2/anki/lint/rules/SentenceCaseConventions.kt b/lint-rules/src/main/java/com/ichi2/anki/lint/rules/SentenceCaseConventions.kt
new file mode 100644
index 000000000000..ef0b37c1b9b7
--- /dev/null
+++ b/lint-rules/src/main/java/com/ichi2/anki/lint/rules/SentenceCaseConventions.kt
@@ -0,0 +1,80 @@
+/*
+ *  Copyright (c) 2025 David Allison <davidallisongithub@gmail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify it under
+ *  the terms of the GNU General Public License as published by the Free Software
+ *  Foundation; either version 3 of the License, or (at your option) any later
+ *  version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ *  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ *  PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with
+ *  this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.ichi2.anki.lint.rules
+
+import com.android.resources.ResourceFolderType
+import com.android.tools.lint.detector.api.Implementation
+import com.android.tools.lint.detector.api.Issue
+import com.android.tools.lint.detector.api.ResourceXmlDetector
+import com.android.tools.lint.detector.api.Scope
+import com.android.tools.lint.detector.api.XmlContext
+import com.android.tools.lint.detector.api.XmlScanner
+import com.google.common.annotations.VisibleForTesting
+import com.ichi2.anki.lint.utils.Constants
+import org.w3c.dom.Element
+
+/**
+ * Checks for issues in sentence-case.xml
+ */
+class SentenceCaseConventions :
+    ResourceXmlDetector(),
+    XmlScanner {
+    companion object {
+        @VisibleForTesting
+        val ID = "SentenceCaseConventions"
+
+        @VisibleForTesting
+        val EXPLANATION = "Sentence-case style guide"
+
+        private val implementation =
+            Implementation(SentenceCaseConventions::class.java, Scope.RESOURCE_FILE_SCOPE)
+        val ISSUE: Issue =
+            Issue.create(
+                ID,
+                EXPLANATION,
+                EXPLANATION,
+                Constants.ANKI_XML_CATEGORY,
+                Constants.ANKI_XML_PRIORITY,
+                Constants.ANKI_XML_SEVERITY,
+                implementation,
+            )
+    }
+
+    override fun getApplicableElements(): Collection<String> = listOf("string")
+
+    override fun appliesTo(folderType: ResourceFolderType): Boolean = folderType == ResourceFolderType.VALUES
+
+    override fun visitElement(
+        context: XmlContext,
+        element: Element,
+    ) {
+        if (context.file.name != "sentence-case.xml") {
+            return
+        }
+
+        // ensure 'name' starts with 'sentence_'
+        // Convention: avoids reviewers needing to check strings against 'GeneratedTranslations'
+        val elementName = element.getAttribute("name")
+        if (!elementName.startsWith("sentence_")) {
+            context.report(
+                issue = ISSUE,
+                location = context.getElementLocation(element),
+                message = "the 'name' attribute: '$elementName' should be prefixed with 'sentence_'",
+            )
+        }
+    }
+}
diff --git a/lint-rules/src/test/java/com/ichi2/anki/lint/rules/SentenceCaseConventionsTest.kt b/lint-rules/src/test/java/com/ichi2/anki/lint/rules/SentenceCaseConventionsTest.kt
new file mode 100644
index 000000000000..04ef18a91b60
--- /dev/null
+++ b/lint-rules/src/test/java/com/ichi2/anki/lint/rules/SentenceCaseConventionsTest.kt
@@ -0,0 +1,61 @@
+/*
+ *  Copyright (c) 2025 David Allison <davidallisongithub@gmail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify it under
+ *  the terms of the GNU General Public License as published by the Free Software
+ *  Foundation; either version 3 of the License, or (at your option) any later
+ *  version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ *  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ *  PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with
+ *  this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.ichi2.anki.lint.rules
+
+import com.android.tools.lint.checks.infrastructure.TestFiles
+import com.android.tools.lint.checks.infrastructure.TestLintResult
+import com.android.tools.lint.checks.infrastructure.TestLintTask.lint
+import org.hamcrest.CoreMatchers.containsString
+import org.hamcrest.MatcherAssert.assertThat
+import org.intellij.lang.annotations.Language
+import org.junit.Test
+
+class SentenceCaseConventionsTest {
+    @Test
+    fun `valid file has no error`() {
+        checkSentenceCase(
+            """<resources>
+           |<string name="sentence_valid">Valid string</string>
+           |</resources>
+            """.trimMargin(),
+        ).expectClean()
+    }
+
+    @Test
+    fun `missing 'sentence_' prefix emits error`() {
+        checkSentenceCase(
+            """<resources>
+            |<string name="invalid_prefix">missing 'sentence_' prefix</string>
+            |</resources>
+            """.trimMargin(),
+        ).expectErrorCount(1)
+            .check({ output: String ->
+                assertThat("ID", output, containsString(SentenceCaseConventions.ID))
+                assertThat("message", output, containsString("the 'name' attribute: 'invalid_prefix' should be prefixed with 'sentence_'"))
+            })
+    }
+
+    private fun checkSentenceCase(
+        @Language("XML") input: String,
+    ): TestLintResult =
+        lint()
+            .allowMissingSdk()
+            .allowCompilationErrors()
+            .files(TestFiles.xml("res/values/sentence-case.xml", input))
+            .issues(SentenceCaseConventions.ISSUE)
+            .run()
+}

From e6156766d569c183894f3af532b5d09aec35d88d Mon Sep 17 00:00:00 2001
From: AnkiDroid Translations <ankidroid@ankidroid.org>
Date: Sun, 23 Mar 2025 17:42:40 +0000
Subject: [PATCH 142/200] Updated strings from Crowdin

---
 .../src/main/res/values-de/02-strings.xml      |  4 ++--
 .../src/main/res/values-de/03-dialogs.xml      |  2 +-
 .../src/main/res/values-heb/02-strings.xml     | 18 +++++++++---------
 .../src/main/res/values-heb/03-dialogs.xml     |  6 +++---
 .../src/main/res/values-heb/07-cardbrowser.xml |  2 +-
 .../src/main/res/values-heb/10-preferences.xml |  5 +++--
 .../main/res/values-heb/17-model-manager.xml   |  4 ++--
 .../src/main/res/values-iw/02-strings.xml      | 18 +++++++++---------
 .../src/main/res/values-iw/03-dialogs.xml      |  6 +++---
 .../src/main/res/values-iw/07-cardbrowser.xml  |  2 +-
 .../src/main/res/values-iw/10-preferences.xml  |  5 +++--
 .../main/res/values-iw/17-model-manager.xml    |  4 ++--
 .../src/main/res/values-ja/02-strings.xml      |  4 ++--
 .../src/main/res/values-ja/03-dialogs.xml      |  4 ++--
 .../src/main/res/values-ko/02-strings.xml      | 18 +++++++++---------
 .../src/main/res/values-ko/07-cardbrowser.xml  |  4 ++--
 .../src/main/res/values-ko/10-preferences.xml  | 16 ++++++++--------
 .../src/main/res/values-pt-rPT/02-strings.xml  |  2 +-
 .../src/main/res/values-tr/02-strings.xml      | 18 +++++++++---------
 .../src/main/res/values-tr/03-dialogs.xml      |  6 +++---
 .../src/main/res/values-tr/07-cardbrowser.xml  |  2 +-
 .../src/main/res/values-tr/10-preferences.xml  |  4 ++--
 .../main/res/values-tr/17-model-manager.xml    | 14 +++++++-------
 23 files changed, 85 insertions(+), 83 deletions(-)

diff --git a/AnkiDroid/src/main/res/values-de/02-strings.xml b/AnkiDroid/src/main/res/values-de/02-strings.xml
index dd1f105713f1..07ccdb0d2fff 100644
--- a/AnkiDroid/src/main/res/values-de/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-de/02-strings.xml
@@ -52,7 +52,7 @@
     <string name="CardEditorModel">Typ:</string>
     <string name="CardEditorTags">Schlagwörter: %1$s</string>
     <string name="CardEditorCards">Karten: %1$s</string>
-    <string name="edit_occlusions">Occlusions bearbeiten</string>
+    <string name="edit_occlusions">Okklusionen bearbeiten</string>
     <string name="tag_name">Schlagwortname</string>
     <string name="add_new_filter_tags">Schlagwörter hinzufügen/filtern</string>
     <string name="add_tag" maxLength="28">Schlagwort hinzufügen</string>
@@ -313,7 +313,7 @@
     <!-- Chips should probably be in a separate file, due to the additional length req -->
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Die Text-zu-Sprache Einstellungen konnten nicht geöffnet werden</string>
     <string name="shared_decks_login_required">Bitte melde dich an, um weitere Stapel herunterzuladen</string>
     <string name="deck_description_field_hint">Beschreibung</string>
     <string name="failed_to_copy">Kopieren fehlgeschlagen</string>
diff --git a/AnkiDroid/src/main/res/values-de/03-dialogs.xml b/AnkiDroid/src/main/res/values-de/03-dialogs.xml
index e653d6552973..d3072b2184d6 100644
--- a/AnkiDroid/src/main/res/values-de/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-de/03-dialogs.xml
@@ -213,7 +213,7 @@
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Nicht erneut anzeigen</string>
     <string name="dismiss_backup_warning_title">Warnung wegen Datenverlust</string>
     <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
-    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Aufgrund von Android-Datenschutzänderungen sind Ihre Daten und automatischen Backups nicht mehr zugänglich, wenn die App deinstalliert wird</string>
     <string name="deck_already_exists">Stapel bereits vorhanden</string>
     <string name="empty_deck_name">Stapelname darf nicht leer sein</string>
     <string name="create_deck_numeric_hint">Wenn Sie Probleme mit der Reihenfolge der Stapel haben (z.B. \'10\' erscheint vor \'2\'), ersetzen Sie \'2\' durch \'02\'</string>
diff --git a/AnkiDroid/src/main/res/values-heb/02-strings.xml b/AnkiDroid/src/main/res/values-heb/02-strings.xml
index 299c8b702455..28835f72990f 100644
--- a/AnkiDroid/src/main/res/values-heb/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-heb/02-strings.xml
@@ -195,7 +195,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">רקע</string>
     <string name="choose_an_image" maxLength="41">נא לבחור תמונה</string>
-    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">הסר רקע</string>
     <string name="remove_background_image">להסיר רקע?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">שחזור בררת המחדל</string>
@@ -241,7 +241,7 @@
     <string name="note_editor_image_too_large">התמונה גדולה מדי, אנא הכנס אותה באופן ידני</string>
     <string name="note_editor_video_too_large">קובץ הווידאו גדול מדי, אנא הכנס אותו באופן ידני</string>
     <string name="note_editor_audio_too_large">קובץ השמע גדול מדי, אנא הכנס אותו באופן ידני</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">בתהליך עדכון אנדרואיד, אנא נסה שנית.</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">ייתכן שיהיה עליך להשתמש ב- iManager כדי לאפשר ל- AnkiDroid להוסיף קיצורי דרך</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">מסך הבית שלך אינו מאפשר ל- AnkiDroid להוסיף קיצורי דרך</string>
     <string name="create_shortcut_error">שגיאה בהוספת קיצור הדרך: %s</string>
@@ -257,7 +257,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">הורדת חפיסה</string>
-    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">פתיחה בדפדפן</string>
     <string name="try_again">נסה שוב</string>
     <string name="cancel_download">בטל הורדה</string>
     <string name="cancel_download_question_title">בטל הורדה?</string>
@@ -316,14 +316,14 @@
     <string name="browser_options_dialog_heading">אפשרויות דפדפן</string>
     <string name="audio_saved">ההקלטה נשמרה</string>
     <string name="deleting_selected_notes">מחיקת הערות שנבחרו</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">הקש על שמע כדי להאזין</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">שמע צריך להיות מותקן לפני השימוש</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">השתמש בכל אופן</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">שגיאת טקסט לדיבור (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">אינטרנט</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">התקן</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">פתיחת הגדרות טקסט-לדיבור נכשלה</string>
     <string name="shared_decks_login_required">אנא התחבר כדי להוריד חפיסות נוספות</string>
     <string name="deck_description_field_hint">תיאור</string>
     <string name="failed_to_copy">ההעתקה נכשלה</string>
diff --git a/AnkiDroid/src/main/res/values-heb/03-dialogs.xml b/AnkiDroid/src/main/res/values-heb/03-dialogs.xml
index 94a2abb1016e..0d82f545ebf4 100644
--- a/AnkiDroid/src/main/res/values-heb/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-heb/03-dialogs.xml
@@ -68,7 +68,7 @@
     <string name="answering_error_title">שגיאת מסד נתונים</string>
     <string name="answering_error_message">כתיבה לאוסף נכשלה. מאגר המידע אולי שבור או שאין מספיק מקום בדיסק.\n\n אם זה קורה שוב ושוב, אפשר לבדוק את מאגר המידע, לתקן את האוסף או לשחזר אותו מגיבוי. לחץ \'אפשרויות\' עבור כך. \n כמו כן ייתכן שזוהי תקלה בAnkiDroid. נא לדווח את השגיאה כדי שנוכל לבדוק זאת.</string>
     <string name="answering_error_report">דיווח על שגיאה</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
+    <string name="storage_full_message">אין מספיק שטח אחסון פנוי כדי לפתוח את AnkiDroid.  פנה קצת מקום כדי להמשיך.</string>
     <string name="repair_deck_dialog">לתקן את המאגר?\n\n
 לפני תחילת ניסיון התיקון, יתבצע שמירת העתק בתקייה %s</string>
     <string name="intent_aedict_empty">הקטגוריה \'ברירת מחדל\' ריקה</string>
@@ -221,8 +221,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">מאוחר יותר</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">אל תציג שוב</string>
     <string name="dismiss_backup_warning_title">אזהרת אובדן נתונים</string>
-    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
-    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_new_user">עקב שינויים בפרטיות של Android, הנתונים והגיבויים האוטומטיים שלך יימחקו מהטלפון שלך אם האפליקציה תוסר</string>
+    <string name="dismiss_backup_warning_upgrade">עקב שינויים בפרטיות של Android, הנתונים והגיבויים האוטומטיים שלך לא יהיו נגישים אם האפליקציה תוסר</string>
     <string name="deck_already_exists">החפיסה כבר קיימת</string>
     <string name="empty_deck_name">שם החפיסה לא יכול להיות ריק</string>
     <string name="create_deck_numeric_hint">אם יש לך בעיות בסדר החפיסות (למשל, \'10\' מופיע לפני \'2\'), החלף את \'2\' ב-\'02\'</string>
diff --git a/AnkiDroid/src/main/res/values-heb/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-heb/07-cardbrowser.xml
index d927ca2e3ed0..d48659412d1b 100644
--- a/AnkiDroid/src/main/res/values-heb/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-heb/07-cardbrowser.xml
@@ -130,5 +130,5 @@
     <string name="user_potential_columns">זמין</string>
     <string name="include_column">כלול עמודה</string>
     <string name="exclude_column">אל תכלול עמודה</string>
-    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
+    <string name="browser_find_replace_loading_fields">מאחזר שמות שדות&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-heb/10-preferences.xml b/AnkiDroid/src/main/res/values-heb/10-preferences.xml
index 1c3e416d7ba9..cc635d53f95a 100644
--- a/AnkiDroid/src/main/res/values-heb/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-heb/10-preferences.xml
@@ -99,7 +99,7 @@
     <string name="gestures_summ">שיוך מחוות לפעולות כגון מענה ועריכת קלפים.</string>
     <string name="gestures_corner_touch" maxLength="41">מגע 9 נקודות</string>
     <string name="gestures_corner_touch_summary">אפשר מחוות מגע בפינות המסך</string>
-    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">הצגת קיצורי-מקלדת</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">מגירת היישומים במסך מלא</string>
     <string name="gestures_fullscreen_nav_drawer_summary">פתח את מגירת הניווט בעת החלקה ימינה מכל מקום על המסך</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">ללא</string>
@@ -300,7 +300,8 @@
     <string name="pref_cat_dev_options" maxLength="41">אפשרויות מפתח</string>
     <string name="dev_options_enabled_pref" maxLength="41">הפעלת מצב מפתח</string>
     <string name="disable_dev_options">השבת את מצב המפתח</string>
-    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
+    <string name="dev_options_warning">אנא ודא לפני הפעלת מצב מפתח. אפשרויות אלה מסוכנות ועלולות להשבית את האפליקציה או להשחית את האוסף שלך.\n\nשים לב שהאפשרויות הללו אינן מתאימות לרוב המשתמשים ולכן אינן מתורגמות, ולכן הן באנגלית.
+    </string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-heb/17-model-manager.xml b/AnkiDroid/src/main/res/values-heb/17-model-manager.xml
index a3ef8bd01e5f..97d7e0316649 100644
--- a/AnkiDroid/src/main/res/values-heb/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-heb/17-model-manager.xml
@@ -68,9 +68,9 @@
     <string name="model_delete_warning">האם אתה בטוח שברצונך למחוק את סוג פתק זה?</string>
     <string name="field_delete_warning">למחוק את השדה הזה?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s</string>
+    <string name="model_browser_add_add">הוספה: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s</string>
+    <string name="model_browser_add_clone">שכפול: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">הזן את התבנית שבה ישתמש דפדפן הכרטיסים כדי להציג את הכרטיסים שלך. השתמש בזה כדי להציג תשובה תמציתית יותר.\n\nתבנית קדמית של\n\"בירת {{מדינה}} היא:\"\nניתן לדחוס בדפדפן הכרטיסים ל\n\"בירה: {{מדינה}}\"</string>
     <string name="card_template_browser_appearance_question_format">סגנון שאלה</string>
diff --git a/AnkiDroid/src/main/res/values-iw/02-strings.xml b/AnkiDroid/src/main/res/values-iw/02-strings.xml
index 299c8b702455..28835f72990f 100644
--- a/AnkiDroid/src/main/res/values-iw/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-iw/02-strings.xml
@@ -195,7 +195,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">רקע</string>
     <string name="choose_an_image" maxLength="41">נא לבחור תמונה</string>
-    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">הסר רקע</string>
     <string name="remove_background_image">להסיר רקע?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">שחזור בררת המחדל</string>
@@ -241,7 +241,7 @@
     <string name="note_editor_image_too_large">התמונה גדולה מדי, אנא הכנס אותה באופן ידני</string>
     <string name="note_editor_video_too_large">קובץ הווידאו גדול מדי, אנא הכנס אותו באופן ידני</string>
     <string name="note_editor_audio_too_large">קובץ השמע גדול מדי, אנא הכנס אותו באופן ידני</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">בתהליך עדכון אנדרואיד, אנא נסה שנית.</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">ייתכן שיהיה עליך להשתמש ב- iManager כדי לאפשר ל- AnkiDroid להוסיף קיצורי דרך</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">מסך הבית שלך אינו מאפשר ל- AnkiDroid להוסיף קיצורי דרך</string>
     <string name="create_shortcut_error">שגיאה בהוספת קיצור הדרך: %s</string>
@@ -257,7 +257,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">הורדת חפיסה</string>
-    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">פתיחה בדפדפן</string>
     <string name="try_again">נסה שוב</string>
     <string name="cancel_download">בטל הורדה</string>
     <string name="cancel_download_question_title">בטל הורדה?</string>
@@ -316,14 +316,14 @@
     <string name="browser_options_dialog_heading">אפשרויות דפדפן</string>
     <string name="audio_saved">ההקלטה נשמרה</string>
     <string name="deleting_selected_notes">מחיקת הערות שנבחרו</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">הקש על שמע כדי להאזין</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">שמע צריך להיות מותקן לפני השימוש</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">השתמש בכל אופן</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">שגיאת טקסט לדיבור (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">אינטרנט</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">התקן</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">פתיחת הגדרות טקסט-לדיבור נכשלה</string>
     <string name="shared_decks_login_required">אנא התחבר כדי להוריד חפיסות נוספות</string>
     <string name="deck_description_field_hint">תיאור</string>
     <string name="failed_to_copy">ההעתקה נכשלה</string>
diff --git a/AnkiDroid/src/main/res/values-iw/03-dialogs.xml b/AnkiDroid/src/main/res/values-iw/03-dialogs.xml
index 94a2abb1016e..0d82f545ebf4 100644
--- a/AnkiDroid/src/main/res/values-iw/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-iw/03-dialogs.xml
@@ -68,7 +68,7 @@
     <string name="answering_error_title">שגיאת מסד נתונים</string>
     <string name="answering_error_message">כתיבה לאוסף נכשלה. מאגר המידע אולי שבור או שאין מספיק מקום בדיסק.\n\n אם זה קורה שוב ושוב, אפשר לבדוק את מאגר המידע, לתקן את האוסף או לשחזר אותו מגיבוי. לחץ \'אפשרויות\' עבור כך. \n כמו כן ייתכן שזוהי תקלה בAnkiDroid. נא לדווח את השגיאה כדי שנוכל לבדוק זאת.</string>
     <string name="answering_error_report">דיווח על שגיאה</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
+    <string name="storage_full_message">אין מספיק שטח אחסון פנוי כדי לפתוח את AnkiDroid.  פנה קצת מקום כדי להמשיך.</string>
     <string name="repair_deck_dialog">לתקן את המאגר?\n\n
 לפני תחילת ניסיון התיקון, יתבצע שמירת העתק בתקייה %s</string>
     <string name="intent_aedict_empty">הקטגוריה \'ברירת מחדל\' ריקה</string>
@@ -221,8 +221,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">מאוחר יותר</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">אל תציג שוב</string>
     <string name="dismiss_backup_warning_title">אזהרת אובדן נתונים</string>
-    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
-    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_new_user">עקב שינויים בפרטיות של Android, הנתונים והגיבויים האוטומטיים שלך יימחקו מהטלפון שלך אם האפליקציה תוסר</string>
+    <string name="dismiss_backup_warning_upgrade">עקב שינויים בפרטיות של Android, הנתונים והגיבויים האוטומטיים שלך לא יהיו נגישים אם האפליקציה תוסר</string>
     <string name="deck_already_exists">החפיסה כבר קיימת</string>
     <string name="empty_deck_name">שם החפיסה לא יכול להיות ריק</string>
     <string name="create_deck_numeric_hint">אם יש לך בעיות בסדר החפיסות (למשל, \'10\' מופיע לפני \'2\'), החלף את \'2\' ב-\'02\'</string>
diff --git a/AnkiDroid/src/main/res/values-iw/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-iw/07-cardbrowser.xml
index d927ca2e3ed0..d48659412d1b 100644
--- a/AnkiDroid/src/main/res/values-iw/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-iw/07-cardbrowser.xml
@@ -130,5 +130,5 @@
     <string name="user_potential_columns">זמין</string>
     <string name="include_column">כלול עמודה</string>
     <string name="exclude_column">אל תכלול עמודה</string>
-    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
+    <string name="browser_find_replace_loading_fields">מאחזר שמות שדות&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-iw/10-preferences.xml b/AnkiDroid/src/main/res/values-iw/10-preferences.xml
index 1c3e416d7ba9..cc635d53f95a 100644
--- a/AnkiDroid/src/main/res/values-iw/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-iw/10-preferences.xml
@@ -99,7 +99,7 @@
     <string name="gestures_summ">שיוך מחוות לפעולות כגון מענה ועריכת קלפים.</string>
     <string name="gestures_corner_touch" maxLength="41">מגע 9 נקודות</string>
     <string name="gestures_corner_touch_summary">אפשר מחוות מגע בפינות המסך</string>
-    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">הצגת קיצורי-מקלדת</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">מגירת היישומים במסך מלא</string>
     <string name="gestures_fullscreen_nav_drawer_summary">פתח את מגירת הניווט בעת החלקה ימינה מכל מקום על המסך</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">ללא</string>
@@ -300,7 +300,8 @@
     <string name="pref_cat_dev_options" maxLength="41">אפשרויות מפתח</string>
     <string name="dev_options_enabled_pref" maxLength="41">הפעלת מצב מפתח</string>
     <string name="disable_dev_options">השבת את מצב המפתח</string>
-    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
+    <string name="dev_options_warning">אנא ודא לפני הפעלת מצב מפתח. אפשרויות אלה מסוכנות ועלולות להשבית את האפליקציה או להשחית את האוסף שלך.\n\nשים לב שהאפשרויות הללו אינן מתאימות לרוב המשתמשים ולכן אינן מתורגמות, ולכן הן באנגלית.
+    </string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-iw/17-model-manager.xml b/AnkiDroid/src/main/res/values-iw/17-model-manager.xml
index a3ef8bd01e5f..97d7e0316649 100644
--- a/AnkiDroid/src/main/res/values-iw/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-iw/17-model-manager.xml
@@ -68,9 +68,9 @@
     <string name="model_delete_warning">האם אתה בטוח שברצונך למחוק את סוג פתק זה?</string>
     <string name="field_delete_warning">למחוק את השדה הזה?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s</string>
+    <string name="model_browser_add_add">הוספה: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s</string>
+    <string name="model_browser_add_clone">שכפול: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">הזן את התבנית שבה ישתמש דפדפן הכרטיסים כדי להציג את הכרטיסים שלך. השתמש בזה כדי להציג תשובה תמציתית יותר.\n\nתבנית קדמית של\n\"בירת {{מדינה}} היא:\"\nניתן לדחוס בדפדפן הכרטיסים ל\n\"בירה: {{מדינה}}\"</string>
     <string name="card_template_browser_appearance_question_format">סגנון שאלה</string>
diff --git a/AnkiDroid/src/main/res/values-ja/02-strings.xml b/AnkiDroid/src/main/res/values-ja/02-strings.xml
index 63b00606581a..14d7e1f7daa9 100644
--- a/AnkiDroid/src/main/res/values-ja/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ja/02-strings.xml
@@ -229,7 +229,7 @@
     <string name="note_editor_image_too_large">画像が大きすぎます。手動で画像を挿入してください</string>
     <string name="note_editor_video_too_large">動画ファイルが大きすぎます。手動で動画を挿入してください</string>
     <string name="note_editor_audio_too_large">音声ファイルが大きすぎます。手動で音声を挿入してください</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Androidのバックアップが進行中です。もう一度やり直してください</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">AnkiDroidのショートカットを追加するには、iManagerでの許可が必要な場合があります。</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">ホーム画面へのショートカットの追加が許可されませんでした</string>
     <string name="create_shortcut_error">ショートカット追加のエラー: %s</string>
@@ -303,7 +303,7 @@
     <string name="deleting_selected_notes">選択したノートを削除しています</string>
     <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
     <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">とにかく使用</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">テキスト読み上げエラー (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
diff --git a/AnkiDroid/src/main/res/values-ja/03-dialogs.xml b/AnkiDroid/src/main/res/values-ja/03-dialogs.xml
index 2194f1fae01f..da8b4d90f1ac 100644
--- a/AnkiDroid/src/main/res/values-ja/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ja/03-dialogs.xml
@@ -208,8 +208,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">後で</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">今後表示しない</string>
     <string name="dismiss_backup_warning_title">データ損失の警告</string>
-    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
-    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_new_user">Androidのプライバシーポリシーの変更に伴い、今後AnkiDroidアプリをアンインストールすると、あなたのコレクション（あなたのカードや学習履歴などのセット）や、そのコレクションの自動バックアップのデータも、この端末から削除されます。    </string>
+    <string name="dismiss_backup_warning_upgrade">Androidのプライバシーポリシーの変更に伴い、今後AnkiDroidアプリをアンインストールすると、現在のコレクション（あなたのカードや学習履歴などのセット）や、そのコレクションの自動バックアップのデータにアクセスできなくなります。</string>
     <string name="deck_already_exists">同じ名前のデッキがすでにあります</string>
     <string name="empty_deck_name">デッキ名の入力が必要です</string>
     <string name="create_deck_numeric_hint">デッキは名前の文字列順に並べられるため、たとえばデッキ「10」はデッキ「2」よりも上に配置されます。この場合、「2」を「02」に変更すれば、それより下に「10」を配置できます。</string>
diff --git a/AnkiDroid/src/main/res/values-ko/02-strings.xml b/AnkiDroid/src/main/res/values-ko/02-strings.xml
index d1251f2e1070..6454036bfbc2 100644
--- a/AnkiDroid/src/main/res/values-ko/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ko/02-strings.xml
@@ -186,7 +186,7 @@ Context | Request Context    [1]</string>
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">배경</string>
     <string name="choose_an_image" maxLength="41">이미지 선택</string>
-    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">배경 제거하기</string>
     <string name="remove_background_image">배경을 제거하시겠습니까?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">기본값 복원</string>
@@ -232,7 +232,7 @@ Context | Request Context    [1]</string>
     <string name="note_editor_image_too_large">이미지가 너무 큽니다. 수동으로 넣어 주세요.</string>
     <string name="note_editor_video_too_large">영상 파일이 너무 큽니다. 수동으로 넣어 주세요.</string>
     <string name="note_editor_audio_too_large">오디오 파일이 너무 큽니다. 수동으로 넣어 주세요.</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android 백업중입니다. 다시 시도하십시오.</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">AnkiDroid 바로가기를 추가하려면 iManager가 필요할 수 있습니다.</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">홈 화면에 AnkiDroid 바로 가기를 추가할 수 없습니다.</string>
     <string name="create_shortcut_error">바로가기 생성 오류: %s</string>
@@ -248,7 +248,7 @@ Context | Request Context    [1]</string>
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">카드 덱 다운로드하기</string>
-    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">브라우저에서 열기</string>
     <string name="try_again">다시 시도하세요.</string>
     <string name="cancel_download">다운로드 취소</string>
     <string name="cancel_download_question_title">다운로드를 취소하시겠습니까?</string>
@@ -304,14 +304,14 @@ Context | Request Context    [1]</string>
     <string name="browser_options_dialog_heading">브라우저 옵션</string>
     <string name="audio_saved">녹음 파일 저장됨</string>
     <string name="deleting_selected_notes">선택한 메모 삭제 중</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">음성을 들으려면 탭하세요</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">사용 전 음성을 설치해주세요</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">그냥 사용하기</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">문장 읽어주기 오류 (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">인터넷</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">설치</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">TTS 설정 열기 실패</string>
     <string name="shared_decks_login_required">카드 덱을 더 다운로드하려면 로그인해 주세요</string>
     <string name="deck_description_field_hint">설명</string>
     <string name="failed_to_copy">복사 실패</string>
diff --git a/AnkiDroid/src/main/res/values-ko/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-ko/07-cardbrowser.xml
index fab61acca1b2..2951ae84e586 100644
--- a/AnkiDroid/src/main/res/values-ko/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-ko/07-cardbrowser.xml
@@ -109,8 +109,8 @@
     <string name="browse_manage_columns_main_heading">열</string>
     <string name="browse_manage_columns">열 관리</string>
     <string name="user_active_columns">활성</string>
-    <string name="user_potential_columns">Available</string>
+    <string name="user_potential_columns">사용가능</string>
     <string name="include_column">열 포함하기</string>
     <string name="exclude_column">열 제외하기</string>
-    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
+    <string name="browser_find_replace_loading_fields">필드 이름 검색 중&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ko/10-preferences.xml b/AnkiDroid/src/main/res/values-ko/10-preferences.xml
index 0b16f1dacf3b..6d9a835d0448 100644
--- a/AnkiDroid/src/main/res/values-ko/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ko/10-preferences.xml
@@ -246,24 +246,24 @@
     <string name="analytics_summ">개발팀이 사람들이 어떤 기능을 사용하는지 볼 수 있도록 도와주어 AnkiDroid에 기여할 수 있습니다.</string>
     <string name="note_editor_replace_newlines" maxLength="41">HTML로 신규 라인 교체하기</string>
     <string name="note_editor_replace_newlines_summ">In the Note Editor, convert any instances of &lt;br&gt; to newlines when editing a card.</string>
-    <string name="type_in_answer_focus" maxLength="41">Focus ‘type in answer’</string>
-    <string name="type_in_answer_focus_summ">Automatically focus the ‘type in answer’ field in the reviewer</string>
+    <string name="type_in_answer_focus" maxLength="41">\'정답 입력\' 포커스</string>
+    <string name="type_in_answer_focus_summ">\'정답 입력\' 필드에 자동으로 포커스합니다</string>
     <!-- About -->
     <string name="open_changelog">업데이트 기록 열기</string>
-    <string name="pref_cat_about_title" maxLength="41">About</string>
+    <string name="pref_cat_about_title" maxLength="41">정보</string>
     <string name="contributors_title">기여자들</string>
     <string name="about_contributors_description"><![CDATA[These are our awesome <a href=\"%1$s\">contributors</a>. You can help AnkiDroid too by programming, translating, donating and <a href=\"%2$s\">more</a>!]]></string>
     <string name="license">라이센스</string>
     <string name="license_description"><![CDATA[AnkiDroid is released under the <a href=\"%1$s\">GPL-3.0</a> and <a href=\"%2$s\">AGPL-3.0</a> licenses, with the source code available <a href=\"%3$s\">on GitHub</a>]]></string>
-    <string name="donate_description"><![CDATA[You can support AnkiDroid\'s development by <a href=\"%1$s\">donating</a>. Any amount is deeply appreciated.]]></string>
+    <string name="donate_description"><![CDATA[<a href=\"%1$s\">기부를</a> 통해 AnkiDroid 개발을 지원해주실 수 있습니다. 얼마가 되든 감사드립니다.]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">제스쳐 추가하기</string>
     <string name="binding_add_key">키 추가하기</string>
     <string name="key_picker_default_press_key">키 누르기</string>
     <string name="binding_add_axis">조이스틱/모션 컨트롤러 추가하기</string>
-    <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
+    <string name="axis_picker_move_joystick">조이스틱/모션 콘트롤러를 움직이십시오</string>
     <string name="user_actions" maxLength="41">사용자 행동</string>
-    <string name="user_actions_summary" maxLength="41">Trigger JavaScript from the review screen</string>
+    <string name="user_actions_summary" maxLength="41">리뷰 화면에서 JavaScript 동작</string>
     <string name="user_action_1" maxLength="28">사용자 행동 1</string>
     <string name="user_action_2" maxLength="28">사용자 행동 2</string>
     <string name="user_action_3" maxLength="28">사용자 행동 3</string>
@@ -318,7 +318,7 @@
     <string name="pref__widget_text__error" comment="Text in a small box on the end of a preference, indicating a generic error.         Must be VERY short. Can be one or two lines.">에러</string>
     <string name="pref__widget_text__calculating" comment="Text in a small box on the end of a preference,         indicating that the value, such as folder size on disk, is being calculated.         Must be VERY short. Can be one or two lines.">계산\n중&#8230;</string>
     <plurals name="pref__widget_text__n_files_n_bytes" comment="Text in a small box on the end of a preference,         showing some statistics about a folder on disk if a form of “12 files\n26 MB”.         Must be VERY short. Can be one or two lines.">
-        <item quantity="other">%1$d files\n%2$s</item>
+        <item quantity="other">%1$d 파일\n%2$s</item>
     </plurals>
     <!-- Delete unused media -->
     <string name="pref__delete_unused_media_files__title" maxLength="41" comment="Preference title">사용되지 않는 미디어 파일 삭제하기</string>
@@ -358,7 +358,7 @@
     <string name="hide_system_bars_status_bar" comment="Setting option to hide the system status bar (the top one with clock, battery status, etc)">상태 바</string>
     <string name="hide_system_bars_navigation_bar" comment="Setting option to hide the system navigation bar (the bottom one that can go back, to home, etc)">내비게이션 바</string>
     <string name="hide_system_bars_all_bars" comment="Setting option to hide all the system bars">전부</string>
-    <string name="ignore_display_cutout" maxLength="41">Ignore display cutout</string>
+    <string name="ignore_display_cutout" maxLength="41">디스플레이 컷아웃 무시</string>
     <string name="hide_answer_buttons" maxLength="41">정답 버튼 숨기기</string>
     <string name="hide_hard_and_easy" maxLength="41">\'어려움\', \'쉬움\' 버튼 숨기기</string>
     <string name="reviewer_frame_style" maxLength="41">프레임 스타일</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml b/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml
index f548715472fb..5255705fd3ae 100644
--- a/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml
@@ -249,7 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Transferir baralho</string>
-    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Abrir no navegador</string>
     <string name="try_again">Tentar novamente</string>
     <string name="cancel_download">Cancelar transferência</string>
     <string name="cancel_download_question_title">Cancelar transferência?</string>
diff --git a/AnkiDroid/src/main/res/values-tr/02-strings.xml b/AnkiDroid/src/main/res/values-tr/02-strings.xml
index eacacbdef374..85af5314ba82 100644
--- a/AnkiDroid/src/main/res/values-tr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tr/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Arkaplan</string>
     <string name="choose_an_image" maxLength="41">Bir resim seç</string>
-    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Arkaplanı kaldır</string>
     <string name="remove_background_image">Arkaplan kaldırılsın mı?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Varsayılana Dön</string>
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">Bu resim fazla büyük, lütfen resmi elle ekleyin</string>
     <string name="note_editor_video_too_large">Bu video dosyası fazla büyük, lütfen videoyu elle ekleyin</string>
     <string name="note_editor_audio_too_large">Bu ses dosyası fazla büyük, lütfen sesi elle ekleyin</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android yedeklemesi gerçekleştiriliyor. Lütfen yeniden deneyin</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">AnkiDroid\'in kısayol eklemesine izin vermek için iManager kullanmanız gerekebilir</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Ana ekranın, kısayol ekleyebilmesi için AnkiDroid\'e izin vermiyor</string>
     <string name="create_shortcut_error">Kısayolu eklerken hata: %s</string>
@@ -249,7 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Deste indir</string>
-    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Tarayıcıda aç</string>
     <string name="try_again">Tekrar dene</string>
     <string name="cancel_download">İndirmeyi iptal et</string>
     <string name="cancel_download_question_title">İndirmeyi iptal et?</string>
@@ -306,14 +306,14 @@
     <string name="browser_options_dialog_heading">Tarayıcı seçenekleri</string>
     <string name="audio_saved">Alınan kayıtlar kaydedildi.</string>
     <string name="deleting_selected_notes">Seçili notlar siliniyor</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Sesleri dinlemek için üstüne dokunun</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Ses kullanılmadan önce yüklenmelidir</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Yine de kullan</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Metin okuma hatası (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">İnternet</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Yükle</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Metin okuma ayarları açılamadı</string>
     <string name="shared_decks_login_required">Daha fazla deste indirmek için lütfen giriş yapın</string>
     <string name="deck_description_field_hint">Açıklama</string>
     <string name="failed_to_copy">Kopyalanamadı</string>
diff --git a/AnkiDroid/src/main/res/values-tr/03-dialogs.xml b/AnkiDroid/src/main/res/values-tr/03-dialogs.xml
index 87dadba934c4..840d4c1aac49 100644
--- a/AnkiDroid/src/main/res/values-tr/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-tr/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Veritabanı hatası</string>
     <string name="answering_error_message">Koleksiyona yazılamadı. Veritabanı bozuk olabilir veya diskte yeterli boş alan olmayabilir.\n\nBu daha sık oluyorsa, veritabanını kontrol etmeyi, koleksiyonu onarmayı veya bir yedekten geri yüklemeyi deneyin. Bunun için \"seçenekler\"e dokunun.\n\Veya bu bir AnkiDroid hatası da olabilir; Bunu kontrol edebilmemiz için lütfen hatayı bildirin.</string>
     <string name="answering_error_report">Hatayı bildir</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
+    <string name="storage_full_message">AnkiDroid\'i açmaya yetecek boş depolama alanı yok. Devam etmek için biraz alan boşaltın.</string>
     <string name="repair_deck_dialog">Veritabanını onarmayı gerçekten denemek istiyor musunuz?\n\nGirişime başlamadan önce, \"%s\" altklasöründe bir kopya oluşturulacak.</string>
     <string name="intent_aedict_empty">\"Varsayılan\" kategorisi boş</string>
     <string name="intent_aedict_category">AnkiDroid\'e kart eklemek için bütün Not Defteri kategorilerini kaldırın veya \"default\" isminde bir tane ekleyin</string>
@@ -212,8 +212,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Daha sonra</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Tekrar gösterme</string>
     <string name="dismiss_backup_warning_title">Veri kaybı uyarısı</string>
-    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
-    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_new_user">Android gizlilik değişikliklerinden dolayı, uygulama kaldırılırsa veriniz ve otomatik yedekleriniz telefonunuzdan silinecek</string>
+    <string name="dismiss_backup_warning_upgrade">Android gizlilik değişikliklerinden dolayı, uygulama kaldırılırsa veriniz ve otomatik yedekleriniz erişilemez hâle gelecek</string>
     <string name="deck_already_exists">Deste hâlihazırda var</string>
     <string name="empty_deck_name">Deste adı boş olamaz</string>
     <string name="create_deck_numeric_hint">Deste sıralamanızda sorun olursa (örn. \"10\"un \"2\"den önce gelmesi), \"2\" yerine \"02\" yazın</string>
diff --git a/AnkiDroid/src/main/res/values-tr/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-tr/07-cardbrowser.xml
index 01b52d6cbdff..f215da7d6a27 100644
--- a/AnkiDroid/src/main/res/values-tr/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-tr/07-cardbrowser.xml
@@ -118,5 +118,5 @@
     <string name="user_potential_columns">Kullanılabilir</string>
     <string name="include_column">Sütunu ekle</string>
     <string name="exclude_column">Sütunu çıkar</string>
-    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
+    <string name="browser_find_replace_loading_fields">Alan adları okunuyor&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-tr/10-preferences.xml b/AnkiDroid/src/main/res/values-tr/10-preferences.xml
index 57cc33ebc426..ede36be64927 100644
--- a/AnkiDroid/src/main/res/values-tr/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-tr/10-preferences.xml
@@ -97,7 +97,7 @@
     <string name="gestures_summ">Cevap verme ve kart düzenleme gibi eylemlere el hareketleri ata.</string>
     <string name="gestures_corner_touch" maxLength="41">9 noktadan dokunma</string>
     <string name="gestures_corner_touch_summary">Ekran köşelerinde dokunma hareketlerine izin ver</string>
-    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Klavye kısayollarını göster</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Tam ekran gezinme çekmecesi</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Ekranın üzerindeki herhangi bir yerden sağa doğru parmağınızı kaydırdığınızda bütün dosyaların genel görünümü için bir önizleme açılacaktır</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Hiçbiri</string>
@@ -296,7 +296,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Geliştirici seçenekleri</string>
     <string name="dev_options_enabled_pref" maxLength="41">Geliştirici seçeneklerini aç</string>
     <string name="disable_dev_options">Geliştirici seçeneklerini kapat</string>
-    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
+    <string name="dev_options_warning">Lütfen geliştirici seçeneklerini açmadan önce emin olun. Bu seçenekler tehlikelidir ve uygulamayı ya da koleksiyonunuzu bozabilir.\n\nBu seçenekler çoğu kullanıcı için uygun değildir ve çevirileri yapılmaz, bu yüzden İngilizcelerdir.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-tr/17-model-manager.xml b/AnkiDroid/src/main/res/values-tr/17-model-manager.xml
index c83fa9dab899..20ff78ee9b1e 100644
--- a/AnkiDroid/src/main/res/values-tr/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-tr/17-model-manager.xml
@@ -26,10 +26,10 @@
  
 <resources>
     <!--Menu Labels-->
-    <string name="model_browser_label" comment="Label of the browser of note types. The text can\'t be found in AnkiDroid directly." maxLength="28">Not türlerini belirle</string>
+    <string name="model_browser_label" comment="Label of the browser of note types. The text can\'t be found in AnkiDroid directly." maxLength="28">Not türlerini yönet</string>
     <string name="model_editor_label" comment="Label of the window to edit the fields of a note type. This text can\'t be found in Ankidroid directly">Alanları yönet</string>
     <!--Toasts-->
-    <string name="toast_last_model">Son not türünüzü silemezsin.</string>
+    <string name="toast_last_model">Son not türünüzü silemezsiniz</string>
     <string name="toast_last_field">Not türlerinin en az bir alanı olmak zorundadır</string>
     <string name="toast_empty_name">İsim girmeniz gerekiyor</string>
     <string name="toast_duplicate_field">Alan ismi zaten kullanılıyor</string>
@@ -44,17 +44,17 @@
     </plurals>
     <!--Browser-->
     <string name="model_browser_delete">Not türünü sil</string>
-    <string name="model_browser_rename" comment="Rename a note type">Yeniden adlandır</string>
+    <string name="model_browser_rename" comment="Rename a note type">Adını değiştir</string>
     <string name="model_browser_template">Kartları düzenle</string>
     <!--Rename-->
-    <string name="rename_model">Not türünü yeniden adlandır</string>
+    <string name="rename_model">Not türünün adını değiştir</string>
     <!--Language Hint-->
     <string name="model_field_editor_language_hint_dialog_success_result">Dil ipucunu %s olarak ayarla</string>
     <!--Field Editing-->
     <string name="model_field_editor_title">Alanları düzenle</string>
     <string name="model_field_editor_add" maxLength="28">Alan ekle</string>
     <string name="model_field_editor_delete">Alanı sil</string>
-    <string name="model_field_editor_rename">Alanı yeniden adlandır</string>
+    <string name="model_field_editor_rename">Alanın ismini değiştir</string>
     <string name="model_field_editor_language_hint">Klavye dili ipucunu ayarla</string>
     <string name="model_field_editor_reposition_menu">Alanın yerini değiştir</string>
     <string name="model_field_editor_toggle_sticky">Eklerken son girişi hatırla</string>
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Bu not türünü silmek istediğinize emin misiniz?</string>
     <string name="field_delete_warning">Bu alanı silmek istediğinize emin misiniz?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s</string>
+    <string name="model_browser_add_add">Ekle: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s</string>
+    <string name="model_browser_add_clone">Klonla: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Kartlarınızı görüntülemek için kullanılacak kart tarayıcı şablonunu giriniz. Daha anlaşılır bir yanıt görüntülemek için bunu kullanın.\n\nŞablonun önü\n\"{{Ülkesi}}nin başkenti: \"\nkart tarayıcıda şöyle sıkıştırılabilir\n\"Başkent: {{Ülke}}\"</string>
     <string name="card_template_browser_appearance_question_format">Soru Biçimi</string>

From a637d60d6e88c0bcafe87481a7692574782650f4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Mar 2025 11:50:35 -0500
Subject: [PATCH 143/200] build(deps): bump axios from 1.7.8 to 1.8.4 in
 /tools/localization

- bump axios
- constrain javascript formating to just our JS files
- manually commit yarn.lock change that yarn didn't like in its more restricted CI mode
---
 tools/localization/package.json |  4 ++--
 tools/localization/yarn.lock    | 13 +------------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/tools/localization/package.json b/tools/localization/package.json
index 3ed9a81d8583..a9df72e46ed4 100644
--- a/tools/localization/package.json
+++ b/tools/localization/package.json
@@ -8,8 +8,8 @@
         "build": "tsc",
         "start": "node ./dist/index.js",
         "dev": "tsc --watch",
-        "checkformat": "npx prettier --check .",
-        "format": "npx prettier --write .",
+        "checkformat": "npx prettier --check *js src/",
+        "format": "npx prettier --write *js src/",
         "lint": "eslint src/ --max-warnings=0",
         "test": "jest --passWithNoTests"
     },
diff --git a/tools/localization/yarn.lock b/tools/localization/yarn.lock
index 35bf1c3b7caa..e10462d57a44 100644
--- a/tools/localization/yarn.lock
+++ b/tools/localization/yarn.lock
@@ -1500,18 +1500,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"axios@npm:^1":
-  version: 1.7.8
-  resolution: "axios@npm:1.7.8"
-  dependencies:
-    follow-redirects: "npm:^1.15.6"
-    form-data: "npm:^4.0.0"
-    proxy-from-env: "npm:^1.1.0"
-  checksum: 10c0/23ae2d0105aea9170c34ac9b6f30d9b2ab2fa8b1370205d2f7ce98b9f9510ab420148c13359ee837ea5a4bf2fb028ff225bd2fc92052fb0c478c6b4a836e2d5f
-  languageName: node
-  linkType: hard
-
-"axios@npm:^1.8.4":
+"axios@npm:^1, axios@npm:^1.8.4":
   version: 1.8.4
   resolution: "axios@npm:1.8.4"
   dependencies:

From 1b127869351224dfb32292642357ab46fe094c55 Mon Sep 17 00:00:00 2001
From: AnkiDroid Translations <ankidroid@ankidroid.org>
Date: Mon, 24 Mar 2025 18:39:14 +0000
Subject: [PATCH 144/200] Updated strings from Crowdin

---
 AnkiDroid/src/main/res/values-pl/01-core.xml  |  2 +-
 .../src/main/res/values-pl/02-strings.xml     | 28 +++++++++----------
 .../src/main/res/values-pl/03-dialogs.xml     |  2 +-
 .../src/main/res/values-pl/08-widget.xml      |  2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/AnkiDroid/src/main/res/values-pl/01-core.xml b/AnkiDroid/src/main/res/values-pl/01-core.xml
index 65fcddba9d92..c41b11adeab3 100644
--- a/AnkiDroid/src/main/res/values-pl/01-core.xml
+++ b/AnkiDroid/src/main/res/values-pl/01-core.xml
@@ -135,7 +135,7 @@
     <string name="empty_deck">Ta talia jest pusta</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Wyszukiwanie talii</string>
     <string name="invalid_deck_name">Nieprawidłowa nazwa talii</string>
-    <string name="studyoptions_congrats_finished">Congratulations! You have finished for today.</string>
+    <string name="studyoptions_congrats_finished">Gratulacje! Zakończono powtórki na dziś.</string>
     <string name="studyoptions_congrats_next_due_in" comment="The param will be replaced with \'The next card will be ready in X time\'">Talia na razie skończona! %s</string>
     <string name="studyoptions_no_cards_due">Nie ma żadnych kart do przejrzenia.</string>
     <string name="sd_card_not_mounted">Urządzenie pamięci masowej nie zostało zamontowane</string>
diff --git a/AnkiDroid/src/main/res/values-pl/02-strings.xml b/AnkiDroid/src/main/res/values-pl/02-strings.xml
index 190548ffba19..f00f93f9d3ba 100644
--- a/AnkiDroid/src/main/res/values-pl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-pl/02-strings.xml
@@ -195,7 +195,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Tło</string>
     <string name="choose_an_image" maxLength="41">Wybierz obraz</string>
-    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Usuń tło</string>
     <string name="remove_background_image">Usunąć tło?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Przywróć domyślne</string>
@@ -238,10 +238,10 @@
     <string name="edit_toolbar_item">Edytuj element paska narzędzi</string>
     <string name="toolbar_item_explain_edit_or_remove">Wprowadź kod HTML, który będzie wstawiony przed i po wybranym tekście\n\nPrzytrzymaj element paska narzędzi, aby go usunąć</string>
     <string name="remove_toolbar_item">Usunąć element paska narzędzi?</string>
-    <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
-    <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
-    <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
+    <string name="note_editor_image_too_large">Obraz jest zbyt duży, proszę wstawić obraz ręcznie</string>
+    <string name="note_editor_video_too_large">Plik wideo jest za duży, proszę wstawić go ręcznie</string>
+    <string name="note_editor_audio_too_large">Plik audio jest za duży, proszę wstawić go ręcznie</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Kopia zapasowa Android w toku. Proszę spróbować ponownie</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">Może być konieczne użycie iManager, by umożliwić AnkiDroid dodawanie skrótów</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Twój launcher nie pozwala AnkiDroid dodawać skrótów</string>
     <string name="create_shortcut_error">Błąd dodawania skrótu: %s</string>
@@ -257,7 +257,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Pobierz talię</string>
-    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Otwórz w Przeglądarce</string>
     <string name="try_again">Spróbuj ponownie</string>
     <string name="cancel_download">Anuluj pobieranie</string>
     <string name="cancel_download_question_title">Anulować pobieranie?</string>
@@ -313,17 +313,17 @@
     <string name="show_notes" comment="Label for toggle notes button in BrowserOptionsDialog">Notatki</string>
     <string name="toggle_cards_notes">Przełącz karty/notatki</string>
     <string name="truncate_content_help">Przycinaj wysokość każdego wiersza przeglądarki, aby pokazać tylko pierwsze 3 linie treści</string>
-    <string name="browser_options_dialog_heading">Browser options</string>
+    <string name="browser_options_dialog_heading">Opcje przeglądarki</string>
     <string name="audio_saved">Nagranie zostało zapisane</string>
     <string name="deleting_selected_notes">Usuwanie zaznaczonych notatek</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Dotnij głosu, aby słuchać</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Głoś powinien zostać zainstalowany przed użyciem</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Użyj mimo to</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Błąd przekształcania tekstu na mowę (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Zainstaluj</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Nie udało się otworzyć ustawień przekształcania tekstu na mowę</string>
     <string name="shared_decks_login_required">Zaloguj się, aby pobrać więcej talii</string>
     <string name="deck_description_field_hint">Opis</string>
     <string name="failed_to_copy">Kopiowanie nieudane</string>
@@ -344,8 +344,8 @@
     <string name="orphan_note_message">Usunięcie tej karty spowoduje pozostawienie niektórych notatek bez żadnej karty.</string>
     <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
-    <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
+    <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Wybór talii</string>
+    <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Usuń talię bez potwierdzenia</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Edytor notatek</string>
     <string name="select_deck" comment="Description of the shortcut that opens the deck selection dialog">Wybierz talię</string>
     <string name="select_note_type" comment="Description of the shortcut that shows the note selection spinner">Wybierz typ notatki</string>
diff --git a/AnkiDroid/src/main/res/values-pl/03-dialogs.xml b/AnkiDroid/src/main/res/values-pl/03-dialogs.xml
index 5a7d5c288d2c..ea833b341c09 100644
--- a/AnkiDroid/src/main/res/values-pl/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-pl/03-dialogs.xml
@@ -221,7 +221,7 @@
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Nie pokazuj ponownie</string>
     <string name="dismiss_backup_warning_title">Ostrzeżenie o utracie danych</string>
     <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
-    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_upgrade">Ze względu na zmiany prywatności w systemie Android Twoje dane i automatyczne kopie zapasowe będą niedostępne, jeśli aplikacja zostanie odinstalowana</string>
     <string name="deck_already_exists">Taka talia już istnieje</string>
     <string name="empty_deck_name">Deck name cannot be empty</string>
     <string name="create_deck_numeric_hint">W przypadku wystąpienia problemów związanych z kolejnością talii (np. „10” pojawia się przed „2”), „2” należy zastąpić „02”.</string>
diff --git a/AnkiDroid/src/main/res/values-pl/08-widget.xml b/AnkiDroid/src/main/res/values-pl/08-widget.xml
index 3b19d9bf885f..0420aa70b50d 100644
--- a/AnkiDroid/src/main/res/values-pl/08-widget.xml
+++ b/AnkiDroid/src/main/res/values-pl/08-widget.xml
@@ -81,5 +81,5 @@
         <item quantity="other">You can select up to %d decks.</item>
     </plurals>
     <string name="empty_widget_state" comment="To denote the widget is empty">Missing deck. Tap to reconfigure.</string>
-    <string name="empty_collection_state_in_widget" comment="To denote the collection is empty">Collection is empty, use app to add decks then reconfigure</string>
+    <string name="empty_collection_state_in_widget" comment="To denote the collection is empty">Kolekcja jest pusta, użyj aplikacji do dodawania talii i skonfiguruj ponownie</string>
 </resources>

From 3e7dd22d914804cf002966f505eb7ce60f0d0732 Mon Sep 17 00:00:00 2001
From: Ashish Yadav <48384865+criticalAY@users.noreply.github.com>
Date: Thu, 20 Feb 2025 04:42:58 +0530
Subject: [PATCH 145/200] feat: media check viewmodel feat: add media check
 fragment file - feat: adapter for media check result - refactor: confirm
 media check dialog

---
 .../ichi2/anki/dialogs/MediaCheckDialog.kt    |   2 +-
 .../anki/mediacheck/MediaCheckAdapter.kt      |  64 ++++++
 .../anki/mediacheck/MediaCheckFragment.kt     | 205 ++++++++++++++++++
 .../anki/mediacheck/MediaCheckViewModel.kt    |  68 ++++++
 .../src/main/java/com/ichi2/libanki/Media.kt  |   7 +-
 .../main/res/layout/fragment_media_check.xml  |  88 ++++++++
 .../src/main/res/layout/item_media_check.xml  |  23 ++
 AnkiDroid/src/main/res/values/03-dialogs.xml  |   3 +-
 .../src/main/res/values/sentence-case.xml     |   2 +-
 9 files changed, 458 insertions(+), 4 deletions(-)
 create mode 100644 AnkiDroid/src/main/java/com/ichi2/anki/mediacheck/MediaCheckAdapter.kt
 create mode 100644 AnkiDroid/src/main/java/com/ichi2/anki/mediacheck/MediaCheckFragment.kt
 create mode 100644 AnkiDroid/src/main/java/com/ichi2/anki/mediacheck/MediaCheckViewModel.kt
 create mode 100644 AnkiDroid/src/main/res/layout/fragment_media_check.xml
 create mode 100644 AnkiDroid/src/main/res/layout/item_media_check.xml

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/MediaCheckDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/MediaCheckDialog.kt
index 04d3a50c53c4..a16283349b77 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/MediaCheckDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/MediaCheckDialog.kt
@@ -92,7 +92,7 @@ class MediaCheckDialog : AsyncDialogFragment() {
                         }
 
                         setPositiveButton(
-                            TR.mediaCheckDeleteUnused().toSentenceCase(requireContext(), R.string.check_media_delete_unused),
+                            TR.mediaCheckDeleteUnused().toSentenceCase(requireContext(), R.string.sentence_check_media_delete_unused),
                         ) { _, _ ->
                             (activity as MediaCheckDialogListener?)?.deleteUnused(unused)
                             activity?.dismissAllDialogFragments()
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/mediacheck/MediaCheckAdapter.kt b/AnkiDroid/src/main/java/com/ichi2/anki/mediacheck/MediaCheckAdapter.kt
new file mode 100644
index 000000000000..3553a296b701
--- /dev/null
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/mediacheck/MediaCheckAdapter.kt
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2025 Ashish Yadav <mailtoashish693@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.ichi2.anki.mediacheck
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import com.ichi2.anki.R
+
+class MediaCheckAdapter(
+    context: Context,
+) : ListAdapter<String, MediaCheckAdapter.ViewHolder>(DiffCallback()) {
+    private val inflater = LayoutInflater.from(context)
+
+    class ViewHolder(
+        itemView: View,
+    ) : RecyclerView.ViewHolder(itemView) {
+        val textView: TextView = itemView.findViewById(R.id.file_name_textview)
+    }
+
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ) = ViewHolder(inflater.inflate(R.layout.item_media_check, parent, false))
+
+    override fun onBindViewHolder(
+        holder: ViewHolder,
+        position: Int,
+    ) {
+        holder.textView.text = getItem(position)
+    }
+
+    class DiffCallback : DiffUtil.ItemCallback<String>() {
+        override fun areItemsTheSame(
+            oldItem: String,
+            newItem: String,
+        ) = oldItem == newItem
+
+        override fun areContentsTheSame(
+            oldItem: String,
+            newItem: String,
+        ) = true
+    }
+}
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/mediacheck/MediaCheckFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/mediacheck/MediaCheckFragment.kt
new file mode 100644
index 000000000000..85380b075d70
--- /dev/null
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/mediacheck/MediaCheckFragment.kt
@@ -0,0 +1,205 @@
+/*
+ * Copyright (c) 2025 Ashish Yadav <mailtoashish693@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.ichi2.anki.mediacheck
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.view.View
+import android.widget.TextView
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.appbar.MaterialToolbar
+import com.google.android.material.button.MaterialButton
+import com.ichi2.anki.CollectionManager.TR
+import com.ichi2.anki.R
+import com.ichi2.anki.SingleFragmentActivity
+import com.ichi2.anki.launchCatchingTask
+import com.ichi2.anki.ui.internationalization.toSentenceCase
+import com.ichi2.anki.withProgress
+import com.ichi2.libanki.MediaCheckResult
+import com.ichi2.utils.cancelable
+import com.ichi2.utils.message
+import com.ichi2.utils.negativeButton
+import com.ichi2.utils.positiveButton
+import com.ichi2.utils.show
+import com.ichi2.utils.title
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+
+/**
+ * MediaCheckFragment for displaying a list of media files that are either unused or missing.
+ * It allows users to tag missing media files or delete unused ones.
+ **/
+class MediaCheckFragment : Fragment(R.layout.fragment_media_check) {
+    private val viewModel: MediaCheckViewModel by viewModels()
+    private lateinit var adapter: MediaCheckAdapter
+
+    private lateinit var deleteMediaButton: MaterialButton
+    private lateinit var tagMissingButton: MaterialButton
+
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
+        super.onViewCreated(view, savedInstanceState)
+
+        view.findViewById<MaterialToolbar>(R.id.toolbar).apply {
+            setTitle(TR.mediaCheckCheckMediaAction().toSentenceCase(requireContext(), R.string.check_media))
+            setNavigationOnClickListener {
+                requireActivity().onBackPressedDispatcher.onBackPressed()
+            }
+        }
+
+        deleteMediaButton = view.findViewById(R.id.delete_used_media_button)
+        tagMissingButton = view.findViewById(R.id.tag_missing_media_button)
+
+        val recyclerView = view.findViewById<RecyclerView>(R.id.recyclerView)
+
+        adapter = MediaCheckAdapter(requireContext())
+        recyclerView.adapter = adapter
+
+        launchCatchingTask {
+            withProgress(R.string.check_media_message) {
+                viewModel.checkMedia().join()
+            }
+        }
+
+        lifecycleScope.launch {
+            viewModel.mediaCheckResult.collectLatest { result ->
+                view.findViewById<TextView>(R.id.unused_media_count)?.apply {
+                    text = (TR.mediaCheckUnusedCount(result?.unusedFileNames?.size ?: 0))
+                }
+
+                view.findViewById<TextView>(R.id.missing_media_count)?.apply {
+                    text = (TR.mediaCheckMissingCount(result?.missingMediaNotes?.size ?: 0))
+                }
+
+                result?.let { files ->
+                    handleMediaResult(files)
+                }
+            }
+        }
+
+        setupButtonListeners()
+    }
+
+    /**
+     * Processes media check results and updates the UI.
+     *
+     * @param mediaCheckResult The result containing missing and unused media file names.
+     */
+    private fun handleMediaResult(mediaCheckResult: MediaCheckResult) {
+        val fileList =
+            buildList {
+                if (mediaCheckResult.missingFileNames.isNotEmpty()) {
+                    tagMissingButton.visibility = View.VISIBLE
+                    add(TR.mediaCheckMissingHeader())
+                    addAll(mediaCheckResult.missingFileNames.map(TR::mediaCheckMissingFile))
+                }
+                if (mediaCheckResult.unusedFileNames.isNotEmpty()) {
+                    deleteMediaButton.visibility = View.VISIBLE
+                    if (isNotEmpty()) add("\n")
+                    add(TR.mediaCheckUnusedHeader())
+                    addAll(mediaCheckResult.unusedFileNames.map(TR::mediaCheckUnusedFile))
+                }
+            }
+
+        adapter.submitList(fileList)
+    }
+
+    private fun setupButtonListeners() {
+        tagMissingButton.apply {
+            // mediaCheckAddTag => "Tag Missing"
+            text = TR.mediaCheckAddTag().toSentenceCase(requireContext(), R.string.sentence_tag_missing)
+
+            setOnClickListener {
+                launchCatchingTask {
+                    withProgress(getString(R.string.check_media_adding_missing_tag)) {
+                        viewModel.tagMissing(TR.mediaCheckMissingMediaTag()).join()
+                        showResultDialog(
+                            R.string.check_media_tags_added,
+                            TR.browsingNotesUpdated(viewModel.taggedFiles),
+                        )
+                    }
+                }
+            }
+        }
+
+        deleteMediaButton.apply {
+            text =
+                TR.mediaCheckDeleteUnused().toSentenceCase(
+                    requireContext(),
+                    R.string.sentence_check_media_delete_unused,
+                )
+
+            setOnClickListener {
+                deleteConfirmationDialog()
+            }
+        }
+    }
+
+    private fun deleteConfirmationDialog() {
+        AlertDialog.Builder(requireContext()).show {
+            message(text = TR.mediaCheckDeleteUnusedConfirm())
+            positiveButton(R.string.dialog_ok) { handleDeleteConfirmation() }
+            negativeButton(R.string.dialog_cancel)
+        }
+    }
+
+    private fun handleDeleteConfirmation() {
+        launchCatchingTask {
+            withProgress(resources.getString(R.string.delete_media_message)) {
+                viewModel.deleteUnusedMedia().join()
+                showDeletionResult()
+            }
+        }
+    }
+
+    private fun showDeletionResult() {
+        showResultDialog(
+            R.string.delete_media_result_title,
+            resources.getQuantityString(
+                R.plurals.delete_media_result_message,
+                viewModel.deletedFiles,
+                viewModel.deletedFiles,
+            ),
+        )
+    }
+
+    private fun showResultDialog(
+        titleRes: Int,
+        message: String,
+    ) {
+        AlertDialog.Builder(requireContext()).show {
+            title(titleRes)
+            message(text = message)
+            positiveButton(R.string.dialog_ok) {
+                requireActivity().finish()
+            }
+            cancelable(false)
+        }
+    }
+
+    companion object {
+        fun getIntent(context: Context): Intent = SingleFragmentActivity.getIntent(context, MediaCheckFragment::class)
+    }
+}
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/mediacheck/MediaCheckViewModel.kt b/AnkiDroid/src/main/java/com/ichi2/anki/mediacheck/MediaCheckViewModel.kt
new file mode 100644
index 000000000000..d5b8a7dc7e6b
--- /dev/null
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/mediacheck/MediaCheckViewModel.kt
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2025 Ashish Yadav <mailtoashish693@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.ichi2.anki.mediacheck
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.ichi2.anki.CollectionManager.withCol
+import com.ichi2.annotations.NeedsTest
+import com.ichi2.async.deleteMedia
+import com.ichi2.libanki.MediaCheckResult
+import com.ichi2.libanki.undoableOp
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
+
+@NeedsTest("Test the media check process i.e. the buttons and views")
+class MediaCheckViewModel : ViewModel() {
+    private val _mediaCheckResult = MutableStateFlow<MediaCheckResult?>(null)
+    val mediaCheckResult: StateFlow<MediaCheckResult?> = _mediaCheckResult
+
+    private val deletedFilesCount: MutableStateFlow<Int> = MutableStateFlow(0)
+    private val taggedFilesCount: MutableStateFlow<Int> = MutableStateFlow(0)
+
+    val deletedFiles: Int
+        get() = deletedFilesCount.value
+
+    val taggedFiles: Int
+        get() = taggedFilesCount.value
+
+    // TODO: Move progress notifications here
+    fun tagMissing(tag: String): Job =
+        viewModelScope.launch {
+            val taggedNotes =
+                undoableOp {
+                    tags.bulkAdd(_mediaCheckResult.value?.missingMediaNotes ?: listOf(), tag)
+                }
+            taggedFilesCount.value = taggedNotes.count
+        }
+
+    fun checkMedia(): Job =
+        viewModelScope.launch {
+            val result = withCol { media.check() }
+            _mediaCheckResult.value = result
+        }
+
+    // TODO: investigate: the underlying implementation exposes progress, which we do not yet handle.
+    fun deleteUnusedMedia(): Job =
+        viewModelScope.launch {
+            val deletedMedia = withCol { deleteMedia(this@withCol, _mediaCheckResult.value?.unusedFileNames ?: listOf()) }
+            deletedFilesCount.value = deletedMedia
+        }
+}
diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/Media.kt b/AnkiDroid/src/main/java/com/ichi2/libanki/Media.kt
index 9be36d02e000..4088be082d10 100644
--- a/AnkiDroid/src/main/java/com/ichi2/libanki/Media.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/libanki/Media.kt
@@ -100,7 +100,12 @@ open class Media(
     // FIXME: this also provides trash count, but UI can not handle it yet
     fun check(): MediaCheckResult {
         val out = col.backend.checkMedia()
-        return MediaCheckResult(out.missingList, out.unusedList, listOf(), out.missingMediaNotesList)
+        return MediaCheckResult(
+            missingFileNames = out.missingList,
+            unusedFileNames = out.unusedList,
+            invalidFileNames = listOf(),
+            missingMediaNotes = out.missingMediaNotesList,
+        )
     }
 
     /**
diff --git a/AnkiDroid/src/main/res/layout/fragment_media_check.xml b/AnkiDroid/src/main/res/layout/fragment_media_check.xml
new file mode 100644
index 000000000000..3395b4690101
--- /dev/null
+++ b/AnkiDroid/src/main/res/layout/fragment_media_check.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2025 Ashish Yadav <mailtoashish693@gmail.com>
+  ~
+  ~ This program is free software; you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by the Free Software
+  ~ Foundation; either version 3 of the License, or (at your option) any later
+  ~ version.
+  ~
+  ~ This program is distributed in the hope that it will be useful, but WITHOUT ANY
+  ~ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  ~ FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+  ~ details.
+  ~
+  ~ You should have received a copy of the GNU General Public License along with
+  ~ this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical">
+
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        app:navigationContentDescription="@string/abc_action_bar_up_description"
+        app:navigationIcon="?attr/homeAsUpIndicator" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="10dp"
+        android:orientation="vertical"
+        android:paddingHorizontal="12sp">
+
+        <com.ichi2.ui.FixedTextView
+            android:id="@+id/missing_media_count"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textStyle="bold" />
+
+        <com.ichi2.ui.FixedTextView
+            android:id="@+id/unused_media_count"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textStyle="bold" />
+    </LinearLayout>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recyclerView"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:divider="@android:color/darker_gray"
+        android:dividerHeight="1dp"
+        app:layoutManager="LinearLayoutManager" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingHorizontal="8dp">
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/tag_missing_media_button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="4dp"
+            android:layout_weight="1"
+            android:visibility="gone"
+            tools:text="Tag missing" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/delete_used_media_button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="4dp"
+            android:layout_weight="1"
+            android:visibility="gone"
+            tools:text="Delete unused" />
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/AnkiDroid/src/main/res/layout/item_media_check.xml b/AnkiDroid/src/main/res/layout/item_media_check.xml
new file mode 100644
index 000000000000..f72e08e0b8dd
--- /dev/null
+++ b/AnkiDroid/src/main/res/layout/item_media_check.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2025 Ashish Yadav <mailtoashish693@gmail.com>
+  ~
+  ~ This program is free software; you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by the Free Software
+  ~ Foundation; either version 3 of the License, or (at your option) any later
+  ~ version.
+  ~
+  ~ This program is distributed in the hope that it will be useful, but WITHOUT ANY
+  ~ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  ~ FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+  ~ details.
+  ~
+  ~ You should have received a copy of the GNU General Public License along with
+  ~ this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<com.ichi2.ui.FixedTextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/file_name_textview"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:textSize="11sp"
+    android:paddingHorizontal="12dp"/>
\ No newline at end of file
diff --git a/AnkiDroid/src/main/res/values/03-dialogs.xml b/AnkiDroid/src/main/res/values/03-dialogs.xml
index 98acb3f95de1..f51f90a402f5 100644
--- a/AnkiDroid/src/main/res/values/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values/03-dialogs.xml
@@ -88,7 +88,8 @@
     <string name="check_media_acknowledge">Media checked</string>
     <string name="check_media_invalid">Files with invalid encoding: %d</string>
     <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_delete_unused">Delete unused</string>
+    <string name="check_media_adding_missing_tag">Adding tags…</string>
+    <string name="check_media_tags_added">Tags added</string>
 
     <string name="delete_media_message">Deleting media…</string>
     <string name="delete_media_result_title">Deletion result</string>
diff --git a/AnkiDroid/src/main/res/values/sentence-case.xml b/AnkiDroid/src/main/res/values/sentence-case.xml
index b7f6d57f74af..f4b327710cb5 100644
--- a/AnkiDroid/src/main/res/values/sentence-case.xml
+++ b/AnkiDroid/src/main/res/values/sentence-case.xml
@@ -46,5 +46,5 @@ undoActionUndone()
     <string name="sentence_reposition_new_cards">Reposition new cards</string>
     <string name="sentence_find_and_replace">Find and replace</string>
     <string name="sentence_all_fields">All fields</string>
-
+    <string name="sentence_check_media_delete_unused">Delete unused</string>
 </resources>
\ No newline at end of file

From dc37ead165e924082738eacf60dc2c13db22d61b Mon Sep 17 00:00:00 2001
From: Ashish Yadav <48384865+criticalAY@users.noreply.github.com>
Date: Thu, 20 Feb 2025 04:51:23 +0530
Subject: [PATCH 146/200] refactor: remove unused code - refactor: replace
 media check result dialog with fragment - refactor: remove unused parameter
 in Media.kt

---
 .../main/java/com/ichi2/anki/DeckPicker.kt    |  70 +---
 .../com/ichi2/anki/dialogs/DialogHandler.kt   |   2 -
 .../ichi2/anki/dialogs/MediaCheckDialog.kt    | 332 ------------------
 .../ichi2/anki/servicelayer/MediaService.kt   |  28 --
 .../src/main/java/com/ichi2/libanki/Media.kt  |   2 -
 .../res/layout/media_check_dialog_body.xml    |  47 ---
 AnkiDroid/src/main/res/values/03-dialogs.xml  |   3 -
 .../anki/dialogs/AsyncDialogFragmentsTest.kt  |   9 -
 8 files changed, 15 insertions(+), 478 deletions(-)
 delete mode 100644 AnkiDroid/src/main/java/com/ichi2/anki/dialogs/MediaCheckDialog.kt
 delete mode 100644 AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/MediaService.kt
 delete mode 100644 AnkiDroid/src/main/res/layout/media_check_dialog_body.xml

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt b/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
index fa5d32e124ad..a1b0edd835a4 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
@@ -131,8 +131,6 @@ import com.ichi2.anki.dialogs.EmptyCardsDialogFragment
 import com.ichi2.anki.dialogs.ImportDialog.ImportDialogListener
 import com.ichi2.anki.dialogs.ImportFileSelectionFragment.ApkgImportResultLauncherProvider
 import com.ichi2.anki.dialogs.ImportFileSelectionFragment.CsvImportResultLauncherProvider
-import com.ichi2.anki.dialogs.MediaCheckDialog
-import com.ichi2.anki.dialogs.MediaCheckDialog.MediaCheckDialogListener
 import com.ichi2.anki.dialogs.SyncErrorDialog
 import com.ichi2.anki.dialogs.SyncErrorDialog.Companion.newInstance
 import com.ichi2.anki.dialogs.SyncErrorDialog.SyncErrorDialogListener
@@ -144,6 +142,7 @@ import com.ichi2.anki.export.ExportDialogsFactory
 import com.ichi2.anki.export.ExportDialogsFactoryProvider
 import com.ichi2.anki.introduction.CollectionPermissionScreenLauncher
 import com.ichi2.anki.introduction.hasCollectionStoragePermissions
+import com.ichi2.anki.mediacheck.MediaCheckFragment
 import com.ichi2.anki.noteeditor.NoteEditorLauncher
 import com.ichi2.anki.notetype.ManageNotetypes
 import com.ichi2.anki.pages.AnkiPackageImporterFragment
@@ -154,7 +153,6 @@ import com.ichi2.anki.preferences.PreferencesActivity
 import com.ichi2.anki.preferences.sharedPrefs
 import com.ichi2.anki.receiver.SdCardReceiver
 import com.ichi2.anki.servicelayer.ScopedStorageService
-import com.ichi2.anki.servicelayer.checkMedia
 import com.ichi2.anki.settings.Prefs
 import com.ichi2.anki.snackbar.BaseSnackbarBuilderProvider
 import com.ichi2.anki.snackbar.SnackbarBuilder
@@ -166,13 +164,11 @@ import com.ichi2.anki.worker.SyncMediaWorker
 import com.ichi2.anki.worker.SyncWorker
 import com.ichi2.anki.worker.UniqueWorkNames
 import com.ichi2.annotations.NeedsTest
-import com.ichi2.async.deleteMedia
 import com.ichi2.compat.CompatHelper.Companion.getSerializableCompat
 import com.ichi2.compat.CompatHelper.Companion.sdkVersion
 import com.ichi2.libanki.ChangeManager
 import com.ichi2.libanki.DeckId
 import com.ichi2.libanki.Decks
-import com.ichi2.libanki.MediaCheckResult
 import com.ichi2.libanki.exception.ConfirmModSchemaException
 import com.ichi2.libanki.sched.DeckNode
 import com.ichi2.libanki.utils.TimeManager
@@ -245,7 +241,6 @@ open class DeckPicker :
     StudyOptionsListener,
     SyncErrorDialogListener,
     ImportDialogListener,
-    MediaCheckDialogListener,
     OnRequestPermissionsResultCallback,
     ChangeManager.Subscriber,
     SyncCompletionListener,
@@ -1181,7 +1176,7 @@ open class DeckPicker :
             }
             R.id.action_check_media -> {
                 Timber.i("DeckPicker:: Check media button pressed")
-                showMediaCheckDialog(MediaCheckDialog.Type.DIALOG_CONFIRM_MEDIA_CHECK)
+                showMediaCheckDialog()
                 return true
             }
             R.id.action_empty_cards -> {
@@ -1226,6 +1221,17 @@ open class DeckPicker :
         }
     }
 
+    private fun showMediaCheckDialog() {
+        AlertDialog.Builder(this).show {
+            title(text = getString(R.string.check_media_title))
+            message(text = getString(R.string.check_media_warning))
+            positiveButton(R.string.dialog_ok) {
+                startActivity(MediaCheckFragment.getIntent(this@DeckPicker))
+            }
+            negativeButton(R.string.dialog_cancel)
+        }
+    }
+
     fun showCreateFilteredDeckDialog() {
         val createFilteredDeckDialog =
             CreateDeckDialog(this@DeckPicker, R.string.new_deck, CreateDeckDialog.DeckDialogType.FILTERED_DECK, null)
@@ -1495,7 +1501,7 @@ open class DeckPicker :
             }
             KeyEvent.KEYCODE_M -> {
                 Timber.i("Check media from keypress")
-                showMediaCheckDialog(MediaCheckDialog.Type.DIALOG_CONFIRM_MEDIA_CHECK)
+                showMediaCheckDialog()
                 return true
             }
             KeyEvent.KEYCODE_E -> {
@@ -1813,17 +1819,6 @@ open class DeckPicker :
         }
     }
 
-    override fun showMediaCheckDialog(dialogType: MediaCheckDialog.Type) {
-        showAsyncDialogFragment(MediaCheckDialog.newInstance(dialogType))
-    }
-
-    override fun showMediaCheckDialog(
-        dialogType: MediaCheckDialog.Type,
-        checkList: MediaCheckResult,
-    ) {
-        showAsyncDialogFragment(MediaCheckDialog.newInstance(dialogType, checkList))
-    }
-
     /**
      * Show a specific sync error dialog
      * @param dialogType id of dialog to show
@@ -1896,43 +1891,8 @@ open class DeckPicker :
         handleDatabaseCheck()
     }
 
-    /**
-     * Schedules a background job to find missing, unused and invalid media files.
-     * Shows a progress dialog while operation is running.
-     * When check is finished a dialog box shows number of missing, unused and invalid media files.
-     *
-     * If has the storage permission, job is scheduled, otherwise storage permission is asked first.
-     */
     override fun mediaCheck() {
-        launchCatchingTask {
-            val mediaCheckResult = checkMedia()
-            showMediaCheckDialog(MediaCheckDialog.Type.DIALOG_MEDIA_CHECK_RESULTS, mediaCheckResult)
-        }
-    }
-
-    override fun deleteUnused(unused: List<String>) {
-        launchCatchingTask {
-            // Number of deleted files
-            val noOfDeletedFiles =
-                withProgress(resources.getString(R.string.delete_media_message)) {
-                    withCol { deleteMedia(this@withCol, unused) }
-                }
-            showSimpleMessageDialog(
-                title = resources.getString(R.string.delete_media_result_title),
-                message = resources.getQuantityString(R.plurals.delete_media_result_message, noOfDeletedFiles, noOfDeletedFiles),
-            )
-        }
-    }
-
-    override fun tagMissing(missingMediaNotes: List<Long>?) {
-        if (missingMediaNotes == null) return
-
-        Timber.d("DeckPicker:: Adding missing media tag")
-        launchCatchingTask {
-            withCol {
-                tags.bulkAdd(missingMediaNotes, TR.mediaCheckMissingMediaTag())
-            }
-        }
+        showMediaCheckDialog()
     }
 
     open fun handleDbError() {
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DialogHandler.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DialogHandler.kt
index b13937628939..f3bae6a939fb 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DialogHandler.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DialogHandler.kt
@@ -119,7 +119,6 @@ abstract class DialogHandlerMessage protected constructor(
                 WhichDialogHandler.MSG_SHOW_COLLECTION_IMPORT_REPLACE_DIALOG -> ImportUtils.CollectionImportReplace.fromMessage(message)
                 WhichDialogHandler.MSG_SHOW_COLLECTION_IMPORT_ADD_DIALOG -> ImportUtils.CollectionImportAdd.fromMessage(message)
                 WhichDialogHandler.MSG_SHOW_SYNC_ERROR_DIALOG -> SyncErrorDialog.SyncErrorDialogMessageHandler.fromMessage(message)
-                WhichDialogHandler.MSG_SHOW_MEDIA_CHECK_COMPLETE_DIALOG -> MediaCheckDialog.MediaCheckCompleteDialog.fromMessage(message)
                 WhichDialogHandler.MSG_SHOW_DATABASE_ERROR_DIALOG -> DatabaseErrorDialog.ShowDatabaseErrorDialog.fromMessage(message)
                 WhichDialogHandler.MSG_SHOW_ONE_WAY_SYNC_DIALOG -> OneWaySyncDialog.fromMessage(message)
                 WhichDialogHandler.MSG_DO_SYNC -> IntentHandler.Companion.DoSync()
@@ -136,7 +135,6 @@ abstract class DialogHandlerMessage protected constructor(
         MSG_SHOW_COLLECTION_IMPORT_REPLACE_DIALOG(1),
         MSG_SHOW_COLLECTION_IMPORT_ADD_DIALOG(2),
         MSG_SHOW_SYNC_ERROR_DIALOG(3),
-        MSG_SHOW_MEDIA_CHECK_COMPLETE_DIALOG(5),
         MSG_SHOW_DATABASE_ERROR_DIALOG(6),
         MSG_SHOW_ONE_WAY_SYNC_DIALOG(7),
         MSG_DO_SYNC(8),
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/MediaCheckDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/MediaCheckDialog.kt
deleted file mode 100644
index a16283349b77..000000000000
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/MediaCheckDialog.kt
+++ /dev/null
@@ -1,332 +0,0 @@
-//noinspection MissingCopyrightHeader #8659
-
-package com.ichi2.anki.dialogs
-
-import android.app.Dialog
-import android.os.Bundle
-import android.os.Message
-import android.text.method.ScrollingMovementMethod
-import android.view.LayoutInflater
-import android.view.View
-import android.widget.LinearLayout
-import android.widget.TextView
-import androidx.annotation.CheckResult
-import androidx.appcompat.app.AlertDialog
-import androidx.core.os.bundleOf
-import com.ichi2.anki.AnkiActivity
-import com.ichi2.anki.CollectionManager.TR
-import com.ichi2.anki.DeckPicker
-import com.ichi2.anki.R
-import com.ichi2.anki.dialogs.MediaCheckDialog.Type.DIALOG_CONFIRM_MEDIA_CHECK
-import com.ichi2.anki.dialogs.MediaCheckDialog.Type.DIALOG_MEDIA_CHECK_RESULTS
-import com.ichi2.anki.showError
-import com.ichi2.anki.ui.internationalization.toSentenceCase
-import com.ichi2.anki.utils.ext.dismissAllDialogFragments
-import com.ichi2.compat.CompatHelper.Companion.getSerializableCompat
-import com.ichi2.libanki.MediaCheckResult
-
-class MediaCheckDialog : AsyncDialogFragment() {
-    interface MediaCheckDialogListener {
-        fun showMediaCheckDialog(dialogType: Type)
-
-        fun showMediaCheckDialog(
-            dialogType: Type,
-            checkList: MediaCheckResult,
-        )
-
-        fun mediaCheck()
-
-        fun deleteUnused(unused: List<String>)
-
-        fun tagMissing(missingMediaNotes: List<Long>?)
-    }
-
-    private val dialogType: Type
-        get() = Type.fromCode(requireArguments().getInt(MEDIA_CHECK_DIALOG_TYPE_KEY))
-
-    private val noHave: List<String>?
-        get() = requireArguments().getStringArrayList(NO_HAVE)
-
-    private val unused: List<String>?
-        get() = requireArguments().getStringArrayList(UNUSED)
-
-    private val invalid: List<String>?
-        get() = requireArguments().getStringArrayList(INVALID)
-
-    private val missingMediaNotes: List<Long>?
-        get() = requireArguments().getSerializableCompat<ArrayList<Long>>(MISSING_MEDIA_NOTES)
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        super.onCreate(savedInstanceState)
-        val dialog =
-            AlertDialog
-                .Builder(requireContext())
-                .setTitle(notificationTitle)
-        return when (dialogType) {
-            DIALOG_CONFIRM_MEDIA_CHECK -> {
-                dialog
-                    .setMessage(notificationMessage)
-                    .setPositiveButton(R.string.dialog_ok) { _, _ ->
-                        (activity as MediaCheckDialogListener?)?.mediaCheck()
-                        activity?.dismissAllDialogFragments()
-                    }.setNegativeButton(R.string.dialog_cancel) { _, _ ->
-                        activity?.dismissAllDialogFragments()
-                    }.create()
-            }
-            DIALOG_MEDIA_CHECK_RESULTS -> {
-                val noHave = noHave!!
-                val unused = unused!!
-                val invalid = invalid!!
-                // Generate report
-                val report = generateReport(unused, noHave, invalid)
-
-                val dialogBody = setupDialogBody(layoutInflater, report, noHave, unused)
-
-                dialog
-                    .setView(dialogBody)
-                    .setCancelable(false)
-                    .apply {
-                        if (unused.isEmpty() && noHave.isEmpty()) {
-                            setNegativeButton(R.string.dialog_ok) { _, _ -> activity?.dismissAllDialogFragments() }
-                            return@apply
-                        }
-
-                        setPositiveButton(
-                            TR.mediaCheckDeleteUnused().toSentenceCase(requireContext(), R.string.sentence_check_media_delete_unused),
-                        ) { _, _ ->
-                            (activity as MediaCheckDialogListener?)?.deleteUnused(unused)
-                            activity?.dismissAllDialogFragments()
-                        }
-                        setNeutralButton(R.string.dialog_cancel) { _, _ -> activity?.dismissAllDialogFragments() }
-
-                        if (noHave.isNotEmpty()) {
-                            setNegativeButton(
-                                TR.mediaCheckAddTag().toSentenceCase(requireContext(), R.string.sentence_tag_missing),
-                            ) { _, _ ->
-                                (activity as MediaCheckDialogListener?)?.tagMissing(missingMediaNotes)
-                                activity?.dismissAllDialogFragments()
-                            }
-                        }
-                    }.create()
-            }
-        }
-    }
-
-    private fun generateReport(
-        unused: List<String>,
-        noHave: List<String>,
-        invalid: List<String>,
-    ): String {
-        val report = StringBuilder()
-        if (invalid.isNotEmpty()) {
-            report.append(String.format(res().getString(R.string.check_media_invalid), invalid.size))
-        }
-
-        if (noHave.isNotEmpty()) {
-            if (report.isNotEmpty()) {
-                report.append("\n")
-            }
-            report.append(TR.mediaCheckMissingCount(noHave.size))
-        }
-
-        if (unused.isNotEmpty()) {
-            if (report.isNotEmpty()) {
-                report.append("\n")
-            }
-            report.append(TR.mediaCheckUnusedCount(unused.size))
-        }
-        if (report.isEmpty()) {
-            report.append(res().getString(R.string.check_media_no_unused_missing))
-        }
-        return report.toString()
-    }
-
-    private fun setupDialogBody(
-        inflater: LayoutInflater,
-        report: String,
-        noHave: List<String>,
-        unused: List<String>,
-    ): LinearLayout {
-        val dialogBody = inflater.inflate(R.layout.media_check_dialog_body, null) as LinearLayout
-        val reportTextView = dialogBody.findViewById<TextView>(R.id.reportTextView)
-        val fileListTextView = dialogBody.findViewById<TextView>(R.id.fileListTextView)
-
-        reportTextView.text = createReportString(report)
-
-        if (unused.isNotEmpty() || noHave.isNotEmpty()) {
-            fileListTextView.text = formatMissingAndUnusedFiles(noHave, unused)
-            fileListTextView.isScrollbarFadingEnabled = unused.size + noHave.size <= fileListTextView.maxLines
-            fileListTextView.movementMethod = ScrollingMovementMethod.getInstance()
-            fileListTextView.setTextIsSelectable(true)
-        } else {
-            fileListTextView.visibility = View.GONE
-        }
-
-        return dialogBody
-    }
-
-    private fun createReportString(report: String): String =
-        """
-        |$report
-        """.trimMargin().trimIndent()
-
-    private fun formatMissingAndUnusedFiles(
-        noHave: List<String>,
-        unused: List<String>,
-    ): String {
-        val noHaveFormatted = noHave.joinToString("\n") { missingMedia -> TR.mediaCheckMissingFile(missingMedia) }
-        val unusedFormatted = unused.joinToString("\n") { unusedMedia -> TR.mediaCheckUnusedFile(unusedMedia) }
-
-        return buildString {
-            if (noHaveFormatted.isNotEmpty()) {
-                append(TR.mediaCheckMissingHeader())
-                append("\n")
-                append(noHaveFormatted)
-                append("\n\n")
-            }
-            if (unusedFormatted.isNotEmpty()) {
-                append(TR.mediaCheckUnusedHeader())
-                append("\n")
-                append(unusedFormatted)
-            }
-        }
-    }
-
-    override val notificationMessage: String
-        get() =
-            when (dialogType) {
-                DIALOG_CONFIRM_MEDIA_CHECK -> res().getString(R.string.check_media_warning)
-                DIALOG_MEDIA_CHECK_RESULTS -> res().getString(R.string.check_media_acknowledge)
-            }
-
-    override val notificationTitle: String
-        get() =
-            when (dialogType) {
-                DIALOG_CONFIRM_MEDIA_CHECK -> res().getString(R.string.check_media_title)
-                DIALOG_MEDIA_CHECK_RESULTS -> TR.mediaCheckCheckMediaAction()
-            }
-
-    override val dialogHandlerMessage: MediaCheckCompleteDialog
-        get() {
-            return MediaCheckCompleteDialog(dialogType, noHave, unused, invalid, missingMediaNotes)
-        }
-
-    enum class Type(
-        val code: Int,
-    ) {
-        DIALOG_CONFIRM_MEDIA_CHECK(0),
-        DIALOG_MEDIA_CHECK_RESULTS(1),
-        ;
-
-        companion object {
-            fun fromCode(code: Int) = Type.entries.first { code == it.code }
-        }
-    }
-
-    companion object {
-        /**
-         * Key for an ordinal in the Type.entries.
-         */
-        const val MEDIA_CHECK_DIALOG_TYPE_KEY = "dialogType"
-
-        /**
-         * Key for an array of strings of name of missing media
-         */
-        const val NO_HAVE = "noHave"
-
-        /**
-         * Key for an array of strings of name of unused media
-         */
-        const val UNUSED = "unused"
-
-        /**
-         * Key for an array of strings of name of invalid media
-         */
-        const val INVALID = "invalid"
-
-        /**
-         * Key for a list of notes with missing media
-         */
-        const val MISSING_MEDIA_NOTES = "missingMediaNotes"
-
-        @CheckResult
-        fun newInstance(dialogType: Type) =
-            MediaCheckDialog().apply { arguments = bundleOf(MEDIA_CHECK_DIALOG_TYPE_KEY to dialogType.code) }
-
-        // TODO Instead of putting string arrays into the bundle,
-        //   make MediaCheckResult parcelable with @Parcelize and put it instead
-        fun newInstance(
-            dialogType: Type,
-            checkList: MediaCheckResult,
-        ) = MediaCheckDialog().apply {
-            arguments =
-                bundleOf(
-                    NO_HAVE to ArrayList(checkList.missingFileNames),
-                    UNUSED to ArrayList(checkList.unusedFileNames),
-                    INVALID to ArrayList(checkList.invalidFileNames),
-                    MEDIA_CHECK_DIALOG_TYPE_KEY to dialogType.code,
-                    MISSING_MEDIA_NOTES to ArrayList(checkList.missingMediaNotes).toList(),
-                )
-        }
-    }
-
-    class MediaCheckCompleteDialog(
-        private val dialogType: Type,
-        private val noHave: List<String>?,
-        private val unused: List<String>?,
-        private val invalid: List<String>?,
-        private val missingMediaNotes: List<Long>?,
-    ) : DialogHandlerMessage(WhichDialogHandler.MSG_SHOW_MEDIA_CHECK_COMPLETE_DIALOG, "MediaCheckCompleteDialog") {
-        override fun handleAsyncMessage(activity: AnkiActivity) {
-            // Media check results
-            when (dialogType) {
-                DIALOG_MEDIA_CHECK_RESULTS -> {
-                    // we may be called via any AnkiActivity but media check is a DeckPicker thing
-                    if (activity !is DeckPicker) {
-                        showError(
-                            activity,
-                            activity.getString(R.string.something_wrong),
-                            ClassCastException(activity.javaClass.simpleName + " is not " + DeckPicker::class.java.simpleName),
-                            true,
-                        )
-                        return
-                    }
-                    val checkList =
-                        MediaCheckResult(
-                            noHave ?: arrayListOf(),
-                            unused ?: arrayListOf(),
-                            invalid ?: arrayListOf(),
-                            missingMediaNotes ?: arrayListOf(),
-                        )
-                    activity.showMediaCheckDialog(dialogType, checkList)
-                }
-                DIALOG_CONFIRM_MEDIA_CHECK -> { }
-            }
-        }
-
-        override fun toMessage(): Message =
-            Message.obtain().apply {
-                what = this@MediaCheckCompleteDialog.what
-                data =
-                    bundleOf(
-                        NO_HAVE to noHave,
-                        UNUSED to unused,
-                        INVALID to invalid,
-                        MEDIA_CHECK_DIALOG_TYPE_KEY to dialogType,
-                        MISSING_MEDIA_NOTES to missingMediaNotes,
-                    )
-            }
-
-        companion object {
-            fun fromMessage(message: Message): MediaCheckCompleteDialog {
-                val dialogType = Type.fromCode(message.data.getInt(MEDIA_CHECK_DIALOG_TYPE_KEY))
-                val noHave = message.data.getStringArrayList(NO_HAVE)
-                val unused = message.data.getStringArrayList(UNUSED)
-                val invalid = message.data.getStringArrayList(INVALID)
-                val missingMediaNotes = message.data.getLongArray(MISSING_MEDIA_NOTES)?.toList()
-
-                return MediaCheckCompleteDialog(dialogType, noHave, unused, invalid, missingMediaNotes)
-            }
-        }
-    }
-}
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/MediaService.kt b/AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/MediaService.kt
deleted file mode 100644
index d3c01529b7c0..000000000000
--- a/AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/MediaService.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  Copyright (c) 2023 David Allison <davidallisongithub@gmail.com>
- *
- *  This program is free software; you can redistribute it and/or modify it under
- *  the terms of the GNU General Public License as published by the Free Software
- *  Foundation; either version 3 of the License, or (at your option) any later
- *  version.
- *
- *  This program is distributed in the hope that it will be useful, but WITHOUT ANY
- *  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- *  PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with
- *  this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.ichi2.anki.servicelayer
-
-import com.ichi2.anki.AnkiActivity
-import com.ichi2.anki.CollectionManager
-import com.ichi2.anki.R
-import com.ichi2.anki.withProgress
-import com.ichi2.libanki.MediaCheckResult
-
-suspend fun AnkiActivity.checkMedia(): MediaCheckResult =
-    withProgress(R.string.check_media_message) {
-        CollectionManager.withCol { media.check() }
-    }
diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/Media.kt b/AnkiDroid/src/main/java/com/ichi2/libanki/Media.kt
index 4088be082d10..e46685d651ca 100644
--- a/AnkiDroid/src/main/java/com/ichi2/libanki/Media.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/libanki/Media.kt
@@ -103,7 +103,6 @@ open class Media(
         return MediaCheckResult(
             missingFileNames = out.missingList,
             unusedFileNames = out.unusedList,
-            invalidFileNames = listOf(),
             missingMediaNotes = out.missingMediaNotesList,
         )
     }
@@ -148,6 +147,5 @@ fun getCollectionMediaPath(collectionPath: String): String = collectionPath.repl
 data class MediaCheckResult(
     val missingFileNames: List<String>,
     val unusedFileNames: List<String>,
-    val invalidFileNames: List<String>,
     val missingMediaNotes: List<Long>,
 )
diff --git a/AnkiDroid/src/main/res/layout/media_check_dialog_body.xml b/AnkiDroid/src/main/res/layout/media_check_dialog_body.xml
deleted file mode 100644
index e27a35455b1e..000000000000
--- a/AnkiDroid/src/main/res/layout/media_check_dialog_body.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (c) 2021 Dorrin Sotoudeh <dorrinsotoudeh123@gmail.com>
-
-  This program is free software; you can redistribute it and/or modify it under
-  the terms of the GNU General Public License as published by the Free Software
-  Foundation; either version 3 of the License, or (at your option) any later
-  version.
-
-  This program is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-  PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingEnd="25dp"
-    android:paddingStart="25dp">
-
-    <TextView
-        android:id="@+id/reportTextView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAlignment="viewStart"
-        android:textSize="15sp"
-        android:textStyle="bold" />
-
-    <TextView
-        android:id="@+id/fileListTextView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="center"
-        android:background="?attr/checkMediaListBackground"
-        android:minHeight="48dp"
-        android:minWidth="48dp"
-        android:paddingBottom="5dp"
-        android:paddingStart="10dp"
-        android:paddingEnd="10dp"
-        android:paddingTop="5dp"
-        android:scrollbars="vertical"
-        android:textColor="?attr/checkMediaListForeground"
-        android:textSize="12.5sp" />
-</LinearLayout>
\ No newline at end of file
diff --git a/AnkiDroid/src/main/res/values/03-dialogs.xml b/AnkiDroid/src/main/res/values/03-dialogs.xml
index f51f90a402f5..c9f3b810b9b9 100644
--- a/AnkiDroid/src/main/res/values/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values/03-dialogs.xml
@@ -85,9 +85,6 @@
     <string name="check_media_title">Check media?</string>
     <string name="check_media_warning">This may take a long time with large media collections</string>
     <string name="check_media_message">Checking media…</string>
-    <string name="check_media_acknowledge">Media checked</string>
-    <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_no_unused_missing">No unused or missing files found</string>
     <string name="check_media_adding_missing_tag">Adding tags…</string>
     <string name="check_media_tags_added">Tags added</string>
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/AsyncDialogFragmentsTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/AsyncDialogFragmentsTest.kt
index baccbdd7a3e0..77a41329ca1e 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/AsyncDialogFragmentsTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/AsyncDialogFragmentsTest.kt
@@ -50,15 +50,6 @@ class AsyncDialogFragmentsTest {
         assertDoesNotThrow("title required a context") { instance.notificationTitle }
     }
 
-    @Test
-    fun `MediaCheckDialog does not require context`() {
-        for (dialogType in MediaCheckDialog.Type.entries) {
-            val instance = MediaCheckDialog.newInstance(dialogType)
-            assertDoesNotThrow("$dialogType message required a context") { instance.notificationMessage }
-            assertDoesNotThrow("$dialogType title required a context") { instance.notificationTitle }
-        }
-    }
-
     @Test
     fun `ImportDialog does not require context`() {
         for (dialogType in ImportDialog.Type.entries) {

From 085ba7b639322c7dc4614227c2e4b7a3d4b17d60 Mon Sep 17 00:00:00 2001
From: AnkiDroid Translations <ankidroid@ankidroid.org>
Date: Mon, 24 Mar 2025 19:29:59 +0000
Subject: [PATCH 147/200] Updated strings from Crowdin

---
 AnkiDroid/src/main/res/values-af/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-am/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-ar/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-az/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-be/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-bg/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-bn/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-ca/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-ckb/03-dialogs.xml    | 6 ++----
 AnkiDroid/src/main/res/values-cs/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-da/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-de/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-el/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-eo/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-es-rAR/03-dialogs.xml | 6 ++----
 AnkiDroid/src/main/res/values-es-rES/03-dialogs.xml | 6 ++----
 AnkiDroid/src/main/res/values-et/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-eu/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-fa/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-fi/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-fil/03-dialogs.xml    | 7 ++-----
 AnkiDroid/src/main/res/values-fr/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-fy/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-ga/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-gl/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-got/03-dialogs.xml    | 6 ++----
 AnkiDroid/src/main/res/values-gu/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-heb/03-dialogs.xml    | 6 ++----
 AnkiDroid/src/main/res/values-hi/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-hr/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-hu/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-hy/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-ind/03-dialogs.xml    | 6 ++----
 AnkiDroid/src/main/res/values-is/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-it/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-iw/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-ja/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-jv/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-ka/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-kk/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-km/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-kn/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-ko/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-ku/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-ky/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-lt/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-lv/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-mk/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-ml/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-mn/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-mr/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-ms/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-my/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-nl/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-nn/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-no/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-or/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-pa/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-pl/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-pt-rBR/03-dialogs.xml | 6 ++----
 AnkiDroid/src/main/res/values-pt-rPT/03-dialogs.xml | 6 ++----
 AnkiDroid/src/main/res/values-ro/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-ru/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-sat/03-dialogs.xml    | 6 ++----
 AnkiDroid/src/main/res/values-sc/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-sk/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-sl/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-sq/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-sr/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-ss/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-sv/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-sw/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-ta/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-te/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-tg/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-tgl/03-dialogs.xml    | 6 ++----
 AnkiDroid/src/main/res/values-th/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-ti/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-tn/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-tr/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-ts/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-tt/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-ug/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-uk/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-ur/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-uz/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-ve/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-vi/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-wo/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-xh/03-dialogs.xml     | 6 ++----
 AnkiDroid/src/main/res/values-yue/03-dialogs.xml    | 6 ++----
 AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml | 6 ++----
 AnkiDroid/src/main/res/values-zh-rTW/03-dialogs.xml | 6 ++----
 AnkiDroid/src/main/res/values-zu/03-dialogs.xml     | 6 ++----
 94 files changed, 188 insertions(+), 377 deletions(-)

diff --git a/AnkiDroid/src/main/res/values-af/03-dialogs.xml b/AnkiDroid/src/main/res/values-af/03-dialogs.xml
index 6c107234b6f2..f9f291e75bba 100644
--- a/AnkiDroid/src/main/res/values-af/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-af/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Kontroleer media?</string>
     <string name="check_media_warning">Dit kan lank neem met groot mediaversamelings</string>
     <string name="check_media_message">Media word nagegaan&#8230;</string>
-    <string name="check_media_acknowledge">Media nagegaan</string>
-    <string name="check_media_invalid">Lêers met ongeldige enkodering: %d</string>
-    <string name="check_media_no_unused_missing">Geen ongebruikte of ontbrekende lêers gevind nie</string>
-    <string name="check_media_delete_unused">Verwyder ongebruikte</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Media word uitgevee&#8230;</string>
     <string name="delete_media_result_title">Verwyderingsresultaat</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-am/03-dialogs.xml b/AnkiDroid/src/main/res/values-am/03-dialogs.xml
index bb74e55c2525..362d3e7fe7fb 100644
--- a/AnkiDroid/src/main/res/values-am/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-am/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Check media?</string>
     <string name="check_media_warning">This may take a long time with large media collections</string>
     <string name="check_media_message">Checking media&#8230;</string>
-    <string name="check_media_acknowledge">Media checked</string>
-    <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_delete_unused">Delete unused</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-ar/03-dialogs.xml b/AnkiDroid/src/main/res/values-ar/03-dialogs.xml
index 4ed3faf681b1..db0c9f74eeaf 100644
--- a/AnkiDroid/src/main/res/values-ar/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ar/03-dialogs.xml
@@ -112,10 +112,8 @@
     <string name="check_media_title">هل تريد فحص الوسائط؟</string>
     <string name="check_media_warning">قد يأخذ هذا وقتًا طويلًا لمجموعات الوسائط الكبيرة</string>
     <string name="check_media_message">يجري فحص الوسائط&#8230;</string>
-    <string name="check_media_acknowledge">تم فحص الوسائط</string>
-    <string name="check_media_invalid">ملفات بترميز غير صالح: %d</string>
-    <string name="check_media_no_unused_missing">لم يُعثَر على ملفات غير مستخدمة أو مفقودة</string>
-    <string name="check_media_delete_unused">حذف غير المستخدمة</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">جار حذف الوسائط&#8230;</string>
     <string name="delete_media_result_title">نتيجة الحذف</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-az/03-dialogs.xml b/AnkiDroid/src/main/res/values-az/03-dialogs.xml
index 43cba5ed7764..c506be277fa0 100644
--- a/AnkiDroid/src/main/res/values-az/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-az/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Check media?</string>
     <string name="check_media_warning">This may take a long time with large media collections</string>
     <string name="check_media_message">Checking media&#8230;</string>
-    <string name="check_media_acknowledge">Media checked</string>
-    <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_delete_unused">Delete unused</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-be/03-dialogs.xml b/AnkiDroid/src/main/res/values-be/03-dialogs.xml
index e9afdc145435..9fc3d3464979 100644
--- a/AnkiDroid/src/main/res/values-be/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-be/03-dialogs.xml
@@ -108,10 +108,8 @@
     <string name="check_media_title">Праверыць медыяфайлы?</string>
     <string name="check_media_warning">Гэта можа заняць шмат часу ў тым выпадку, калі калекцыя медыяфайлаў надта вялікая</string>
     <string name="check_media_message">Праверка медыяфайлаў&#8230;</string>
-    <string name="check_media_acknowledge">Медыяфайлы правераныя</string>
-    <string name="check_media_invalid">Файлы з памылковым кадаваннем: %d</string>
-    <string name="check_media_no_unused_missing">Адсутных або файлаў, якія не выкарыстоўваюцца не знойдзена</string>
-    <string name="check_media_delete_unused">Выдаліць, якія не выкарыстоўваюцца</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Выдаленне медыяфайлаў&#8230;</string>
     <string name="delete_media_result_title">Вынік выдалення</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-bg/03-dialogs.xml b/AnkiDroid/src/main/res/values-bg/03-dialogs.xml
index 6c695bc6b23b..36ec757aa9e0 100644
--- a/AnkiDroid/src/main/res/values-bg/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-bg/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Проверка на медия?</string>
     <string name="check_media_warning">Това може да отнеме дълго време при големи мултимедийни колекции</string>
     <string name="check_media_message">Проверка на медия&#8230;</string>
-    <string name="check_media_acknowledge">Медията е проверена</string>
-    <string name="check_media_invalid">Файлове с невалидно кодиране: %d</string>
-    <string name="check_media_no_unused_missing">Няма намерени неизползвани или липсващи файлове</string>
-    <string name="check_media_delete_unused">Изтрий неизползваните</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Изтриване на медийни файлове&#8230;</string>
     <string name="delete_media_result_title">Резултат за изтриване</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-bn/03-dialogs.xml b/AnkiDroid/src/main/res/values-bn/03-dialogs.xml
index 51249d409c1b..abfb8630c1e4 100644
--- a/AnkiDroid/src/main/res/values-bn/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-bn/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">মিডিয়া চেক করবেন?</string>
     <string name="check_media_warning">বড় মিডিয়া সংগ্রহের সাথে এটি একটি দীর্ঘ সময় নিতে পারে</string>
     <string name="check_media_message">মিডিয়া পরীক্ষা করা হচ্ছে&#8230;</string>
-    <string name="check_media_acknowledge">মিডিয়া চেক করা হয়েছে</string>
-    <string name="check_media_invalid">অবৈধ এনকোডিং সহ ফাইল: %d</string>
-    <string name="check_media_no_unused_missing">কোন অব্যবহৃত বা অনুপস্থিত ফাইল খুঁজে পাওয়া যায়নি</string>
-    <string name="check_media_delete_unused">অব্যবহৃত মুছুন</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">মিডিয়া মুছে ফেলা হচ্ছে&#8230;</string>
     <string name="delete_media_result_title">মুছে ফেলার ফলাফল</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-ca/03-dialogs.xml b/AnkiDroid/src/main/res/values-ca/03-dialogs.xml
index e8ee99ae2888..0d09084af019 100644
--- a/AnkiDroid/src/main/res/values-ca/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ca/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Comprovar la multimèdia?</string>
     <string name="check_media_warning">Això pot trigar molt de temps amb col·leccions de grans recursos de multimèdia</string>
     <string name="check_media_message">Comprovant multimèdia&#8230;</string>
-    <string name="check_media_acknowledge">Multimèdia comprovada</string>
-    <string name="check_media_invalid">Arxius amb codificació no vàlida: %d</string>
-    <string name="check_media_no_unused_missing">Cap arixu no utilitzat o mancant trobat</string>
-    <string name="check_media_delete_unused">Suprimir no utilitzats</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Suprimint medis&#8230;</string>
     <string name="delete_media_result_title">Resultat de la supressió</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-ckb/03-dialogs.xml b/AnkiDroid/src/main/res/values-ckb/03-dialogs.xml
index 5b0841bd8f48..bc39ef10c3ad 100644
--- a/AnkiDroid/src/main/res/values-ckb/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ckb/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">\?Medyayê kontrol bike</string>
     <string name="check_media_warning">Ev dê demekî dirêj hilde tev koleksiyonên medyayê</string>
     <string name="check_media_message">&#8230;Medyayê kontrol dike</string>
-    <string name="check_media_acknowledge">Medyayê kontrol kir</string>
-    <string name="check_media_invalid">Pelên bi kodvekirinên çewt: %d</string>
-    <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_delete_unused">Yê bikarnehatî jê bibe</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-cs/03-dialogs.xml b/AnkiDroid/src/main/res/values-cs/03-dialogs.xml
index 72f3d2f70815..570f49c5da8a 100644
--- a/AnkiDroid/src/main/res/values-cs/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-cs/03-dialogs.xml
@@ -108,10 +108,8 @@
     <string name="check_media_title">Zkontrolovat multimédia?</string>
     <string name="check_media_warning">Toto může trvat dlouhou dobu u velké sbírky multimédií</string>
     <string name="check_media_message">Kontrolují se multimédia&#8230;</string>
-    <string name="check_media_acknowledge">Multimédia zkontrolována</string>
-    <string name="check_media_invalid">Soubory s neplatným kódováním: %d</string>
-    <string name="check_media_no_unused_missing">Nenalezeny žádné nepoužívané nebo chybějící soubory</string>
-    <string name="check_media_delete_unused">Odstranit nepoužité</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Odstraňují se multimédia&#8230;</string>
     <string name="delete_media_result_title">Výsledek odstraňování</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-da/03-dialogs.xml b/AnkiDroid/src/main/res/values-da/03-dialogs.xml
index b4fe8a9fe445..444fb91466b1 100644
--- a/AnkiDroid/src/main/res/values-da/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-da/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Check media?</string>
     <string name="check_media_warning">This may take a long time with large media collections</string>
     <string name="check_media_message">Checking media&#8230;</string>
-    <string name="check_media_acknowledge">Media checked</string>
-    <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_delete_unused">Delete unused</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-de/03-dialogs.xml b/AnkiDroid/src/main/res/values-de/03-dialogs.xml
index d3072b2184d6..73c7a7e1eab4 100644
--- a/AnkiDroid/src/main/res/values-de/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-de/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Medien überprüfen?</string>
     <string name="check_media_warning">Bei großen Mediensammlungen kann dies lange dauern</string>
     <string name="check_media_message">Medien werden überprüft &#8230;</string>
-    <string name="check_media_acknowledge">Medien überprüft</string>
-    <string name="check_media_invalid">Dateien mit ungültiger Codierung: %d</string>
-    <string name="check_media_no_unused_missing">Keine unbenutzten oder fehlenden Dateien gefunden.</string>
-    <string name="check_media_delete_unused">Ungenutzte löschen</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Medien werden gelöscht &#8230;</string>
     <string name="delete_media_result_title">Löschergebnis</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-el/03-dialogs.xml b/AnkiDroid/src/main/res/values-el/03-dialogs.xml
index 6ed1cc24b0c7..229892ab9630 100644
--- a/AnkiDroid/src/main/res/values-el/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-el/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Έλεγχος πολυμέσων;</string>
     <string name="check_media_warning">Αυτό μπορεί να διαρκέσει πολύ ώρα με μεγάλες συλλογές πολυμέσων</string>
     <string name="check_media_message">Έλεγχος πολυμέσων&#8230;</string>
-    <string name="check_media_acknowledge">Τα πολυμέσα ελέγχθηκαν</string>
-    <string name="check_media_invalid">Αρχεία με μη έγκυρη κωδικοποίηση: %d</string>
-    <string name="check_media_no_unused_missing">Δεν βρέθηκαν αχρησιμοποίητα ή ελλείποντα αρχεία</string>
-    <string name="check_media_delete_unused">Διαγραφή αχρησιμοποίητων</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Διαγραφή πολυμέσων&#8230;</string>
     <string name="delete_media_result_title">Αποτέλεσμα διαγραφής</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-eo/03-dialogs.xml b/AnkiDroid/src/main/res/values-eo/03-dialogs.xml
index f935383efc63..143bc971539f 100644
--- a/AnkiDroid/src/main/res/values-eo/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-eo/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Ĉu kontroli aŭdvidaĵojn?</string>
     <string name="check_media_warning">Tio ĉi povas okupi multan tempon por grandaj aŭdvidaĵaj kolektoj</string>
     <string name="check_media_message">Kontrolado de aŭdvidaĵoj&#8230;</string>
-    <string name="check_media_acknowledge">Kontrolis aŭdvidaĵojn</string>
-    <string name="check_media_invalid">Dosieroj kun erara signokodo: %d</string>
-    <string name="check_media_no_unused_missing">Ne trovis iujn ajn neuzatajn aŭ mankajn dosierojn</string>
-    <string name="check_media_delete_unused">Forigi neuzatajn</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Forigado de aŭdvidaĵoj&#8230;</string>
     <string name="delete_media_result_title">Rezulto de forigo</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-es-rAR/03-dialogs.xml b/AnkiDroid/src/main/res/values-es-rAR/03-dialogs.xml
index 2f87fdab2044..e3c87cb1651c 100644
--- a/AnkiDroid/src/main/res/values-es-rAR/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-es-rAR/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">¿Comprobar archivos multimedia?</string>
     <string name="check_media_warning">Esto podría tardar mucho tiempo con colecciones de grandes archivos multimedia</string>
     <string name="check_media_message">Comprobando archivos multimedia&#8230;</string>
-    <string name="check_media_acknowledge">Archivos multimedia comprobados</string>
-    <string name="check_media_invalid">Archivos con codificación inválida: %d</string>
-    <string name="check_media_no_unused_missing">No se halló archivos sin utilizar o perdidos</string>
-    <string name="check_media_delete_unused">Eliminar no utilizado</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Eliminando multimedia&#8230;</string>
     <string name="delete_media_result_title">Resultado de la eliminación</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-es-rES/03-dialogs.xml b/AnkiDroid/src/main/res/values-es-rES/03-dialogs.xml
index abb8d6bc777e..7ae7970d465e 100644
--- a/AnkiDroid/src/main/res/values-es-rES/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-es-rES/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">¿Comprobar archivos multimedia?</string>
     <string name="check_media_warning">Esto puede tardar mucho con las colecciones de grandes archivos multimedia</string>
     <string name="check_media_message">Comprobando archivos multimedia&#8230;</string>
-    <string name="check_media_acknowledge">Archivos multimedia comprobados</string>
-    <string name="check_media_invalid">Archivos con codificación no válida: %d</string>
-    <string name="check_media_no_unused_missing">No hay archivos no utilizados o perdidos.</string>
-    <string name="check_media_delete_unused">Eliminar no utilizados</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Eliminando multimedia&#8230;</string>
     <string name="delete_media_result_title">Resultado de la eliminación</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-et/03-dialogs.xml b/AnkiDroid/src/main/res/values-et/03-dialogs.xml
index fbc0e9783ca7..6e2ecf53d09b 100644
--- a/AnkiDroid/src/main/res/values-et/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-et/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Check media?</string>
     <string name="check_media_warning">This may take a long time with large media collections</string>
     <string name="check_media_message">Checking media&#8230;</string>
-    <string name="check_media_acknowledge">Media checked</string>
-    <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_delete_unused">Delete unused</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-eu/03-dialogs.xml b/AnkiDroid/src/main/res/values-eu/03-dialogs.xml
index 006e9df92626..19f87ed1dc76 100644
--- a/AnkiDroid/src/main/res/values-eu/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-eu/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Check media?</string>
     <string name="check_media_warning">This may take a long time with large media collections</string>
     <string name="check_media_message">Checking media&#8230;</string>
-    <string name="check_media_acknowledge">Media checked</string>
-    <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_delete_unused">Delete unused</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-fa/03-dialogs.xml b/AnkiDroid/src/main/res/values-fa/03-dialogs.xml
index f793e04ea764..1041d87c1589 100644
--- a/AnkiDroid/src/main/res/values-fa/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-fa/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">رسانه بررسی شود؟</string>
     <string name="check_media_warning">در صورت حجیم بودن رسانه مجموعه،این ممکن است طول بکشد</string>
     <string name="check_media_message">در حال بررسی رسانه&#8230;</string>
-    <string name="check_media_acknowledge">رسانه بررسی شد</string>
-    <string name="check_media_invalid">فایل هایي با کدگذاری نامعتبر: %d</string>
-    <string name="check_media_no_unused_missing">هیچ فایل مفقود شده یا بلا استفاده یافت نشد</string>
-    <string name="check_media_delete_unused">حذف استفاده نشده ها</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">حذف رسانه&#8230;</string>
     <string name="delete_media_result_title">نتیجه حذف</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-fi/03-dialogs.xml b/AnkiDroid/src/main/res/values-fi/03-dialogs.xml
index a83e8e02fd21..387134d2a255 100644
--- a/AnkiDroid/src/main/res/values-fi/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-fi/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Tarkista media?</string>
     <string name="check_media_warning">Jos sinulla on suuri mediakokoelma, tämä voi kestää pitkään</string>
     <string name="check_media_message">Tarkistetaan mediaa&#8230;</string>
-    <string name="check_media_acknowledge">Media tarkistettu</string>
-    <string name="check_media_invalid">%d tiedostoa virheellisellä koodauksella</string>
-    <string name="check_media_no_unused_missing">Käyttämättömiä tai puuttuvia tiedostoja ei löytynyt.</string>
-    <string name="check_media_delete_unused">Poista käyttämättömät</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Poistetaan mediaa&#8230;</string>
     <string name="delete_media_result_title">Poiston tulos</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-fil/03-dialogs.xml b/AnkiDroid/src/main/res/values-fil/03-dialogs.xml
index 31a1c99e84eb..4a68645a5a6e 100644
--- a/AnkiDroid/src/main/res/values-fil/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-fil/03-dialogs.xml
@@ -104,11 +104,8 @@
     <string name="check_media_title">Suriin ang media?</string>
     <string name="check_media_warning">Ito ay maaaring tumagal ng mahabang oras kasama ang malalaking koleksyon ng media</string>
     <string name="check_media_message">Sinusuri ang media&#8230;</string>
-    <string name="check_media_acknowledge">Ang media ay sinuri</string>
-    <string name="check_media_invalid">60/5000
-Mga file na may di-wastong pag-encode:%d</string>
-    <string name="check_media_no_unused_missing">Walang nagamit o nawawalang file na nahanap</string>
-    <string name="check_media_delete_unused">Tanggalin ang hindi ginagamit</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Binubura ang media&#8230;</string>
     <string name="delete_media_result_title">Resulta ng pagbura</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-fr/03-dialogs.xml b/AnkiDroid/src/main/res/values-fr/03-dialogs.xml
index 04248244537f..6dcdac32f6a8 100644
--- a/AnkiDroid/src/main/res/values-fr/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-fr/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Vérifier les médias ?</string>
     <string name="check_media_warning">Cela peut prendre longtemps avec les grandes collections de médias</string>
     <string name="check_media_message">Vérification des médias&#8230;</string>
-    <string name="check_media_acknowledge">Média vérifié</string>
-    <string name="check_media_invalid">Fichiers avec un codage non valide : %d</string>
-    <string name="check_media_no_unused_missing">Aucun fichier inutilisé ou manquant.</string>
-    <string name="check_media_delete_unused">Supprimer les médias inutiles</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Suppression du média&#8230;</string>
     <string name="delete_media_result_title">Résultat de la suppression</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-fy/03-dialogs.xml b/AnkiDroid/src/main/res/values-fy/03-dialogs.xml
index 0ff8839b613a..ab66c7a6ddec 100644
--- a/AnkiDroid/src/main/res/values-fy/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-fy/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Check media?</string>
     <string name="check_media_warning">This may take a long time with large media collections</string>
     <string name="check_media_message">Checking media&#8230;</string>
-    <string name="check_media_acknowledge">Media checked</string>
-    <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_delete_unused">Delete unused</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-ga/03-dialogs.xml b/AnkiDroid/src/main/res/values-ga/03-dialogs.xml
index ecdf0f3ba3a3..9694519bc763 100644
--- a/AnkiDroid/src/main/res/values-ga/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ga/03-dialogs.xml
@@ -110,10 +110,8 @@
     <string name="check_media_title">Check media?</string>
     <string name="check_media_warning">This may take a long time with large media collections</string>
     <string name="check_media_message">Checking media&#8230;</string>
-    <string name="check_media_acknowledge">Media checked</string>
-    <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_delete_unused">Delete unused</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-gl/03-dialogs.xml b/AnkiDroid/src/main/res/values-gl/03-dialogs.xml
index 369a6efd45ce..8df48282aca6 100644
--- a/AnkiDroid/src/main/res/values-gl/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-gl/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Verificar multimedia?</string>
     <string name="check_media_warning">Isto pode levar moito tempo con coleccións grandes de medios</string>
     <string name="check_media_message">Verificando multimedia&#8230;</string>
-    <string name="check_media_acknowledge">Multimedia verificada</string>
-    <string name="check_media_invalid">Ficheiros cunha codificación inválida: %d</string>
-    <string name="check_media_no_unused_missing">Non se atoparon ficheiros sen usar ou perdidos</string>
-    <string name="check_media_delete_unused">Eliminar os non empregados</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-got/03-dialogs.xml b/AnkiDroid/src/main/res/values-got/03-dialogs.xml
index 8ad9bb19a234..4eff304b033e 100644
--- a/AnkiDroid/src/main/res/values-got/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-got/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Check media?</string>
     <string name="check_media_warning">This may take a long time with large media collections</string>
     <string name="check_media_message">Checking media&#8230;</string>
-    <string name="check_media_acknowledge">Media checked</string>
-    <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_delete_unused">Usnim unbruhta</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-gu/03-dialogs.xml b/AnkiDroid/src/main/res/values-gu/03-dialogs.xml
index e1066b3c1f02..85af9e8c779d 100644
--- a/AnkiDroid/src/main/res/values-gu/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-gu/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">મીડિયા તપાસીએ?</string>
     <string name="check_media_warning">મોટા મીડિયા સંગ્રહ સાથે આમાં લાંબો સમય લાગી શકે છે</string>
     <string name="check_media_message">મીડિયા તપાસી રહ્યું છે&#8230;</string>
-    <string name="check_media_acknowledge">મીડિયા તપાસ્યું</string>
-    <string name="check_media_invalid">અમાન્ય એન્કોડિંગ સાથેની ફાઇલો: %d</string>
-    <string name="check_media_no_unused_missing">કોઈ બિનઉપયોગી અથવા ગુમ થયેલ ફાઇલો મળી નથી</string>
-    <string name="check_media_delete_unused">ન વપરાયેલ કાઢી નાખો</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">મીડિયા ડિલીટ કરી રહ્યાં છીએ&#8230;</string>
     <string name="delete_media_result_title">કાઢી નાખવાનું પરિણામ</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-heb/03-dialogs.xml b/AnkiDroid/src/main/res/values-heb/03-dialogs.xml
index 0d82f545ebf4..094ba4a0a3de 100644
--- a/AnkiDroid/src/main/res/values-heb/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-heb/03-dialogs.xml
@@ -109,10 +109,8 @@
     <string name="check_media_title">לבדוק את המדיה?</string>
     <string name="check_media_warning">ייתכן שפעולה זו תארך זמן אם מדובר באוסף גדול</string>
     <string name="check_media_message">קבצי המדיה בבדיקה&#8230;</string>
-    <string name="check_media_acknowledge">קבצי המדיה נבדקו</string>
-    <string name="check_media_invalid">קבצים בקידוד תקול: %d</string>
-    <string name="check_media_no_unused_missing">לא נמצאו קבצים חסרים או שאינם בשימוש</string>
-    <string name="check_media_delete_unused">מחיקת כאלו שאינם בשימוש</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">המדיה נמחקת&#8230;</string>
     <string name="delete_media_result_title">תוצאת מחיקה</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-hi/03-dialogs.xml b/AnkiDroid/src/main/res/values-hi/03-dialogs.xml
index 2f315009adcb..13803d21f9cd 100644
--- a/AnkiDroid/src/main/res/values-hi/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-hi/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">मीडिया की जांच करें?</string>
     <string name="check_media_warning">यह बड़े मीडिया संग्रह के साथ एक लंबा समय लग सकता है</string>
     <string name="check_media_message">मीडिया जांच कर रहा है.. ।</string>
-    <string name="check_media_acknowledge">मीडिया जांचा गया</string>
-    <string name="check_media_invalid">अमांय एंकोडिंग वाली फ़ाइलें: %d</string>
-    <string name="check_media_no_unused_missing">कोई अनुपयोगी या गुम फ़ाइलें नहीं मिलीं</string>
-    <string name="check_media_delete_unused">अप्रयुक्त हटाएं</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">मीडिया हटा रहा है&#8230;</string>
     <string name="delete_media_result_title">विलोपन का परिणाम</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-hr/03-dialogs.xml b/AnkiDroid/src/main/res/values-hr/03-dialogs.xml
index 44c6bd15e7bb..b244a086f48a 100644
--- a/AnkiDroid/src/main/res/values-hr/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-hr/03-dialogs.xml
@@ -106,10 +106,8 @@
     <string name="check_media_title">Check media?</string>
     <string name="check_media_warning">This may take a long time with large media collections</string>
     <string name="check_media_message">Checking media&#8230;</string>
-    <string name="check_media_acknowledge">Media checked</string>
-    <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_delete_unused">Delete unused</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-hu/03-dialogs.xml b/AnkiDroid/src/main/res/values-hu/03-dialogs.xml
index 7bcbed5274d3..be3fe0b40bfa 100644
--- a/AnkiDroid/src/main/res/values-hu/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-hu/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Média ellenőrzése?</string>
     <string name="check_media_warning">Ez sokáig tarthat nagy média gyűjtemények esetén</string>
     <string name="check_media_message">Média ellenőrzése&#8230;</string>
-    <string name="check_media_acknowledge">Média ellenőrizve</string>
-    <string name="check_media_invalid">Érvénytelen kódolású fájlok: %d</string>
-    <string name="check_media_no_unused_missing">Nincs haszálaton kívüli, vagy hiányzó fájl.</string>
-    <string name="check_media_delete_unused">Használaton kívüliek törlése</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Média törlése&#8230;</string>
     <string name="delete_media_result_title">Törlés eredménye</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-hy/03-dialogs.xml b/AnkiDroid/src/main/res/values-hy/03-dialogs.xml
index 04325e9e027c..6189287ce7fb 100644
--- a/AnkiDroid/src/main/res/values-hy/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-hy/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Ստուգե՞լ մեդիան</string>
     <string name="check_media_warning">This may take a long time with large media collections</string>
     <string name="check_media_message">Checking media&#8230;</string>
-    <string name="check_media_acknowledge">Media checked</string>
-    <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_delete_unused">Delete unused</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-ind/03-dialogs.xml b/AnkiDroid/src/main/res/values-ind/03-dialogs.xml
index 3e113efdbd22..b9ebd671bab5 100644
--- a/AnkiDroid/src/main/res/values-ind/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ind/03-dialogs.xml
@@ -102,10 +102,8 @@
     <string name="check_media_title">Periksa media?</string>
     <string name="check_media_warning">Ini dapat memakan waktu lama karena koleksi media yang besar</string>
     <string name="check_media_message">Memeriksa media&#8230;</string>
-    <string name="check_media_acknowledge">Media diperiksa</string>
-    <string name="check_media_invalid">Berkas dengan pengodean tidak valid: %d</string>
-    <string name="check_media_no_unused_missing">Tidak ada berkas tidak terpakai atau hilang ditemukan</string>
-    <string name="check_media_delete_unused">Hapus yang tidak terpakai</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Menghapus media&#8230;</string>
     <string name="delete_media_result_title">Hasil penghapusan</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-is/03-dialogs.xml b/AnkiDroid/src/main/res/values-is/03-dialogs.xml
index 86bcba56a637..9423b5e19d9f 100644
--- a/AnkiDroid/src/main/res/values-is/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-is/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Check media?</string>
     <string name="check_media_warning">This may take a long time with large media collections</string>
     <string name="check_media_message">Checking media&#8230;</string>
-    <string name="check_media_acknowledge">Media checked</string>
-    <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_delete_unused">Delete unused</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-it/03-dialogs.xml b/AnkiDroid/src/main/res/values-it/03-dialogs.xml
index e29f223651b3..5103f8c8c202 100644
--- a/AnkiDroid/src/main/res/values-it/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-it/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Controllare i media?</string>
     <string name="check_media_warning">Ciò può richiedere molto tempo con le collezioni multimediali di grandi dimensioni</string>
     <string name="check_media_message">Controllo i media&#8230;</string>
-    <string name="check_media_acknowledge">Media controllati</string>
-    <string name="check_media_invalid">File con codifica non valida: %d</string>
-    <string name="check_media_no_unused_missing">Nessun file inutilizzato o mancante trovato.</string>
-    <string name="check_media_delete_unused">Elimina inutilizzati</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Eliminando media&#8230;</string>
     <string name="delete_media_result_title">Eliminazione risultato</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-iw/03-dialogs.xml b/AnkiDroid/src/main/res/values-iw/03-dialogs.xml
index 0d82f545ebf4..094ba4a0a3de 100644
--- a/AnkiDroid/src/main/res/values-iw/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-iw/03-dialogs.xml
@@ -109,10 +109,8 @@
     <string name="check_media_title">לבדוק את המדיה?</string>
     <string name="check_media_warning">ייתכן שפעולה זו תארך זמן אם מדובר באוסף גדול</string>
     <string name="check_media_message">קבצי המדיה בבדיקה&#8230;</string>
-    <string name="check_media_acknowledge">קבצי המדיה נבדקו</string>
-    <string name="check_media_invalid">קבצים בקידוד תקול: %d</string>
-    <string name="check_media_no_unused_missing">לא נמצאו קבצים חסרים או שאינם בשימוש</string>
-    <string name="check_media_delete_unused">מחיקת כאלו שאינם בשימוש</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">המדיה נמחקת&#8230;</string>
     <string name="delete_media_result_title">תוצאת מחיקה</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-ja/03-dialogs.xml b/AnkiDroid/src/main/res/values-ja/03-dialogs.xml
index da8b4d90f1ac..b567dfedda60 100644
--- a/AnkiDroid/src/main/res/values-ja/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ja/03-dialogs.xml
@@ -102,10 +102,8 @@
     <string name="check_media_title">メディアをチェックしますか？</string>
     <string name="check_media_warning">大きなコレクションの場合は、長い時間がかかる場合があります。</string>
     <string name="check_media_message">メディアをチェックしています&#8230;</string>
-    <string name="check_media_acknowledge">メディアのチェックの完了</string>
-    <string name="check_media_invalid">エンコーディングが無効なファイル数: %d</string>
-    <string name="check_media_no_unused_missing">使用されていないファイル、不足しているファイルはありません</string>
-    <string name="check_media_delete_unused">(*) のファイルを削除</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">メディアを削除中&#8230;</string>
     <string name="delete_media_result_title">削除結果</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-jv/03-dialogs.xml b/AnkiDroid/src/main/res/values-jv/03-dialogs.xml
index e649b069ab31..874f16210ea4 100644
--- a/AnkiDroid/src/main/res/values-jv/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-jv/03-dialogs.xml
@@ -102,10 +102,8 @@
     <string name="check_media_title">Check media?</string>
     <string name="check_media_warning">This may take a long time with large media collections</string>
     <string name="check_media_message">Checking media&#8230;</string>
-    <string name="check_media_acknowledge">Media checked</string>
-    <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_delete_unused">Delete unused</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-ka/03-dialogs.xml b/AnkiDroid/src/main/res/values-ka/03-dialogs.xml
index e5b9f258b5b9..b76b82c46dd0 100644
--- a/AnkiDroid/src/main/res/values-ka/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ka/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">შემოწმდეს მედიაფაილები?</string>
     <string name="check_media_warning">ამას დიდი ზომის მედია-კოლექციების შემთხვევაში შეიძლება დიდი ხანი დასჭირდეს</string>
     <string name="check_media_message">მედიაფაილების შემოწმება&#8230;</string>
-    <string name="check_media_acknowledge">მედიაფაილები შემოწმდა</string>
-    <string name="check_media_invalid">ფაილები არასწორი კოდირებით: %d</string>
-    <string name="check_media_no_unused_missing">ვერ მოიძებნა უხმარი ან დაკარგული ფაილები</string>
-    <string name="check_media_delete_unused">წაშალე გამოუყენებელი</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">მიმდინარეობს მედიაფაილების წაშლა&#8230;</string>
     <string name="delete_media_result_title">წაშლის შედეგი</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-kk/03-dialogs.xml b/AnkiDroid/src/main/res/values-kk/03-dialogs.xml
index 61889054ad3c..2b93808c96e8 100644
--- a/AnkiDroid/src/main/res/values-kk/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-kk/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Check media?</string>
     <string name="check_media_warning">This may take a long time with large media collections</string>
     <string name="check_media_message">Checking media&#8230;</string>
-    <string name="check_media_acknowledge">Media checked</string>
-    <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_delete_unused">Delete unused</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-km/03-dialogs.xml b/AnkiDroid/src/main/res/values-km/03-dialogs.xml
index 6a129bf68e6a..e2775a72ae53 100644
--- a/AnkiDroid/src/main/res/values-km/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-km/03-dialogs.xml
@@ -102,10 +102,8 @@
     <string name="check_media_title">Check media?</string>
     <string name="check_media_warning">This may take a long time with large media collections</string>
     <string name="check_media_message">Checking media&#8230;</string>
-    <string name="check_media_acknowledge">Media checked</string>
-    <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_delete_unused">Delete unused</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-kn/03-dialogs.xml b/AnkiDroid/src/main/res/values-kn/03-dialogs.xml
index a7f568e31906..12615adff4a0 100644
--- a/AnkiDroid/src/main/res/values-kn/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-kn/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">ಮಾಧ್ಯಮವನ್ನು ಪರೀಕ್ಷಿಸುವುದೇ?</string>
     <string name="check_media_warning">ದೊಡ್ಡ ಮಾಧ್ಯಮ ಸಂಗ್ರಹಣೆಗಳೊಂದಿಗೆ ಇದು ಬಹಳ ಸಮಯ ತೆಗೆದುಕೊಳ್ಳಬಹುದು</string>
     <string name="check_media_message">ಮಾಧ್ಯಮವನ್ನು ಪರಿಶೀಲಿಸಲಾಗುತ್ತಿದೆ&#8230;</string>
-    <string name="check_media_acknowledge">ಮಾಧ್ಯಮದವರನ್ನು ಪರಿಶೀಲಿಸಿದರು</string>
-    <string name="check_media_invalid">ಅಮಾನ್ಯ ಎನ್‌ಕೋಡಿಂಗ್ ಹೊಂದಿರುವ ಫೈಲ್‌ಗಳು: %d</string>
-    <string name="check_media_no_unused_missing">ಬಳಕೆಯಾಗದ ಅಥವಾ ಕಾಣೆಯಾದ ಫೈಲ್‌ಗಳು ಕಂಡುಬಂದಿಲ್ಲ</string>
-    <string name="check_media_delete_unused">ಬಳಕೆಯಾಗದ ಅಳಿಸಿ</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">ಮಾಧ್ಯಮವನ್ನು ಅಳಿಸಲಾಗುತ್ತಿದೆ&#8230;</string>
     <string name="delete_media_result_title">ಅಳಿಸುವಿಕೆ ಫಲಿತಾಂಶ</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-ko/03-dialogs.xml b/AnkiDroid/src/main/res/values-ko/03-dialogs.xml
index 4a608249315d..af9fe4e697b4 100644
--- a/AnkiDroid/src/main/res/values-ko/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ko/03-dialogs.xml
@@ -102,10 +102,8 @@
     <string name="check_media_title">미디어를 점검할까요?</string>
     <string name="check_media_warning">큰 미디어 컬렉션은 시간이 오래 걸릴 수 있습니다</string>
     <string name="check_media_message">미디어 점검 중&#8230;</string>
-    <string name="check_media_acknowledge">미디어 점검됨</string>
-    <string name="check_media_invalid">올바르지 않은 인코딩을 포함한 파일: %d</string>
-    <string name="check_media_no_unused_missing">사용되지 않거나 누락된 파일이 발견되지 않았습니다.</string>
-    <string name="check_media_delete_unused">사용되지 않은 파일 삭제</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">미디어 삭제 중&#8230;</string>
     <string name="delete_media_result_title">삭제 결과</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-ku/03-dialogs.xml b/AnkiDroid/src/main/res/values-ku/03-dialogs.xml
index 5b0841bd8f48..bc39ef10c3ad 100644
--- a/AnkiDroid/src/main/res/values-ku/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ku/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">\?Medyayê kontrol bike</string>
     <string name="check_media_warning">Ev dê demekî dirêj hilde tev koleksiyonên medyayê</string>
     <string name="check_media_message">&#8230;Medyayê kontrol dike</string>
-    <string name="check_media_acknowledge">Medyayê kontrol kir</string>
-    <string name="check_media_invalid">Pelên bi kodvekirinên çewt: %d</string>
-    <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_delete_unused">Yê bikarnehatî jê bibe</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-ky/03-dialogs.xml b/AnkiDroid/src/main/res/values-ky/03-dialogs.xml
index 61b53dc171e5..b6183035d223 100644
--- a/AnkiDroid/src/main/res/values-ky/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ky/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Check media?</string>
     <string name="check_media_warning">This may take a long time with large media collections</string>
     <string name="check_media_message">Checking media&#8230;</string>
-    <string name="check_media_acknowledge">Media checked</string>
-    <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_delete_unused">Delete unused</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-lt/03-dialogs.xml b/AnkiDroid/src/main/res/values-lt/03-dialogs.xml
index 9d2e3ecb72d6..f8d94b967094 100644
--- a/AnkiDroid/src/main/res/values-lt/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-lt/03-dialogs.xml
@@ -108,10 +108,8 @@
     <string name="check_media_title">Tikrinti laikmenas?</string>
     <string name="check_media_warning">Esant dideliems laikmenų rinkiniams tai gali ilgai užtrukti</string>
     <string name="check_media_message">Tikrinamos laikmenos&#8230;</string>
-    <string name="check_media_acknowledge">Laikmenos patikrintos</string>
-    <string name="check_media_invalid">Failai su neveikiančia koduote: %d</string>
-    <string name="check_media_no_unused_missing">Nerasta nenaudojamų ar trūkstamų failų.</string>
-    <string name="check_media_delete_unused">Ištrinti nenaudojamus</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-lv/03-dialogs.xml b/AnkiDroid/src/main/res/values-lv/03-dialogs.xml
index 1c4607d23a67..aa6db4a7a1b6 100644
--- a/AnkiDroid/src/main/res/values-lv/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-lv/03-dialogs.xml
@@ -106,10 +106,8 @@
     <string name="check_media_title">Check media?</string>
     <string name="check_media_warning">This may take a long time with large media collections</string>
     <string name="check_media_message">Checking media&#8230;</string>
-    <string name="check_media_acknowledge">Media checked</string>
-    <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_delete_unused">Delete unused</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-mk/03-dialogs.xml b/AnkiDroid/src/main/res/values-mk/03-dialogs.xml
index f046fbd05bcc..19d6636e297f 100644
--- a/AnkiDroid/src/main/res/values-mk/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-mk/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Ги проверивте медиумите?</string>
     <string name="check_media_warning">Ова може да потрае долго време со големи медиумски колекции</string>
     <string name="check_media_message">Проверка на медиумит&#8230;</string>
-    <string name="check_media_acknowledge">Медиумите се проверени</string>
-    <string name="check_media_invalid">Датотеки со невалидно шифрирање: %d</string>
-    <string name="check_media_no_unused_missing">Не се пронајдени неискористени или исчезнати датотеки</string>
-    <string name="check_media_delete_unused">Избришете го неискористеното</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-ml/03-dialogs.xml b/AnkiDroid/src/main/res/values-ml/03-dialogs.xml
index 2da850ec18a8..000d9c2cd523 100644
--- a/AnkiDroid/src/main/res/values-ml/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ml/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">മീഡിയ പരിശോധിക്കുക?</string>
     <string name="check_media_warning">വലിയ മീഡിയ ശേഖരണങ്ങളുമായി ഇത് വളരെയധികം സമയമെടുക്കും</string>
     <string name="check_media_message">മീഡിയ പരിശോധിക്കുന്നു&#8230;</string>
-    <string name="check_media_acknowledge">മീഡിയ പരിശോധിച്ചു</string>
-    <string name="check_media_invalid">അസാധുവായ എൻ‌കോഡിംഗ് ഉള്ള ഫയലുകൾ‌:%d</string>
-    <string name="check_media_no_unused_missing">ഉപയോഗിക്കാത്തതോ നഷ്‌ടമായതോ ആയ ഫയലുകളൊന്നും കണ്ടെത്തിയില്ല</string>
-    <string name="check_media_delete_unused">ഉപയോഗിക്കാത്തവ ഇല്ലാതാക്കുക</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">മീഡിയ ഇല്ലാതാക്കുന്നു&#8230;</string>
     <string name="delete_media_result_title">ഇല്ലാതാക്കൽ ഫലം</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-mn/03-dialogs.xml b/AnkiDroid/src/main/res/values-mn/03-dialogs.xml
index 5f136efb99fa..db01ccc584a3 100644
--- a/AnkiDroid/src/main/res/values-mn/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-mn/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Check media?</string>
     <string name="check_media_warning">This may take a long time with large media collections</string>
     <string name="check_media_message">Checking media&#8230;</string>
-    <string name="check_media_acknowledge">Media checked</string>
-    <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_delete_unused">Delete unused</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-mr/03-dialogs.xml b/AnkiDroid/src/main/res/values-mr/03-dialogs.xml
index db8037ee8970..06e882a0ab11 100644
--- a/AnkiDroid/src/main/res/values-mr/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-mr/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">मीडिया तपासा?</string>
     <string name="check_media_warning">मोठ्या मीडिया संकलनासह यास बराच वेळ लागू शकेल</string>
     <string name="check_media_message">मीडिया तपासत आहे&#8230;</string>
-    <string name="check_media_acknowledge">माध्यम तपासले</string>
-    <string name="check_media_invalid">अवैध एन्कोडिंगसह फायली:%d</string>
-    <string name="check_media_no_unused_missing">कोणत्याही न वापरलेल्या किंवा गहाळ फायली आढळल्या नाहीत</string>
-    <string name="check_media_delete_unused">न वापरलेले हटवा</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">मीडिया हटवित आहे&#8230;</string>
     <string name="delete_media_result_title">हटविण्याचा निकाल</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-ms/03-dialogs.xml b/AnkiDroid/src/main/res/values-ms/03-dialogs.xml
index 8a7d7e621d06..1ce937638f3b 100644
--- a/AnkiDroid/src/main/res/values-ms/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ms/03-dialogs.xml
@@ -102,10 +102,8 @@
     <string name="check_media_title">Periksa media?</string>
     <string name="check_media_warning">Mungkin mengambil masa lama dengan koleksi media besar</string>
     <string name="check_media_message">Memeriksa media&#8230;</string>
-    <string name="check_media_acknowledge">Media telah diperiksa</string>
-    <string name="check_media_invalid">Fail dengan pengekodan tidak sah: %d</string>
-    <string name="check_media_no_unused_missing">Tiada fail tidak digunakan or hilang ditemui</string>
-    <string name="check_media_delete_unused">Padam yang tidak digunakan</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Memadam media&#8230;</string>
     <string name="delete_media_result_title">Keputusan pemadaman</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-my/03-dialogs.xml b/AnkiDroid/src/main/res/values-my/03-dialogs.xml
index ea1fdc58af16..109b345ccd23 100644
--- a/AnkiDroid/src/main/res/values-my/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-my/03-dialogs.xml
@@ -102,10 +102,8 @@
     <string name="check_media_title">Check media?</string>
     <string name="check_media_warning">This may take a long time with large media collections</string>
     <string name="check_media_message">Checking media&#8230;</string>
-    <string name="check_media_acknowledge">Media checked</string>
-    <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_delete_unused">Delete unused</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-nl/03-dialogs.xml b/AnkiDroid/src/main/res/values-nl/03-dialogs.xml
index 023491bc4142..fbe78d79ffd4 100644
--- a/AnkiDroid/src/main/res/values-nl/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-nl/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Media controleren?</string>
     <string name="check_media_warning">Dit kan lang duren met grote hoeveelheden media</string>
     <string name="check_media_message">Media controleren&#8230;</string>
-    <string name="check_media_acknowledge">Media gecontroleerd</string>
-    <string name="check_media_invalid">Bestanden met ongeldige codering: %d</string>
-    <string name="check_media_no_unused_missing">Geen ongebruikte of vermiste bestanden gevonden</string>
-    <string name="check_media_delete_unused">Ongebruikte verwijderen</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Verwijdering van media&#8230;</string>
     <string name="delete_media_result_title">Resultaat van verwijdering</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-nn/03-dialogs.xml b/AnkiDroid/src/main/res/values-nn/03-dialogs.xml
index 52be00c8f901..b76a29fb9c73 100644
--- a/AnkiDroid/src/main/res/values-nn/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-nn/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Check media?</string>
     <string name="check_media_warning">This may take a long time with large media collections</string>
     <string name="check_media_message">Checking media&#8230;</string>
-    <string name="check_media_acknowledge">Media checked</string>
-    <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_delete_unused">Slett ubrukte</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Sletter media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-no/03-dialogs.xml b/AnkiDroid/src/main/res/values-no/03-dialogs.xml
index f70e343d1862..fdbf195d5646 100644
--- a/AnkiDroid/src/main/res/values-no/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-no/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Check media?</string>
     <string name="check_media_warning">This may take a long time with large media collections</string>
     <string name="check_media_message">Checking media&#8230;</string>
-    <string name="check_media_acknowledge">Media checked</string>
-    <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_delete_unused">Slett ubrukte</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Sletter media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-or/03-dialogs.xml b/AnkiDroid/src/main/res/values-or/03-dialogs.xml
index 4261f80e4296..0092d52e97f4 100644
--- a/AnkiDroid/src/main/res/values-or/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-or/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">ମିଡ଼ିଆ ଯାଞ୍ଚ କରିବେ କି?</string>
     <string name="check_media_warning">ବଡ଼ ମିଡ଼ିଆ ସଂଗ୍ରହ ସହିତ ଏହା ଏକ ଦୀର୍ଘ ସମୟ ନେଇପାରେ</string>
     <string name="check_media_message">ମିଡ଼ିଆ ଯାଞ୍ଚ ଚାଲିଛି&#8230;</string>
-    <string name="check_media_acknowledge">ମିଡ଼ିଆ ଯାଞ୍ଚ କରାଗଲା</string>
-    <string name="check_media_invalid">ଅବୈଧ ଏନକୋଡିଂ ସହିତ ଫାଇଲଗୁଡିକ: %d</string>
-    <string name="check_media_no_unused_missing">କୌଣସି ଅବ୍ୟବହୃତ କିମ୍ବା ନିଖୋଜ ଫାଇଲ ମିଳିଲା ନାହିଁ</string>
-    <string name="check_media_delete_unused">ଅବ୍ୟବହୃତ ବିଲୋପ କରନ୍ତୁ</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">ମିଡ଼ିଆ ଵିଲୋପ ହେଉଛି&#8230;</string>
     <string name="delete_media_result_title">ବିଲୋପ ଫଳାଫଳ</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-pa/03-dialogs.xml b/AnkiDroid/src/main/res/values-pa/03-dialogs.xml
index aeb30db21efa..ad7666e26d89 100644
--- a/AnkiDroid/src/main/res/values-pa/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-pa/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">ਕੀ ਮੀਡੀਆ ਦੀ ਜਾਂਚ ਕਰਨੀ ਹੈ?</string>
     <string name="check_media_warning">ਵੱਡੇ ਮੀਡੀਆ ਸੰਗ੍ਰਹਿ ਦੇ ਨਾਲ ਇਸ ਵਿੱਚ ਲੰਮਾ ਸਮਾਂ ਲੱਗ ਸਕਦਾ ਹੈ</string>
     <string name="check_media_message">Checking media&#8230;</string>
-    <string name="check_media_acknowledge">ਮੀਡੀਆ ਦੀ ਜਾਂਚ ਕੀਤੀ ਗਈ</string>
-    <string name="check_media_invalid">ਗਲਤ ਏਨਕੋਡਿੰਗ ਵਾਲੀਆਂ ਫਾਈਲਾਂ: %d</string>
-    <string name="check_media_no_unused_missing">ਕੋਈ ਅਣਵਰਤੀਆਂ ਜਾਂ ਗੁੰਮ ਹੋਈਆਂ ਫਾਈਲਾਂ ਨਹੀਂ ਲੱਭੀਆਂ</string>
-    <string name="check_media_delete_unused">ਨਾ ਵਰਤੇ ਗਏ ਨੂੰ ਮਿਟਾਓ</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">ਮੀਡੀਆ ਨੂੰ ਮਿਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ&#8230;</string>
     <string name="delete_media_result_title">ਮਿਟਾਉਣ ਦਾ ਨਤੀਜਾ</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-pl/03-dialogs.xml b/AnkiDroid/src/main/res/values-pl/03-dialogs.xml
index ea833b341c09..31db8554c6ee 100644
--- a/AnkiDroid/src/main/res/values-pl/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-pl/03-dialogs.xml
@@ -108,10 +108,8 @@
     <string name="check_media_title">Sprawdzić media?</string>
     <string name="check_media_warning">To może trwać bardzo długo przy dużych kolekcjach</string>
     <string name="check_media_message">Sprawdzanie mediów&#8230;</string>
-    <string name="check_media_acknowledge">Media sprawdzone</string>
-    <string name="check_media_invalid">Plików z błędnym kodowaniem: %d</string>
-    <string name="check_media_no_unused_missing">Nie znaleziono nie używanych ani brakujących plików.</string>
-    <string name="check_media_delete_unused">Usuń nieużywane</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Usuwanie mediów&#8230;</string>
     <string name="delete_media_result_title">Wynik usuwania</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-pt-rBR/03-dialogs.xml b/AnkiDroid/src/main/res/values-pt-rBR/03-dialogs.xml
index c53d89ba13a0..e3683d124dd6 100644
--- a/AnkiDroid/src/main/res/values-pt-rBR/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-pt-rBR/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Verificar mídia?</string>
     <string name="check_media_warning">Isto pode demorar muito tempo para coleções com grande quantidade de mídia</string>
     <string name="check_media_message">Verificando mídia&#8230;</string>
-    <string name="check_media_acknowledge">Mídia verificada</string>
-    <string name="check_media_invalid">Arquivos com codificação inválida: %d</string>
-    <string name="check_media_no_unused_missing">Não foram encontrados arquivos não utilizados ou faltantes.</string>
-    <string name="check_media_delete_unused">Excluir não utilizados</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Excluindo mídia&#8230;</string>
     <string name="delete_media_result_title">Resultado da exclusão</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-pt-rPT/03-dialogs.xml b/AnkiDroid/src/main/res/values-pt-rPT/03-dialogs.xml
index 8e58972735b6..08f08bd7651e 100644
--- a/AnkiDroid/src/main/res/values-pt-rPT/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-pt-rPT/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Verificar multimédia?</string>
     <string name="check_media_warning">Isto pode demorar bastante tempo para coleções grandes de multimédia</string>
     <string name="check_media_message">A verificar multimédia&#8230;</string>
-    <string name="check_media_acknowledge">Multimédia verificada</string>
-    <string name="check_media_invalid">Ficheiros com codificação inválida: %d</string>
-    <string name="check_media_no_unused_missing">Nenhum ficheiro inútil ou em falta foi encontrado.</string>
-    <string name="check_media_delete_unused">Eliminar não utilizados</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">A apagar ficheiros de multimédia&#8230;</string>
     <string name="delete_media_result_title">Resultado da remoção</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-ro/03-dialogs.xml b/AnkiDroid/src/main/res/values-ro/03-dialogs.xml
index 740a43658e6f..e4dd3b8596c2 100644
--- a/AnkiDroid/src/main/res/values-ro/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ro/03-dialogs.xml
@@ -106,10 +106,8 @@
     <string name="check_media_title">Check media?</string>
     <string name="check_media_warning">This may take a long time with large media collections</string>
     <string name="check_media_message">Checking media&#8230;</string>
-    <string name="check_media_acknowledge">Media checked</string>
-    <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_delete_unused">Delete unused</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-ru/03-dialogs.xml b/AnkiDroid/src/main/res/values-ru/03-dialogs.xml
index 3465ca9cb204..739f41392b1e 100644
--- a/AnkiDroid/src/main/res/values-ru/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ru/03-dialogs.xml
@@ -108,10 +108,8 @@
     <string name="check_media_title">Проверить медиафайлы?</string>
     <string name="check_media_warning">Это может занять много времени, если медиафайлов много</string>
     <string name="check_media_message">Медиафайлы проверяются&#8230;</string>
-    <string name="check_media_acknowledge">Медиафайлы проверены</string>
-    <string name="check_media_invalid">Файлы с недопустимой кодировкой: %d</string>
-    <string name="check_media_no_unused_missing">Неиспользуемые и отсутствующие файлы не найдены.</string>
-    <string name="check_media_delete_unused">Удалить неиспользуемые</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Медиафайлы 
 удаляются&#8230;</string>
     <string name="delete_media_result_title">Результат удаления</string>
diff --git a/AnkiDroid/src/main/res/values-sat/03-dialogs.xml b/AnkiDroid/src/main/res/values-sat/03-dialogs.xml
index e4f0dbc558f6..002cb2d475e2 100644
--- a/AnkiDroid/src/main/res/values-sat/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sat/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">ᱢᱮᱰᱤᱭᱟ ᱧᱮᱞ ᱵᱤᱰᱟᱣ ᱢᱮ ?</string>
     <string name="check_media_warning">ᱢᱟᱨᱟᱝ ᱢᱮᱰᱤᱭᱟ ᱴᱩᱢᱟᱹᱞ ᱫᱚ ᱡᱟᱹᱥᱛᱤ ᱥᱚᱢᱚᱭ ᱤᱫᱤᱟᱭ</string>
     <string name="check_media_message">ᱢᱮᱰᱤᱭᱟ ᱧᱮᱞ ᱵᱤᱰᱟᱣᱜ ᱠᱟᱱᱟ&#8230;</string>
-    <string name="check_media_acknowledge">ᱢᱮᱰᱤᱭᱟ ᱧᱮᱞᱮᱱᱟ</string>
-    <string name="check_media_invalid">ᱨᱚᱫ ᱨᱮ ᱵᱟᱲ ᱫᱟᱱᱟᱲ ᱪᱤᱱᱦᱟ: %d</string>
-    <string name="check_media_no_unused_missing">ᱵᱟᱝ ᱵᱮᱵᱦᱟᱨᱟᱜ ᱨᱮᱫ ᱵᱟᱭ ᱧᱟᱢᱞᱮᱱᱟ</string>
-    <string name="check_media_delete_unused">ᱵᱟᱝ ᱵᱮᱵᱷᱟᱨ ᱚᱠ ᱜᱮᱫ ᱜᱤᱰᱤ ᱢᱮ</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">ᱢᱤᱰᱤᱭᱟ ᱜᱮᱫ ᱜᱤᱰᱤᱜ ᱠᱟᱱᱟ&#8230;</string>
     <string name="delete_media_result_title">ᱜᱮᱫ ᱜᱤᱰᱤ‌ ᱛᱮᱞᱟ</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-sc/03-dialogs.xml b/AnkiDroid/src/main/res/values-sc/03-dialogs.xml
index 70692ae903dc..6fcb493d0cfc 100644
--- a/AnkiDroid/src/main/res/values-sc/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sc/03-dialogs.xml
@@ -109,10 +109,8 @@
     <string name="check_media_title">Verificare sos mèdios?</string>
     <string name="check_media_warning">In casu de colletziones multimediales mannas bi diat pòdere chèrrere tempus meda</string>
     <string name="check_media_message">Vetifichende sos mèdios&#8230;</string>
-    <string name="check_media_acknowledge">Mèdios verificados</string>
-    <string name="check_media_invalid">Documentos cun una codìfica non vàlida: %d</string>
-    <string name="check_media_no_unused_missing">Perunu documentu no impreadu o chi manchet agatadu</string>
-    <string name="check_media_delete_unused">Iscantzella sos no impreados</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Iscantzellende mèdios&#8230;</string>
     <string name="delete_media_result_title">Resurtadu de s\'iscantzelladura</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-sk/03-dialogs.xml b/AnkiDroid/src/main/res/values-sk/03-dialogs.xml
index 3aa9ad11edc8..d31786717bd8 100644
--- a/AnkiDroid/src/main/res/values-sk/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sk/03-dialogs.xml
@@ -108,10 +108,8 @@
     <string name="check_media_title">Skontrolovať multimédiá?</string>
     <string name="check_media_warning">Toto môže trvať dlhšie pri veľkých multimediálnych zbierkach</string>
     <string name="check_media_message">Kontrola multimédií&#8230;</string>
-    <string name="check_media_acknowledge">Multimédiá skontrolované</string>
-    <string name="check_media_invalid">Súbory s neplatným kódovaním: %d</string>
-    <string name="check_media_no_unused_missing">Neboli nájdené žiadne nepoužívané alebo chýbajúce súbory</string>
-    <string name="check_media_delete_unused">Vymazať nepoužívané</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Médiá sa vymazávajú&#8230;</string>
     <string name="delete_media_result_title">Výsledok vymazania</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-sl/03-dialogs.xml b/AnkiDroid/src/main/res/values-sl/03-dialogs.xml
index 99249bbec07d..bb73164f8080 100644
--- a/AnkiDroid/src/main/res/values-sl/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sl/03-dialogs.xml
@@ -108,10 +108,8 @@
     <string name="check_media_title">Preveri predstavnost?</string>
     <string name="check_media_warning">To lahko traja dolgo časa z velikimi zbirkami predstavnosti</string>
     <string name="check_media_message">Preverjanje predstavnosti &#8230;</string>
-    <string name="check_media_acknowledge">Predstavnost preverjena</string>
-    <string name="check_media_invalid">Datoteke z neveljavnim kodiranjem: %d</string>
-    <string name="check_media_no_unused_missing">Neuporabljenih ali manjkajočih datotek ni bilo mogoče najti</string>
-    <string name="check_media_delete_unused">Izbriši neuporabljeno</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-sq/03-dialogs.xml b/AnkiDroid/src/main/res/values-sq/03-dialogs.xml
index f0c68800573d..0b994843e1bb 100644
--- a/AnkiDroid/src/main/res/values-sq/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sq/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Kontrolloni median?</string>
     <string name="check_media_warning">Kjo mund të zgjasë shumë me koleksionet e mëdha mediatike</string>
     <string name="check_media_message">Po kontrollon median&#8230;</string>
-    <string name="check_media_acknowledge">Media e kontrolluar</string>
-    <string name="check_media_invalid">Skedarët me kodim të pavlefshëm: %d</string>
-    <string name="check_media_no_unused_missing">Nuk u gjet asnjë skedar i papërdorur ose i munguar</string>
-    <string name="check_media_delete_unused">Fshije të papërdorur</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Po fshin median&#8230;</string>
     <string name="delete_media_result_title">Rezultati i fshirjes</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-sr/03-dialogs.xml b/AnkiDroid/src/main/res/values-sr/03-dialogs.xml
index f360acc37502..fa7c748858c6 100644
--- a/AnkiDroid/src/main/res/values-sr/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sr/03-dialogs.xml
@@ -106,10 +106,8 @@
     <string name="check_media_title">Провери медијске датотеке?</string>
     <string name="check_media_warning">Ово може заузети много времена када су у питању велике колекције.</string>
     <string name="check_media_message">Проверавање медијске датотеке&#8230;</string>
-    <string name="check_media_acknowledge">Медије проверене</string>
-    <string name="check_media_invalid">Кодирање датотеке је нетачан: %d</string>
-    <string name="check_media_no_unused_missing">Нема некоришћених или непостојећи датотека.</string>
-    <string name="check_media_delete_unused">Избриши некоришћених</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-ss/03-dialogs.xml b/AnkiDroid/src/main/res/values-ss/03-dialogs.xml
index 5f136efb99fa..db01ccc584a3 100644
--- a/AnkiDroid/src/main/res/values-ss/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ss/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Check media?</string>
     <string name="check_media_warning">This may take a long time with large media collections</string>
     <string name="check_media_message">Checking media&#8230;</string>
-    <string name="check_media_acknowledge">Media checked</string>
-    <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_delete_unused">Delete unused</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-sv/03-dialogs.xml b/AnkiDroid/src/main/res/values-sv/03-dialogs.xml
index de401313b886..58f3b0645f6f 100644
--- a/AnkiDroid/src/main/res/values-sv/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sv/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Kontrollera media?</string>
     <string name="check_media_warning">Det här kan ta lång tid för stora mediasamlingar</string>
     <string name="check_media_message">Kontrollerar media&#8230;</string>
-    <string name="check_media_acknowledge">Media kontrollerat</string>
-    <string name="check_media_invalid">Filer med ogiltig kodning: %d</string>
-    <string name="check_media_no_unused_missing">Inga oanvända eller saknade filer upptäckta.</string>
-    <string name="check_media_delete_unused">Radera oanvända</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Tar bort media&#8230;</string>
     <string name="delete_media_result_title">Raderingsresultat</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-sw/03-dialogs.xml b/AnkiDroid/src/main/res/values-sw/03-dialogs.xml
index 5f136efb99fa..db01ccc584a3 100644
--- a/AnkiDroid/src/main/res/values-sw/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sw/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Check media?</string>
     <string name="check_media_warning">This may take a long time with large media collections</string>
     <string name="check_media_message">Checking media&#8230;</string>
-    <string name="check_media_acknowledge">Media checked</string>
-    <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_delete_unused">Delete unused</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-ta/03-dialogs.xml b/AnkiDroid/src/main/res/values-ta/03-dialogs.xml
index dde52595beb7..eac6f1f0d0ef 100644
--- a/AnkiDroid/src/main/res/values-ta/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ta/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">மீடியாவைப் பார்க்கவா?</string>
     <string name="check_media_warning">பெரிய மீடியா வசூலில் இதற்கு நீண்ட நேரம் ஆகலாம்</string>
     <string name="check_media_message">மீடியாவைச் சரிபார்க்கிறது&#8230;</string>
-    <string name="check_media_acknowledge">மீடியா சோதனை செய்தது</string>
-    <string name="check_media_invalid">தவறான குறியாக்கம் கொண்ட கோப்புகள்: %d</string>
-    <string name="check_media_no_unused_missing">பயன்படுத்தப்படாத அல்லது விடுபட்ட கோப்புகள் எதுவும் இல்லை</string>
-    <string name="check_media_delete_unused">பயன்படுத்தப்படாததை நீக்கு</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">மீடியாவை நீக்குகிறது&#8230;</string>
     <string name="delete_media_result_title">நீக்குதல் முடிவு</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-te/03-dialogs.xml b/AnkiDroid/src/main/res/values-te/03-dialogs.xml
index c6c162e54727..d556f1cfa6ba 100644
--- a/AnkiDroid/src/main/res/values-te/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-te/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">మీడియా తనిఖీ చేయాలా?</string>
     <string name="check_media_warning">పెద్ద మీడియా సేకరణలతో ఇది ఎక్కువ సమయం పట్టవచ్చు</string>
     <string name="check_media_message">మీడియాను తనిఖీ చేస్తోంది&#8230;</string>
-    <string name="check_media_acknowledge">మీడియా తనిఖీ చేయబడింది</string>
-    <string name="check_media_invalid">చెల్లని ఎన్కోడింగ్ ఫైల్లు: %d</string>
-    <string name="check_media_no_unused_missing">ఉపయోగించని లేదా తప్పిపోయిన ఫైల్లు కనుగొనబడలేదు</string>
-    <string name="check_media_delete_unused">ఉపయోగించనిది తొలగించండి</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">మీడియాను తీసివేస్తోంది&#8230;</string>
     <string name="delete_media_result_title">తొలగింపు ఫలితం</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-tg/03-dialogs.xml b/AnkiDroid/src/main/res/values-tg/03-dialogs.xml
index 238f402bfc38..a3140a5beb94 100644
--- a/AnkiDroid/src/main/res/values-tg/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-tg/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Check media?</string>
     <string name="check_media_warning">This may take a long time with large media collections</string>
     <string name="check_media_message">Checking media&#8230;</string>
-    <string name="check_media_acknowledge">Media checked</string>
-    <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_delete_unused">Delete unused</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-tgl/03-dialogs.xml b/AnkiDroid/src/main/res/values-tgl/03-dialogs.xml
index b8b67aa3f06e..4a43116540af 100644
--- a/AnkiDroid/src/main/res/values-tgl/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-tgl/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Suriin ang media?</string>
     <string name="check_media_warning">Maaaring tumagal ito ng mahabang panahon sa malalaking koleksyon ng media</string>
     <string name="check_media_message">Sinusuri ang media&#8230;</string>
-    <string name="check_media_acknowledge">Nasuring media</string>
-    <string name="check_media_invalid">Mga file na may di-wasting pag-encode: %d</string>
-    <string name="check_media_no_unused_missing">Walang nagamit na nakitang mga nawawalang file</string>
-    <string name="check_media_delete_unused">Tanggalin ang hindi ginagamit</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-th/03-dialogs.xml b/AnkiDroid/src/main/res/values-th/03-dialogs.xml
index e649b069ab31..874f16210ea4 100644
--- a/AnkiDroid/src/main/res/values-th/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-th/03-dialogs.xml
@@ -102,10 +102,8 @@
     <string name="check_media_title">Check media?</string>
     <string name="check_media_warning">This may take a long time with large media collections</string>
     <string name="check_media_message">Checking media&#8230;</string>
-    <string name="check_media_acknowledge">Media checked</string>
-    <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_delete_unused">Delete unused</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-ti/03-dialogs.xml b/AnkiDroid/src/main/res/values-ti/03-dialogs.xml
index 5f136efb99fa..db01ccc584a3 100644
--- a/AnkiDroid/src/main/res/values-ti/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ti/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Check media?</string>
     <string name="check_media_warning">This may take a long time with large media collections</string>
     <string name="check_media_message">Checking media&#8230;</string>
-    <string name="check_media_acknowledge">Media checked</string>
-    <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_delete_unused">Delete unused</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-tn/03-dialogs.xml b/AnkiDroid/src/main/res/values-tn/03-dialogs.xml
index 5f136efb99fa..db01ccc584a3 100644
--- a/AnkiDroid/src/main/res/values-tn/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-tn/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Check media?</string>
     <string name="check_media_warning">This may take a long time with large media collections</string>
     <string name="check_media_message">Checking media&#8230;</string>
-    <string name="check_media_acknowledge">Media checked</string>
-    <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_delete_unused">Delete unused</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-tr/03-dialogs.xml b/AnkiDroid/src/main/res/values-tr/03-dialogs.xml
index 840d4c1aac49..54c742b2c3d3 100644
--- a/AnkiDroid/src/main/res/values-tr/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-tr/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Medya kontrol edilsin mi?</string>
     <string name="check_media_warning">Bu, büyük medya koleksiyonlarıyla uzun sürebilir.</string>
     <string name="check_media_message">Medya kontrol ediliyor&#8230;</string>
-    <string name="check_media_acknowledge">Medya kontrol edildi</string>
-    <string name="check_media_invalid">Geçersiz kodlamalı dosyalar: %d</string>
-    <string name="check_media_no_unused_missing">Kullanılmayan veya eksik dosya bulunmuyor.</string>
-    <string name="check_media_delete_unused">Kullanılmayanları sil</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Medya siliniyor&#8230;</string>
     <string name="delete_media_result_title">Silme sonuçları</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-ts/03-dialogs.xml b/AnkiDroid/src/main/res/values-ts/03-dialogs.xml
index 5f136efb99fa..db01ccc584a3 100644
--- a/AnkiDroid/src/main/res/values-ts/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ts/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Check media?</string>
     <string name="check_media_warning">This may take a long time with large media collections</string>
     <string name="check_media_message">Checking media&#8230;</string>
-    <string name="check_media_acknowledge">Media checked</string>
-    <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_delete_unused">Delete unused</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-tt/03-dialogs.xml b/AnkiDroid/src/main/res/values-tt/03-dialogs.xml
index 4638256f4bbd..31df6c5538fe 100644
--- a/AnkiDroid/src/main/res/values-tt/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-tt/03-dialogs.xml
@@ -102,10 +102,8 @@
     <string name="check_media_title">Check media?</string>
     <string name="check_media_warning">This may take a long time with large media collections</string>
     <string name="check_media_message">Checking media&#8230;</string>
-    <string name="check_media_acknowledge">Media checked</string>
-    <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_delete_unused">Delete unused</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-ug/03-dialogs.xml b/AnkiDroid/src/main/res/values-ug/03-dialogs.xml
index ab527c511ccb..7f09668126f1 100644
--- a/AnkiDroid/src/main/res/values-ug/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ug/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">ۋاسىتە تەكشۈرەمدۇ؟</string>
     <string name="check_media_warning">چوڭ ۋاسىتە توپلىمىغا ئۇزۇن ۋاقىت كېتىشى مۇمكىن</string>
     <string name="check_media_message">ۋاسىتە تەكشۈرۈۋاتىدۇ&#8230;</string>
-    <string name="check_media_acknowledge">ۋاسىتە تەكشۈرۈلدى</string>
-    <string name="check_media_invalid">كودلىنىشى ئىناۋەتسىز ھۆججەت: %d</string>
-    <string name="check_media_no_unused_missing">ئىشلىتىلمىگەن ياكى يوقالغان ھېچقانداق ھۆججەت بايقالمىدى</string>
-    <string name="check_media_delete_unused">ئىشلىتىلمىگەننى ئۆچۈر</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">ۋاسىتە ئۆچۈرۈۋاتىدۇ&#8230;</string>
     <string name="delete_media_result_title">ئۆچۈرۈش نەتىجىسى</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-uk/03-dialogs.xml b/AnkiDroid/src/main/res/values-uk/03-dialogs.xml
index 068428166e1d..2af0976f46d8 100644
--- a/AnkiDroid/src/main/res/values-uk/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-uk/03-dialogs.xml
@@ -108,10 +108,8 @@
     <string name="check_media_title">Перевірити медіафайли?</string>
     <string name="check_media_warning">Процес може зайняти багато часу з великими колекціями медіафайлів</string>
     <string name="check_media_message">Перевіряємо мультимедіа&#8230;</string>
-    <string name="check_media_acknowledge">Перевірено мультимедіа</string>
-    <string name="check_media_invalid">Файли з неправильним кодуванням: %d</string>
-    <string name="check_media_no_unused_missing">Не знайдено жодних невикористаних чи відсутніх фалів</string>
-    <string name="check_media_delete_unused">Видалити невикористане</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Видалення медіа&#8230;</string>
     <string name="delete_media_result_title">Результат видалення</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-ur/03-dialogs.xml b/AnkiDroid/src/main/res/values-ur/03-dialogs.xml
index e1cf53dea546..761a4d1cab4e 100644
--- a/AnkiDroid/src/main/res/values-ur/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ur/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">میڈیا چیک کریں؟</string>
     <string name="check_media_warning">میڈیا کے بڑے مجموعوں کے ساتھ اس میں کافی وقت لگ سکتا ہے</string>
     <string name="check_media_message">میڈیا کو چیک کیا جا رہا ہے&#8230;</string>
-    <string name="check_media_acknowledge">میڈیا چیک کیا</string>
-    <string name="check_media_invalid">غلط انکوڈنگ والی فائلیں: %d</string>
-    <string name="check_media_no_unused_missing">کوئی غیر استعمال شدہ یا گم شدہ فائلیں نہیں ملی</string>
-    <string name="check_media_delete_unused">غیر استعمال شدہ کو حذف کریں</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">میڈیا کو حذف کیا جا رہا ہے&#8230;</string>
     <string name="delete_media_result_title">حذف کرنے کا نتیجہ</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-uz/03-dialogs.xml b/AnkiDroid/src/main/res/values-uz/03-dialogs.xml
index 5a33c3b31f6c..6709d342cdf7 100644
--- a/AnkiDroid/src/main/res/values-uz/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-uz/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Check media?</string>
     <string name="check_media_warning">This may take a long time with large media collections</string>
     <string name="check_media_message">Checking media&#8230;</string>
-    <string name="check_media_acknowledge">Media checked</string>
-    <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_delete_unused">Delete unused</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-ve/03-dialogs.xml b/AnkiDroid/src/main/res/values-ve/03-dialogs.xml
index 5f136efb99fa..db01ccc584a3 100644
--- a/AnkiDroid/src/main/res/values-ve/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ve/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Check media?</string>
     <string name="check_media_warning">This may take a long time with large media collections</string>
     <string name="check_media_message">Checking media&#8230;</string>
-    <string name="check_media_acknowledge">Media checked</string>
-    <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_delete_unused">Delete unused</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-vi/03-dialogs.xml b/AnkiDroid/src/main/res/values-vi/03-dialogs.xml
index 6e5540395715..cccaa2aca267 100644
--- a/AnkiDroid/src/main/res/values-vi/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-vi/03-dialogs.xml
@@ -102,10 +102,8 @@
     <string name="check_media_title">Kiểm tra tệp đa phương tiện?</string>
     <string name="check_media_warning">Có thể hơi lâu với các bộ sưu tập đa phương tiện lớn</string>
     <string name="check_media_message">Đang kiểm tra tệp đa phương tiện&#8230;</string>
-    <string name="check_media_acknowledge">Đã kiểm tệp đa phương tiện</string>
-    <string name="check_media_invalid">Các tệp với mã hoá không hợp lệ: %d</string>
-    <string name="check_media_no_unused_missing">Không thấy tệp chưa dùng hoặc thất lạc nào</string>
-    <string name="check_media_delete_unused">Xoá tệp chưa dùng</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Đang xóa phương tiện&#8230;</string>
     <string name="delete_media_result_title">Kết quả xóa</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-wo/03-dialogs.xml b/AnkiDroid/src/main/res/values-wo/03-dialogs.xml
index e649b069ab31..874f16210ea4 100644
--- a/AnkiDroid/src/main/res/values-wo/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-wo/03-dialogs.xml
@@ -102,10 +102,8 @@
     <string name="check_media_title">Check media?</string>
     <string name="check_media_warning">This may take a long time with large media collections</string>
     <string name="check_media_message">Checking media&#8230;</string>
-    <string name="check_media_acknowledge">Media checked</string>
-    <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_delete_unused">Delete unused</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-xh/03-dialogs.xml b/AnkiDroid/src/main/res/values-xh/03-dialogs.xml
index 5f136efb99fa..db01ccc584a3 100644
--- a/AnkiDroid/src/main/res/values-xh/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-xh/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Check media?</string>
     <string name="check_media_warning">This may take a long time with large media collections</string>
     <string name="check_media_message">Checking media&#8230;</string>
-    <string name="check_media_acknowledge">Media checked</string>
-    <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_delete_unused">Delete unused</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-yue/03-dialogs.xml b/AnkiDroid/src/main/res/values-yue/03-dialogs.xml
index 1cf7ad7baedc..58076e74d9a0 100644
--- a/AnkiDroid/src/main/res/values-yue/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-yue/03-dialogs.xml
@@ -102,10 +102,8 @@
     <string name="check_media_title">Check media?</string>
     <string name="check_media_warning">This may take a long time with large media collections</string>
     <string name="check_media_message">Checking media&#8230;</string>
-    <string name="check_media_acknowledge">Media checked</string>
-    <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_delete_unused">Delete unused</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml b/AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml
index 5a0dd352ce84..9c52a2e0ab26 100644
--- a/AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml
@@ -102,10 +102,8 @@
     <string name="check_media_title">是否检查媒体？</string>
     <string name="check_media_warning">如果媒体数据较多，检查媒体文件可能会需要较长的时间</string>
     <string name="check_media_message">正在检查媒体文件&#8230;</string>
-    <string name="check_media_acknowledge">媒体文件检查完毕</string>
-    <string name="check_media_invalid">编码无效的文件：%d</string>
-    <string name="check_media_no_unused_missing">没有发现未使用或缺失的文件</string>
-    <string name="check_media_delete_unused">删除未使用的文件</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">正在删除媒体&#8230;</string>
     <string name="delete_media_result_title">填空结果</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-zh-rTW/03-dialogs.xml b/AnkiDroid/src/main/res/values-zh-rTW/03-dialogs.xml
index c63b24beeeb0..5a9b1b5b44f5 100644
--- a/AnkiDroid/src/main/res/values-zh-rTW/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-zh-rTW/03-dialogs.xml
@@ -102,10 +102,8 @@
     <string name="check_media_title">檢查媒體嗎？</string>
     <string name="check_media_warning">因爲大量的媒體集合，這可能會花上好一段時間</string>
     <string name="check_media_message">正在檢查媒體&#8230;</string>
-    <string name="check_media_acknowledge">媒體已檢查</string>
-    <string name="check_media_invalid">使用無效編碼的檔案：%d</string>
-    <string name="check_media_no_unused_missing">沒有發現任何未使用或是遺失的檔案</string>
-    <string name="check_media_delete_unused">刪除未使用的</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">刪除媒體中&#8230;</string>
     <string name="delete_media_result_title">克漏字結果</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-zu/03-dialogs.xml b/AnkiDroid/src/main/res/values-zu/03-dialogs.xml
index 5f136efb99fa..db01ccc584a3 100644
--- a/AnkiDroid/src/main/res/values-zu/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-zu/03-dialogs.xml
@@ -104,10 +104,8 @@
     <string name="check_media_title">Check media?</string>
     <string name="check_media_warning">This may take a long time with large media collections</string>
     <string name="check_media_message">Checking media&#8230;</string>
-    <string name="check_media_acknowledge">Media checked</string>
-    <string name="check_media_invalid">Files with invalid encoding: %d</string>
-    <string name="check_media_no_unused_missing">No unused or missing files found</string>
-    <string name="check_media_delete_unused">Delete unused</string>
+    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
+    <string name="check_media_tags_added">Tags added</string>
     <string name="delete_media_message">Deleting media&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">

From f0b9d0d043f3aabe599d96855d7810ddda2764d6 Mon Sep 17 00:00:00 2001
From: Aron <5459101+arooooon@users.noreply.github.com>
Date: Tue, 4 Mar 2025 20:33:39 +0100
Subject: [PATCH 148/200] Only show Backup prompt dialog at startup if there is
 no one-way or auto sync.

---
 .../main/java/com/ichi2/anki/DeckPicker.kt    | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt b/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
index a1b0edd835a4..4f7a798553cb 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
@@ -1340,7 +1340,13 @@ open class DeckPicker :
         }
     }
 
-    private suspend fun automaticSync(runInBackground: Boolean = false) {
+    /**
+     * Performs a sync if the conditions are met, e.g. user is logged in, there are changes,
+     * and auto sync is enabled.
+     * @param runInBackground whether the sync should be performed in the background or not
+     * @return whether a sync was performed or not.
+     */
+    private suspend fun automaticSync(runInBackground: Boolean = false): Boolean {
         /**
          * @return whether there are collection changes to be sync.
          *
@@ -1383,7 +1389,7 @@ open class DeckPicker :
             !areThereChangesToSync() -> {
                 Timber.d("autoSync: no collection changes to sync. Syncing media if set")
                 if (shouldFetchMedia(sharedPrefs())) {
-                    val auth = syncAuth() ?: return
+                    val auth = syncAuth() ?: return false
                     SyncMediaWorker.start(this, auth)
                 }
                 setLastSyncTimeToNow()
@@ -1391,14 +1397,16 @@ open class DeckPicker :
             else -> {
                 if (runInBackground) {
                     Timber.i("autoSync: starting background")
-                    val auth = syncAuth() ?: return
+                    val auth = syncAuth() ?: return false
                     SyncWorker.start(this, auth, shouldFetchMedia(sharedPrefs()))
                 } else {
                     Timber.i("autoSync: starting foreground")
                     sync()
                 }
+                return true
             }
         }
+        return false
     }
 
     override fun onKeyUp(
@@ -1563,10 +1571,6 @@ open class DeckPicker :
      * Automatic sync
      */
     private fun onFinishedStartup() {
-        launchCatchingTask {
-            BackupPromptDialog.showIfAvailable(this@DeckPicker)
-        }
-
         // Force a one-way sync if flag was set in upgrade path, asking the user to confirm if necessary
         if (recommendOneWaySync) {
             recommendOneWaySync = false
@@ -1587,9 +1591,12 @@ open class DeckPicker :
 
                 dialogHandler.sendMessage(OneWaySyncDialog(message).toMessage())
             }
-        }
-        launchCatchingTask {
-            automaticSync()
+        } else {
+            launchCatchingTask {
+                if (!automaticSync()) {
+                    BackupPromptDialog.showIfAvailable(this@DeckPicker)
+                }
+            }
         }
     }
 

From 1b73fe4ea050590d724f50ee464221b7df8d4461 Mon Sep 17 00:00:00 2001
From: Mike Hardy <github@mikehardy.net>
Date: Tue, 25 Mar 2025 14:45:44 -0500
Subject: [PATCH 149/200] docs: SECURITY.md

---
 SECURITY.md | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 SECURITY.md

diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 000000000000..0180f0b5b6e1
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,7 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+We allow private issue reporting through the standard github mechanism
+
+https://docs.github.com/en/code-security/security-advisories/guidance-on-reporting-and-writing-information-about-vulnerabilities/privately-reporting-a-security-vulnerability

From 243fdec1aef689483772f5a0ced18f04351d2d2a Mon Sep 17 00:00:00 2001
From: Song Eric Yu Li <ericli3690@gmail.com>
Date: Tue, 25 Mar 2025 14:32:08 -0400
Subject: [PATCH 150/200] Adding Warning Badge for Cards with Empty Fronts in
 Previewer Added code in TemplatePreviewerViewModel to compute whether cards
 have empty fronts, and added warning badges to previewer tabs in
 TemplatePreviewerPage accordingly

---
 .../anki/previewer/TemplatePreviewerPage.kt   | 10 ++++--
 .../previewer/TemplatePreviewerViewModel.kt   | 28 ++++++++++++++++
 .../TemplatePreviewerViewModelTest.kt         | 32 +++++++++++++++++++
 3 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/previewer/TemplatePreviewerPage.kt b/AnkiDroid/src/main/java/com/ichi2/anki/previewer/TemplatePreviewerPage.kt
index 99de0c3ef518..a002adfd7721 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/previewer/TemplatePreviewerPage.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/previewer/TemplatePreviewerPage.kt
@@ -55,8 +55,14 @@ class TemplatePreviewerPage : Fragment(R.layout.template_previewer_container) {
         val tabLayout = view.findViewById<TabLayout>(R.id.tab_layout)
 
         lifecycleScope.launch {
-            for (templateName in viewModel.getTemplateNames()) {
-                tabLayout.addTab(tabLayout.newTab().setText(templateName))
+            val cardsWithEmptyFronts = viewModel.cardsWithEmptyFronts?.await()
+            for ((index, templateName) in viewModel.getTemplateNames().withIndex()) {
+                val newTab = tabLayout.newTab().setText(templateName)
+                if (cardsWithEmptyFronts?.get(index) == true) {
+                    val badge = newTab.getOrCreateBadge()
+                    badge.horizontalOffset = -4
+                }
+                tabLayout.addTab(newTab)
             }
             tabLayout.selectTab(tabLayout.getTabAt(viewModel.getCurrentTabIndex()))
             tabLayout.addOnTabSelectedListener(
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/previewer/TemplatePreviewerViewModel.kt b/AnkiDroid/src/main/java/com/ichi2/anki/previewer/TemplatePreviewerViewModel.kt
index 7eb9def9a3f3..9fc021fbe72c 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/previewer/TemplatePreviewerViewModel.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/previewer/TemplatePreviewerViewModel.kt
@@ -39,6 +39,7 @@ import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.parcelize.Parcelize
+import org.intellij.lang.annotations.Language
 import org.jetbrains.annotations.VisibleForTesting
 
 class TemplatePreviewerViewModel(
@@ -63,6 +64,11 @@ class TemplatePreviewerViewModel(
     override var currentCard: Deferred<Card>
     override val server = AnkiServer(this).also { it.start() }
 
+    /**
+     * Ordered list of cards with empty fronts
+     */
+    internal val cardsWithEmptyFronts: Deferred<List<Boolean>>?
+
     init {
         note =
             asyncIO {
@@ -105,9 +111,28 @@ class TemplatePreviewerViewModel(
                     val tr = CollectionManager.TR
                     clozeNumbers.await().map { tr.cardTemplatesCard(it) }
                 }
+            cardsWithEmptyFronts = null
         } else {
             clozeOrds = null
             templateNames = CompletableDeferred(notetype.templatesNames)
+            cardsWithEmptyFronts =
+                asyncIO {
+                    val note = note.await()
+                    List(templateNames.await().size) { ord ->
+                        val questionText =
+                            withCol {
+                                note
+                                    .ephemeralCard(
+                                        col = this,
+                                        ord = ord,
+                                        customNoteType = notetype,
+                                        fillEmpty = fillEmpty,
+                                        deckId = arguments.deckId,
+                                    ).renderOutput(this)
+                            }.questionText
+                        EMPTY_FRONT_LINK in questionText
+                    }
+                }
         }
     }
 
@@ -205,6 +230,9 @@ class TemplatePreviewerViewModel(
         }
 
     companion object {
+        @Language("HTML")
+        private const val EMPTY_FRONT_LINK = """<a href='https://docs.ankiweb.net/templates/errors.html#front-of-card-is-blank'>"""
+
         fun factory(
             arguments: TemplatePreviewerArguments,
             cardMediaPlayer: CardMediaPlayer,
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/previewer/TemplatePreviewerViewModelTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/previewer/TemplatePreviewerViewModelTest.kt
index 468ea98a2230..33375fb973f3 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/previewer/TemplatePreviewerViewModelTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/previewer/TemplatePreviewerViewModelTest.kt
@@ -57,6 +57,21 @@ class TemplatePreviewerViewModelTest : JvmTest() {
         }
     }
 
+    @Test
+    fun `empty front field detected correctly for tab badge`() =
+        runOptionalReversedTest(
+            fields =
+                mutableListOf(
+                    "we have two normal fields",
+                    "and purposefully leave the third blank",
+                    "",
+                ),
+        ) {
+            onPageFinished(false)
+            assertThat(this.cardsWithEmptyFronts!!.await()[0], equalTo(false))
+            assertThat(this.cardsWithEmptyFronts!!.await()[1], equalTo(true))
+        }
+
     private fun runClozeTest(
         ord: Int = 0,
         fields: MutableList<String>? = null,
@@ -73,4 +88,21 @@ class TemplatePreviewerViewModelTest : JvmTest() {
         val viewModel = TemplatePreviewerViewModel(arguments, mock())
         block(viewModel)
     }
+
+    private fun runOptionalReversedTest(
+        ord: Int = 0,
+        fields: MutableList<String>? = null,
+        block: suspend TemplatePreviewerViewModel.() -> Unit,
+    ) = runTest {
+        val notetype = col.notetypes.byName("Basic (optional reversed card)")!!
+        val arguments =
+            TemplatePreviewerArguments(
+                notetypeFile = NotetypeFile(tempDirectory.root, notetype),
+                fields = fields ?: mutableListOf("question text", "answer text", "y"),
+                tags = mutableListOf(),
+                ord = ord,
+            )
+        val viewModel = TemplatePreviewerViewModel(arguments, mock())
+        block(viewModel)
+    }
 }

From 76479ab9b95d5ff18d0cdc4f6eed1928e6d95317 Mon Sep 17 00:00:00 2001
From: Amit-kumar80844 <156497411+amit-kumar80844@users.noreply.github.com>
Date: Tue, 25 Mar 2025 20:43:37 +0000
Subject: [PATCH 151/200] refactor: fix Android Studio warnings

Co-authored-by: David Allison <62114487+david-allison@users.noreply.github.com>
---
 .../com/ichi2/anki/AbstractFlashcardViewer.kt | 27 +++----------------
 .../analytics/AcraAnalyticsInteraction.kt     |  1 +
 .../ichi2/anki/analytics/UsageAnalytics.kt    |  2 +-
 .../anki/browser/BrowserColumnCollection.kt   |  3 +++
 .../com/ichi2/anki/dialogs/help/HelpDialog.kt |  2 +-
 .../java/com/ichi2/utils/ClipboardUtil.kt     |  5 ----
 6 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.kt b/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.kt
index c866a2c02b3d..8a88907d265d 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.kt
@@ -23,7 +23,6 @@ package com.ichi2.anki
 
 import android.annotation.SuppressLint
 import android.content.ActivityNotFoundException
-import android.content.ClipboardManager
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
@@ -149,7 +148,6 @@ import com.ichi2.libanki.undoableOp
 import com.ichi2.themes.Themes
 import com.ichi2.themes.Themes.getResFromAttr
 import com.ichi2.ui.FixedEditText
-import com.ichi2.utils.ClipboardUtil.getText
 import com.ichi2.utils.HandlerUtils.newHandler
 import com.ichi2.utils.HashUtil.hashSetInit
 import com.ichi2.utils.Stopwatch
@@ -243,7 +241,6 @@ abstract class AbstractFlashcardViewer :
     internal var easeButton3: EaseButton? = null
     internal var easeButton4: EaseButton? = null
     protected var topBarLayout: RelativeLayout? = null
-    private val clipboard: ClipboardManager? = null
     private var previousAnswerIndicator: PreviousAnswerIndicator? = null
 
     private var currentEase: Ease? = null
@@ -282,9 +279,6 @@ abstract class AbstractFlashcardViewer :
     var cardContent: String? = null
         private set
 
-    private var viewerUrl: String? = null
-    private val fadeDuration = 300
-
     @VisibleForTesting(otherwise = VisibleForTesting.PROTECTED)
     internal lateinit var cardMediaPlayer: CardMediaPlayer
 
@@ -403,7 +397,7 @@ abstract class AbstractFlashcardViewer :
                 val diffX = abs(event.rawX - touchX)
                 val diffY = abs(event.rawY - touchY)
                 // If a click is not coming then we reset the touch
-                if (diffX > Companion.CLICK_ACTION_THRESHOLD || diffY > Companion.CLICK_ACTION_THRESHOLD) {
+                if (diffX > CLICK_ACTION_THRESHOLD || diffY > CLICK_ACTION_THRESHOLD) {
                     hasBeenTouched = false
                 }
             }
@@ -734,19 +728,6 @@ abstract class AbstractFlashcardViewer :
 
     protected open fun answerFieldIsFocused(): Boolean = answerField != null && answerField!!.isFocused
 
-    protected fun clipboardHasText(): Boolean = !getText(clipboard).isNullOrEmpty()
-
-    /**
-     * Returns the text stored in the clipboard or the empty string if the clipboard is empty or contains something that
-     * cannot be converted to text.
-     *
-     * @return the text in clipboard or the empty string.
-     */
-    private fun clipboardGetText(): CharSequence {
-        val text = getText(clipboard)
-        return text ?: ""
-    }
-
     val deckOptionsLauncher =
         registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { _ ->
             Timber.i("Returned from deck options -> Restarting activity")
@@ -2073,7 +2054,7 @@ abstract class AbstractFlashcardViewer :
         private fun isTouchingEdge(e1: MotionEvent): Boolean {
             val height = touchLayer!!.height
             val width = touchLayer!!.width
-            val margin = Companion.NO_GESTURE_BORDER_DIP * resources.displayMetrics.density + 0.5f
+            val margin = NO_GESTURE_BORDER_DIP * resources.displayMetrics.density + 0.5f
             return e1.x < margin || e1.y < margin || height - e1.y < margin || width - e1.x < margin
         }
 
@@ -2143,7 +2124,7 @@ abstract class AbstractFlashcardViewer :
         private fun initShakeDetector() {
             Timber.d("Initializing shake detector")
             if (gestureProcessor.isBound(Gesture.SHAKE)) {
-                val sensorManager = getSystemService(Context.SENSOR_SERVICE) as SensorManager
+                val sensorManager = getSystemService(SENSOR_SERVICE) as SensorManager
                 shakeDetector =
                     ShakeDetector(this).apply {
                         start(sensorManager, SensorManager.SENSOR_DELAY_UI)
@@ -2456,7 +2437,7 @@ abstract class AbstractFlashcardViewer :
                 return true
             }
 
-            when (val signalOrdinal = url.toSignal()) {
+            when (url.toSignal()) {
                 Signal.SIGNAL_UNHANDLED -> {}
                 Signal.SIGNAL_NOOP -> return true
                 Signal.TYPE_FOCUS -> return true
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/analytics/AcraAnalyticsInteraction.kt b/AnkiDroid/src/main/java/com/ichi2/anki/analytics/AcraAnalyticsInteraction.kt
index 5979d60a3031..c29fac483d49 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/analytics/AcraAnalyticsInteraction.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/analytics/AcraAnalyticsInteraction.kt
@@ -30,6 +30,7 @@ import java.io.File
  * See <a href="/ACRA/acra/wiki/Custom-Extensions">Custom Extensions</a>
  */
 @AutoService(ReportInteraction::class)
+@Suppress("unused") // Not unused. ACRA dynamically loads this class
 class AcraAnalyticsInteraction : ReportInteraction {
     override fun performInteraction(
         context: Context,
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/analytics/UsageAnalytics.kt b/AnkiDroid/src/main/java/com/ichi2/anki/analytics/UsageAnalytics.kt
index f5631a88379a..f9389a8c42ed 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/analytics/UsageAnalytics.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/analytics/UsageAnalytics.kt
@@ -377,7 +377,7 @@ object UsageAnalytics {
     object Actions {
         // Analytics actions used in Help Dialog
         @AnalyticsConstant
-        val OPENED_HELPDIALOG = "Opened HelpDialogBox"
+        val OPENED_HELP_DIALOG = "Opened HelpDialogBox"
 
         @AnalyticsConstant
         val OPENED_USING_ANKIDROID = "Opened Using AnkiDroid"
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserColumnCollection.kt b/AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserColumnCollection.kt
index 5561fedb1005..11278ee67a22 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserColumnCollection.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserColumnCollection.kt
@@ -24,7 +24,10 @@ import com.ichi2.anki.model.CardsOrNotes
 import com.ichi2.anki.model.CardsOrNotes.CARDS
 import com.ichi2.anki.model.CardsOrNotes.NOTES
 import com.ichi2.libanki.BrowserConfig
+import com.ichi2.libanki.BrowserConfig.ACTIVE_CARD_COLUMNS_KEY
+import com.ichi2.libanki.BrowserConfig.ACTIVE_NOTE_COLUMNS_KEY
 import com.ichi2.libanki.BrowserDefaults
+import net.ankiweb.rsdroid.Backend
 import timber.log.Timber
 
 /**
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/help/HelpDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/help/HelpDialog.kt
index 443983d93cad..38932a8dc874 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/help/HelpDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/help/HelpDialog.kt
@@ -122,7 +122,7 @@ class HelpDialog : DialogFragment() {
         private const val PAGE_TAG = "HelpMenuPage"
 
         fun newHelpInstance(): HelpDialog {
-            UsageAnalytics.sendAnalyticsEvent(Category.LINK_CLICKED, Actions.OPENED_HELPDIALOG)
+            UsageAnalytics.sendAnalyticsEvent(Category.LINK_CLICKED, Actions.OPENED_HELP_DIALOG)
             return HelpDialog().apply {
                 arguments =
                     bundleOf(
diff --git a/AnkiDroid/src/main/java/com/ichi2/utils/ClipboardUtil.kt b/AnkiDroid/src/main/java/com/ichi2/utils/ClipboardUtil.kt
index a696c5fb9a27..c9bd4df2060f 100644
--- a/AnkiDroid/src/main/java/com/ichi2/utils/ClipboardUtil.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/utils/ClipboardUtil.kt
@@ -57,8 +57,6 @@ object ClipboardUtil {
 
     fun getUri(clipboard: ClipboardManager?): Uri? = clipboard?.getFirstItem()?.uri
 
-    fun hasSVG(description: ClipDescription): Boolean = description.hasMimeType("image/svg+xml")
-
     fun hasMedia(clipboard: ClipboardManager?): Boolean =
         clipboard
             ?.primaryClip
@@ -79,9 +77,6 @@ object ClipboardUtil {
 
     fun getDescription(clipboard: ClipboardManager?): ClipDescription? = clipboard?.primaryClip?.description
 
-    @CheckResult
-    fun getText(clipboard: ClipboardManager?): CharSequence? = clipboard?.getFirstItem()?.text
-
     @CheckResult
     fun getPlainText(
         clipboard: ClipboardManager?,

From d981bceb046a26bff50d9c4759b59097b3fca79f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Mar 2025 11:20:14 +0000
Subject: [PATCH 152/200] build(deps): Dependency Updates 20250327

Bumps [com.github.ByteHamster:SearchPreference](https://github.com/ByteHamster/SearchPreference) from 2.7.0 to 2.7.2.
- [Release notes](https://github.com/ByteHamster/SearchPreference/releases)
- [Commits](https://github.com/ByteHamster/SearchPreference/compare/2.7.0...2.7.2)

---
updated-dependencies:
- dependency-name: com.github.ByteHamster:SearchPreference
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

build(deps-dev): bump globals in /tools/localization

Bumps [globals](https://github.com/sindresorhus/globals) from 15.14.0 to 16.0.0.
- [Release notes](https://github.com/sindresorhus/globals/releases)
- [Commits](https://github.com/sindresorhus/globals/compare/v15.14.0...v16.0.0)

---
updated-dependencies:
- dependency-name: globals
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Bumps the non-breaking group in /tools/localization with 6 updates:

| Package | From | To |
| --- | --- | --- |
| [@crowdin/crowdin-api-client](https://github.com/crowdin/crowdin-api-client-js) | `1.41.2` | `1.41.4` |
| [@eslint/eslintrc](https://github.com/eslint/eslintrc) | `3.3.0` | `3.3.1` |
| [@eslint/js](https://github.com/eslint/eslint/tree/HEAD/packages/js) | `9.22.0` | `9.23.0` |
| [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) | `22.13.11` | `22.13.12` |
| [eslint](https://github.com/eslint/eslint) | `9.22.0` | `9.23.0` |
| [ts-jest](https://github.com/kulshekhar/ts-jest) | `29.2.6` | `29.3.0` |

Updates `@crowdin/crowdin-api-client` from 1.41.2 to 1.41.4
- [Release notes](https://github.com/crowdin/crowdin-api-client-js/releases)
- [Changelog](https://github.com/crowdin/crowdin-api-client-js/blob/master/.release-it.json)
- [Commits](https://github.com/crowdin/crowdin-api-client-js/compare/1.41.2...1.41.4)

Updates `@eslint/eslintrc` from 3.3.0 to 3.3.1
- [Release notes](https://github.com/eslint/eslintrc/releases)
- [Changelog](https://github.com/eslint/eslintrc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslintrc/compare/v3.3.0...v3.3.1)

Updates `@eslint/js` from 9.22.0 to 9.23.0
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/commits/v9.23.0/packages/js)

Updates `@types/node` from 22.13.11 to 22.13.12
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

Updates `eslint` from 9.22.0 to 9.23.0
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v9.22.0...v9.23.0)

Updates `ts-jest` from 29.2.6 to 29.3.0
- [Release notes](https://github.com/kulshekhar/ts-jest/releases)
- [Changelog](https://github.com/kulshekhar/ts-jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/kulshekhar/ts-jest/compare/v29.2.6...v29.3.0)

---
updated-dependencies:
- dependency-name: "@crowdin/crowdin-api-client"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: non-breaking
- dependency-name: "@eslint/eslintrc"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: non-breaking
- dependency-name: "@eslint/js"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: non-breaking
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: non-breaking
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: non-breaking
- dependency-name: ts-jest
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: non-breaking
...

Signed-off-by: dependabot[bot] <support@github.com>

Bumps `androidGradlePlugin` from 8.9.0 to 8.9.1.

Updates `com.android.application` from 8.9.0 to 8.9.1

Updates `com.android.library` from 8.9.0 to 8.9.1

---
updated-dependencies:
- dependency-name: com.android.application
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.android.library
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Bumps `lint` from 31.9.0 to 31.9.1.

Updates `com.android.tools.lint:lint-api` from 31.9.0 to 31.9.1

Updates `com.android.tools.lint:lint` from 31.9.0 to 31.9.1

Updates `com.android.tools.lint:lint-tests` from 31.9.0 to 31.9.1

---
updated-dependencies:
- dependency-name: com.android.tools.lint:lint-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.android.tools.lint:lint
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.android.tools.lint:lint-tests
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Update Anki-Android-Backend with 0.1.52-anki25.02
---
 gradle/libs.versions.toml       |  8 +--
 tools/localization/package.json | 14 ++---
 tools/localization/yarn.lock    | 92 ++++++++++++++++++---------------
 3 files changed, 61 insertions(+), 53 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 95c91439d24f..f0da7fea1bcf 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -18,7 +18,7 @@ ktlint = '1.5.0'
 #
 # Old changelogs - See 'Table of Contents' in sidebar
 # https://developer.android.com/build/releases/past-releases
-androidGradlePlugin = "8.9.0"
+androidGradlePlugin = "8.9.1"
 # https://developer.android.com/jetpack/androidx/releases/activity
 androidxActivity = "1.10.1"
 # https://developer.android.com/jetpack/androidx/releases/annotation
@@ -59,7 +59,7 @@ androidxViewpager2 = "1.1.0"
 androidxWebkit = "1.13.0"
 # https://developer.android.com/jetpack/androidx/releases/work
 androidxWork = "2.10.0"
-ankiBackend = '0.1.51-anki25.02'
+ankiBackend = '0.1.52-anki25.02'
 autoService = "1.1.1"
 autoServiceAnnotations = "1.1.1"
 colorpicker = "1.2.0"
@@ -88,7 +88,7 @@ kotlin = '2.1.20'
 kotlinxSerializationJson = "1.8.0"
 ktlintGradlePlugin = "12.2.0"
 leakcanaryAndroid = "2.14"
-lint = '31.9.0'
+lint = '31.9.1'
 material = "1.12.0"
 materialTapTargetPrompt = "3.3.2"
 mockitoInline = "5.2.0"
@@ -100,7 +100,7 @@ okhttp = "4.12.0"
 protobufKotlinLite = "4.30.1"
 # ../AnkiDroid/robolectricDownload.gradle may need changes - read instructions in that file
 robolectric = "4.14.1"
-searchpreference = "2.7.0"
+searchpreference = "2.7.2"
 seismic = "1.0.3"
 sharedPreferencesMock = "1.2.4"
 slackKeeper = "0.16.1"
diff --git a/tools/localization/package.json b/tools/localization/package.json
index a9df72e46ed4..f223cfdee0cd 100644
--- a/tools/localization/package.json
+++ b/tools/localization/package.json
@@ -17,29 +17,29 @@
     "author": "AnkiDroid Open Source Team",
     "license": "GPL-3.0",
     "dependencies": {
-        "@crowdin/crowdin-api-client": "^1.41.2",
+        "@crowdin/crowdin-api-client": "^1.41.4",
         "axios": "^1.8.4",
         "dotenv": "^16.4.7",
         "extract-zip": "^2.0.1",
         "typescript": "^5.8.2"
     },
     "devDependencies": {
-        "@eslint/eslintrc": "^3.3.0",
-        "@eslint/js": "^9.22.0",
+        "@eslint/eslintrc": "^3.3.1",
+        "@eslint/js": "^9.23.0",
         "@types/jest": "^29.5.14",
-        "@types/node": "^22.13.11",
+        "@types/node": "^22.13.13",
         "@typescript-eslint/eslint-plugin": "^8.27.0",
         "@typescript-eslint/parser": "^8.27.0",
-        "eslint": "^9.22.0",
+        "eslint": "^9.23.0",
         "eslint-config-prettier": "^10.1.1",
         "eslint-config-standard": "^17.1.0",
         "eslint-plugin-import": "^2.31.0",
         "eslint-plugin-n": "^17.16.2",
         "eslint-plugin-promise": "^7.2.1",
-        "globals": "^15.14.0",
+        "globals": "^16.0.0",
         "jest": "^29.7.0",
         "prettier": "^3.5.3",
-        "ts-jest": "^29.2.6",
+        "ts-jest": "^29.3.0",
         "ts-node": "^10.9.2"
     },
     "packageManager": "yarn@4.5.3"
diff --git a/tools/localization/yarn.lock b/tools/localization/yarn.lock
index e10462d57a44..934d34412e87 100644
--- a/tools/localization/yarn.lock
+++ b/tools/localization/yarn.lock
@@ -384,12 +384,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@crowdin/crowdin-api-client@npm:^1.41.2":
-  version: 1.41.2
-  resolution: "@crowdin/crowdin-api-client@npm:1.41.2"
+"@crowdin/crowdin-api-client@npm:^1.41.4":
+  version: 1.41.4
+  resolution: "@crowdin/crowdin-api-client@npm:1.41.4"
   dependencies:
     axios: "npm:^1"
-  checksum: 10c0/eeaf31e8c751afe79de3078ffe6039fc2ff33c52c030d9dfb23b7ba08dfe4d749e9c559fd07d525192f485cbad8496915798333e38ea971a9df7daac6b503e3e
+  checksum: 10c0/ed23c557a6ee9aa5d73055783f3d49f6b227787df5ea0504ac5238016690dea9008a2bba993c2a3e4cbbe7461b5fac30530f52bbd39657072171a74af96fce80
   languageName: node
   linkType: hard
 
@@ -431,10 +431,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/config-helpers@npm:^0.1.0":
-  version: 0.1.0
-  resolution: "@eslint/config-helpers@npm:0.1.0"
-  checksum: 10c0/3562b5325f42740fc83b0b92b7d13a61b383f8db064915143eec36184f09a09fad73eca6c2955ab6c248b0d04fa03c140f9af2f2c4c06770781a6b79f300a01e
+"@eslint/config-helpers@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "@eslint/config-helpers@npm:0.2.0"
+  checksum: 10c0/743a64653e13177029108f57ab47460ded08e3412c86216a14b7e8ab2dc79c2b64be45bf55c5ef29f83692a707dc34cf1e9217e4b8b4b272a0d9b691fdaf6a2a
   languageName: node
   linkType: hard
 
@@ -447,9 +447,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/eslintrc@npm:^3.3.0":
-  version: 3.3.0
-  resolution: "@eslint/eslintrc@npm:3.3.0"
+"@eslint/eslintrc@npm:^3.3.1":
+  version: 3.3.1
+  resolution: "@eslint/eslintrc@npm:3.3.1"
   dependencies:
     ajv: "npm:^6.12.4"
     debug: "npm:^4.3.2"
@@ -460,14 +460,14 @@ __metadata:
     js-yaml: "npm:^4.1.0"
     minimatch: "npm:^3.1.2"
     strip-json-comments: "npm:^3.1.1"
-  checksum: 10c0/215de990231b31e2fe6458f225d8cea0f5c781d3ecb0b7920703501f8cd21b3101fc5ef2f0d4f9a38865d36647b983e0e8ce8bf12fd2bcdd227fc48a5b1a43be
+  checksum: 10c0/b0e63f3bc5cce4555f791a4e487bf999173fcf27c65e1ab6e7d63634d8a43b33c3693e79f192cbff486d7df1be8ebb2bd2edc6e70ddd486cbfa84a359a3e3b41
   languageName: node
   linkType: hard
 
-"@eslint/js@npm:9.22.0, @eslint/js@npm:^9.22.0":
-  version: 9.22.0
-  resolution: "@eslint/js@npm:9.22.0"
-  checksum: 10c0/5bcd009bb579dc6c6ed760703bdd741e08a48cd9decd677aa2cf67fe66236658cb09a00185a0369f3904e5cffba9e6e0f2ff4d9ba4fdf598fcd81d34c49213a5
+"@eslint/js@npm:9.23.0, @eslint/js@npm:^9.23.0":
+  version: 9.23.0
+  resolution: "@eslint/js@npm:9.23.0"
+  checksum: 10c0/4e70869372b6325389e0ab51cac6d3062689807d1cef2c3434857571422ce11dde3c62777af85c382b9f94d937127598d605d2086787f08611351bf99faded81
   languageName: node
   linkType: hard
 
@@ -1073,12 +1073,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:^22.13.11":
-  version: 22.13.11
-  resolution: "@types/node@npm:22.13.11"
+"@types/node@npm:^22.13.13":
+  version: 22.13.13
+  resolution: "@types/node@npm:22.13.13"
   dependencies:
     undici-types: "npm:~6.20.0"
-  checksum: 10c0/f6ee33d36372242535c38640fe7550a6640d8a775ec19b55bfc11775b521cba072d892ca92a912332ce01b317293d645c1bf767f3f882ec719f2404a3d2a5b96
+  checksum: 10c0/daf792ba5dcff1316abf4b33680f94b792f8d54d6ae495efc8929531e0ba1284a248d29aab117d2259f9280284d986ad5799b193b0516e2b926d713aab835f7d
   languageName: node
   linkType: hard
 
@@ -1295,26 +1295,26 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "ankidroid-localization@workspace:."
   dependencies:
-    "@crowdin/crowdin-api-client": "npm:^1.41.2"
-    "@eslint/eslintrc": "npm:^3.3.0"
-    "@eslint/js": "npm:^9.22.0"
+    "@crowdin/crowdin-api-client": "npm:^1.41.4"
+    "@eslint/eslintrc": "npm:^3.3.1"
+    "@eslint/js": "npm:^9.23.0"
     "@types/jest": "npm:^29.5.14"
-    "@types/node": "npm:^22.13.11"
+    "@types/node": "npm:^22.13.13"
     "@typescript-eslint/eslint-plugin": "npm:^8.27.0"
     "@typescript-eslint/parser": "npm:^8.27.0"
     axios: "npm:^1.8.4"
     dotenv: "npm:^16.4.7"
-    eslint: "npm:^9.22.0"
+    eslint: "npm:^9.23.0"
     eslint-config-prettier: "npm:^10.1.1"
     eslint-config-standard: "npm:^17.1.0"
     eslint-plugin-import: "npm:^2.31.0"
     eslint-plugin-n: "npm:^17.16.2"
     eslint-plugin-promise: "npm:^7.2.1"
     extract-zip: "npm:^2.0.1"
-    globals: "npm:^15.14.0"
+    globals: "npm:^16.0.0"
     jest: "npm:^29.7.0"
     prettier: "npm:^3.5.3"
-    ts-jest: "npm:^29.2.6"
+    ts-jest: "npm:^29.3.0"
     ts-node: "npm:^10.9.2"
     typescript: "npm:^5.8.2"
   languageName: unknown
@@ -2402,17 +2402,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint@npm:^9.22.0":
-  version: 9.22.0
-  resolution: "eslint@npm:9.22.0"
+"eslint@npm:^9.23.0":
+  version: 9.23.0
+  resolution: "eslint@npm:9.23.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.2.0"
     "@eslint-community/regexpp": "npm:^4.12.1"
     "@eslint/config-array": "npm:^0.19.2"
-    "@eslint/config-helpers": "npm:^0.1.0"
+    "@eslint/config-helpers": "npm:^0.2.0"
     "@eslint/core": "npm:^0.12.0"
-    "@eslint/eslintrc": "npm:^3.3.0"
-    "@eslint/js": "npm:9.22.0"
+    "@eslint/eslintrc": "npm:^3.3.1"
+    "@eslint/js": "npm:9.23.0"
     "@eslint/plugin-kit": "npm:^0.2.7"
     "@humanfs/node": "npm:^0.16.6"
     "@humanwhocodes/module-importer": "npm:^1.0.1"
@@ -2448,7 +2448,7 @@ __metadata:
       optional: true
   bin:
     eslint: bin/eslint.js
-  checksum: 10c0/7b5ab6f2365971c16efe97349565f75d8343347562fb23f12734c6ab2cd5e35301373a0d51e194789ddcfdfca21db7b62ff481b03d524b8169896c305b65ff48
+  checksum: 10c0/9616c308dfa8d09db8ae51019c87d5d05933742214531b077bd6ab618baab3bec7938256c14dcad4dc47f5ba93feb0bc5e089f68799f076374ddea21b6a9be45
   languageName: node
   linkType: hard
 
@@ -2940,10 +2940,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"globals@npm:^15.14.0":
-  version: 15.14.0
-  resolution: "globals@npm:15.14.0"
-  checksum: 10c0/039deb8648bd373b7940c15df9f96ab7508fe92b31bbd39cbd1c1a740bd26db12457aa3e5d211553b234f30e9b1db2fee3683012f543a01a6942c9062857facb
+"globals@npm:^16.0.0":
+  version: 16.0.0
+  resolution: "globals@npm:16.0.0"
+  checksum: 10c0/8906d5f01838df64a81d6c2a7b7214312e2216cf65c5ed1546dc9a7d0febddf55ffa906cf04efd5b01eec2534d6f14859a89535d1a68241832810e41ef3fd5bb
   languageName: node
   linkType: hard
 
@@ -5340,9 +5340,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ts-jest@npm:^29.2.6":
-  version: 29.2.6
-  resolution: "ts-jest@npm:29.2.6"
+"ts-jest@npm:^29.3.0":
+  version: 29.3.0
+  resolution: "ts-jest@npm:29.3.0"
   dependencies:
     bs-logger: "npm:^0.2.6"
     ejs: "npm:^3.1.10"
@@ -5352,6 +5352,7 @@ __metadata:
     lodash.memoize: "npm:^4.1.2"
     make-error: "npm:^1.3.6"
     semver: "npm:^7.7.1"
+    type-fest: "npm:^4.37.0"
     yargs-parser: "npm:^21.1.1"
   peerDependencies:
     "@babel/core": ">=7.0.0-beta.0 <8"
@@ -5373,7 +5374,7 @@ __metadata:
       optional: true
   bin:
     ts-jest: cli.js
-  checksum: 10c0/2a79bdb2631bbd004cd6ec171d62dc3681b86e7d1c20eece7f56e7c3df11a0f5a14f4831960b1ba8d1836787395c8f9dcbd084fd7f59246bbee8048feb93f892
+  checksum: 10c0/c6a6b80e056a6d78679307fc859ebaafa9809bd707e5679b4f3e75b774137d840e607401698059e98497dac299c8c90305eae7ae8464cb1c6f161edfa8de0903
   languageName: node
   linkType: hard
 
@@ -5450,6 +5451,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"type-fest@npm:^4.37.0":
+  version: 4.38.0
+  resolution: "type-fest@npm:4.38.0"
+  checksum: 10c0/db9990d682a08697cf8ae67ac3cdbca734c742c96615e8888401d7d54e376b390e6a5d3be25fe3b4b439e1bb88a7da461da678a614ece8caccd9c0a07dd2e5f4
+  languageName: node
+  linkType: hard
+
 "typed-array-buffer@npm:^1.0.2":
   version: 1.0.2
   resolution: "typed-array-buffer@npm:1.0.2"

From 5436fc97a7a75898de20aa89eeb1b58e085c7b37 Mon Sep 17 00:00:00 2001
From: NALLAPANENI LAKSHMI SOWJANYA
 <162676564+NALLAPANENILAKSHMISOWJANYA@users.noreply.github.com>
Date: Thu, 27 Mar 2025 08:03:30 +0530
Subject: [PATCH 153/200] Update README.md

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index f8ad83eec573..d0c13898e384 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ A semi-official port of the open source [Anki](https://apps.ankiweb.net/index.ht
 - Syncing with AnkiWeb
 - Write answers (optional)
 - Text-to-speech integration
-- More than 6000 premade decks
+- More than 6,000 premade decks
 - Spaced repetition (supermemo 2 algorithm)
 - Supported contents: text, images, sounds, MathJax
 - Add cards by intent from other applications like dictionaries
@@ -57,7 +57,7 @@ Install
 Signing certificate fingerprint to [verify](https://developer.android.com/studio/command-line/apksigner#usage-verify) the APK:
 ```
 SHA-256: 2071534f0f4b5e54ae952dd275d70da6e3459ee69909d2ab1b4843c4c5b21a45 
-SHA-1: f24e06a3657b190a12671100402df32d7b9b3d36 
+SHA-1: f24e06a3657b190a12671100402df32d7b9b3d36
 ```
 
 Wiki
@@ -116,5 +116,5 @@ Thanks to our 1400 translators, for allowing us to be available, partially or to
 License
 -------
 * [GPL-3.0 License](https://github.com/ankidroid/Anki-Android/blob/main/COPYING)
-* [AGPL-3.0 Licence](https://github.com/ankitects/anki/blob/main/LICENSE) for some part of the back-end
+* [AGPL-3.0 License](https://github.com/ankitects/anki/blob/main/LICENSE) for some part of the back-end
 * [LGPL-3.0 License](https://github.com/ankidroid/Anki-Android/blob/main/api/COPYING.LESSER) for the AnkiDroid API

From 5726c433ba269dbde5a9caa93cac0c0174c0d37b Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Thu, 27 Mar 2025 09:19:19 -0300
Subject: [PATCH 154/200] fix: remove unused line in reviewer2.xml

I added while testing some stuff, but the line wasn't necessary (sw-600dp/reviewer2.xml doesn't have it and still works perfectly)

Forgot to remove it before pushing
---
 AnkiDroid/src/main/res/layout/reviewer2.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/AnkiDroid/src/main/res/layout/reviewer2.xml b/AnkiDroid/src/main/res/layout/reviewer2.xml
index ada84462b226..09e073b02c4c 100644
--- a/AnkiDroid/src/main/res/layout/reviewer2.xml
+++ b/AnkiDroid/src/main/res/layout/reviewer2.xml
@@ -211,7 +211,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:barrierDirection="top"
-            app:barrierAllowsGoneWidgets="false"
             app:constraint_referenced_ids="type_answer_container, answer_buttons, show_answer"/>
 
     </androidx.constraintlayout.widget.ConstraintLayout>

From 6e6c4d1079f81f0e5921ca657d4bcb175116050d Mon Sep 17 00:00:00 2001
From: Arman Singh <armansinghof@gmail.com>
Date: Mon, 27 Jan 2025 21:54:03 +0530
Subject: [PATCH 155/200] Refactored de-duplicate .csv/.tsv values both in
 IntentHandler and in ImportFileSelectionFragment.

---
 .../main/java/com/ichi2/anki/IntentHandler.kt | 10 ++-----
 .../dialogs/ImportFileSelectionFragment.kt    | 11 ++------
 .../com/ichi2/anki/utils/MimeTypeUtils.kt     | 28 +++++++++++++++++++
 3 files changed, 32 insertions(+), 17 deletions(-)
 create mode 100644 AnkiDroid/src/main/java/com/ichi2/anki/utils/MimeTypeUtils.kt

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/IntentHandler.kt b/AnkiDroid/src/main/java/com/ichi2/anki/IntentHandler.kt
index 3feecbb02081..7993df4a465c 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/IntentHandler.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/IntentHandler.kt
@@ -32,6 +32,7 @@ import com.ichi2.anki.preferences.sharedPrefs
 import com.ichi2.anki.servicelayer.ScopedStorageService
 import com.ichi2.anki.services.ReminderService
 import com.ichi2.anki.ui.windows.reviewer.ReviewerFragment
+import com.ichi2.anki.utils.MimeTypeUtils
 import com.ichi2.anki.worker.SyncWorker
 import com.ichi2.annotations.NeedsTest
 import com.ichi2.libanki.DeckId
@@ -311,14 +312,7 @@ class IntentHandler : AbstractIntentHandler() {
         private const val CLIPBOARD_INTENT = "com.ichi2.anki.COPY_DEBUG_INFO"
         private const val CLIPBOARD_INTENT_EXTRA_DATA = "clip_data"
 
-        private val textMimeTypes =
-            setOf(
-                "text/tab-separated-values",
-                "text/tsv",
-                "text/comma-separated-values",
-                "text/csv",
-                "text/plain",
-            )
+        private val textMimeTypes = MimeTypeUtils.CSV_TSV_MIME_TYPES
 
         private fun isValidViewIntent(intent: Intent): Boolean {
             // Negating a negative because we want to call specific attention to the fact that it's invalid
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/ImportFileSelectionFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/ImportFileSelectionFragment.kt
index 63852ac8c5dd..40e014ace364 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/ImportFileSelectionFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/ImportFileSelectionFragment.kt
@@ -31,8 +31,8 @@ import com.ichi2.anki.AnkiActivity
 import com.ichi2.anki.R
 import com.ichi2.anki.analytics.UsageAnalytics
 import com.ichi2.anki.snackbar.showSnackbar
+import com.ichi2.anki.utils.MimeTypeUtils
 import com.ichi2.annotations.NeedsTest
-import com.ichi2.utils.AssetHelper.TEXT_PLAIN
 import com.ichi2.utils.title
 import kotlinx.parcelize.Parcelize
 import timber.log.Timber
@@ -97,14 +97,7 @@ class ImportFileSelectionFragment : DialogFragment() {
                             ImportFileType.CSV,
                             multiple = false,
                             mimeType = "*/*",
-                            extraMimes =
-                                arrayOf(
-                                    TEXT_PLAIN,
-                                    "text/comma-separated-values",
-                                    "text/csv",
-                                    "text/tab-separated-values",
-                                    "text/tsv",
-                                ),
+                            extraMimes = MimeTypeUtils.CSV_TSV_MIME_TYPES,
                         ),
                     )
                 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/utils/MimeTypeUtils.kt b/AnkiDroid/src/main/java/com/ichi2/anki/utils/MimeTypeUtils.kt
new file mode 100644
index 000000000000..aec5014b1e35
--- /dev/null
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/utils/MimeTypeUtils.kt
@@ -0,0 +1,28 @@
+/*
+ *  Copyright (c) 2025 argon2r <vincentcs008@gmail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify it under
+ *  the terms of the GNU General Public License as published by the Free Software
+ *  Foundation; either version 3 of the License, or (at your option) any later
+ *  version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ *  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ *  PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with
+ *  this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.ichi2.anki.utils
+
+object MimeTypeUtils {
+    val CSV_TSV_MIME_TYPES =
+        arrayOf(
+            "text/comma-separated-values",
+            "text/csv",
+            "text/tab-separated-values",
+            "text/tsv",
+            "text/plain",
+        )
+}

From 39f6b078b97483cf862eb3565e41f3091b5d78b1 Mon Sep 17 00:00:00 2001
From: lukstbit <52494258+lukstbit@users.noreply.github.com>
Date: Sun, 30 Mar 2025 10:59:18 +0300
Subject: [PATCH 156/200] Add utility method for setting a fragment result
 listener in a FragmentActivity

Introduces an utility method similar with the one which is available already
available(platform code) for fragments: Fragment.setFragmentResultListener().

Example, current code:

supportFragmentManager.setFragmentResultListener(REQUEST_REPOSITION_NEW_CARDS, this) { _, bundle ->
            repositionCardsNoValidation(
                position = bundle.getInt(RepositionCardFragment.ARG_POSITION),
                step = bundle.getInt(RepositionCardFragment.ARG_STEP),
                shuffle = bundle.getBoolean(RepositionCardFragment.ARG_RANDOM),
                shift = bundle.getBoolean(RepositionCardFragment.ARG_SHIFT),
            )
        }

vs. new code:

setFragmentResultListener(REQUEST_REPOSITION_NEW_CARDS) { _, bundle ->
            repositionCardsNoValidation(
                position = getInt(RepositionCardFragment.ARG_POSITION),
                step = getInt(RepositionCardFragment.ARG_STEP),
                shuffle = getBoolean(RepositionCardFragment.ARG_RANDOM),
                shift = getBoolean(RepositionCardFragment.ARG_SHIFT),
            )
        }
---
 .../main/java/com/ichi2/anki/CardBrowser.kt   |  3 +-
 .../main/java/com/ichi2/anki/DeckPicker.kt    | 20 +++++------
 .../com/ichi2/anki/IntroductionActivity.kt    |  9 +++--
 .../com/ichi2/anki/SingleFragmentActivity.kt  |  3 +-
 .../com/ichi2/anki/StudyOptionsActivity.kt    |  4 ++-
 .../browser/FindAndReplaceDialogFragment.kt   | 12 +++----
 .../introduction/SetupCollectionFragment.kt   | 10 ------
 .../anki/scheduling/ForgetCardsDialog.kt      |  3 +-
 .../ichi2/anki/utils/ext/FragmentResult.kt    | 35 +++++++++++++++++++
 9 files changed, 66 insertions(+), 33 deletions(-)
 create mode 100644 AnkiDroid/src/main/java/com/ichi2/anki/utils/ext/FragmentResult.kt

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt b/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt
index ced412deccb5..a2d592bdd99a 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt
@@ -110,6 +110,7 @@ import com.ichi2.anki.snackbar.showSnackbar
 import com.ichi2.anki.ui.internationalization.toSentenceCase
 import com.ichi2.anki.utils.ext.getCurrentDialogFragment
 import com.ichi2.anki.utils.ext.ifNotZero
+import com.ichi2.anki.utils.ext.setFragmentResultListener
 import com.ichi2.anki.utils.ext.showDialogFragment
 import com.ichi2.anki.widgets.DeckDropDownAdapter.SubtitleListener
 import com.ichi2.annotations.NeedsTest
@@ -451,7 +452,7 @@ open class CardBrowser :
 
         setupFlows()
         registerOnForgetHandler { viewModel.queryAllSelectedCardIds() }
-        supportFragmentManager.setFragmentResultListener(REQUEST_REPOSITION_NEW_CARDS, this) { _, bundle ->
+        setFragmentResultListener(REQUEST_REPOSITION_NEW_CARDS) { _, bundle ->
             repositionCardsNoValidation(
                 position = bundle.getInt(RepositionCardFragment.ARG_POSITION),
                 step = bundle.getInt(RepositionCardFragment.ARG_STEP),
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt b/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
index 4f7a798553cb..2c3fe3fc9639 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
@@ -136,6 +136,7 @@ import com.ichi2.anki.dialogs.SyncErrorDialog.Companion.newInstance
 import com.ichi2.anki.dialogs.SyncErrorDialog.SyncErrorDialogListener
 import com.ichi2.anki.dialogs.customstudy.CustomStudyDialog
 import com.ichi2.anki.dialogs.customstudy.CustomStudyDialog.CustomStudyAction
+import com.ichi2.anki.dialogs.customstudy.CustomStudyDialog.CustomStudyAction.Companion.REQUEST_KEY
 import com.ichi2.anki.export.ActivityExportingDelegate
 import com.ichi2.anki.export.ExportDialogFragment
 import com.ichi2.anki.export.ExportDialogsFactory
@@ -158,6 +159,7 @@ import com.ichi2.anki.snackbar.BaseSnackbarBuilderProvider
 import com.ichi2.anki.snackbar.SnackbarBuilder
 import com.ichi2.anki.snackbar.showSnackbar
 import com.ichi2.anki.utils.ext.dismissAllDialogFragments
+import com.ichi2.anki.utils.ext.setFragmentResultListener
 import com.ichi2.anki.utils.ext.showDialogFragment
 import com.ichi2.anki.widgets.DeckAdapter
 import com.ichi2.anki.worker.SyncMediaWorker
@@ -603,7 +605,7 @@ open class DeckPicker :
 
         checkWebviewVersion(this)
 
-        supportFragmentManager.setFragmentResultListener(CustomStudyAction.REQUEST_KEY, this) { requestKey, bundle ->
+        setFragmentResultListener(REQUEST_KEY) { _, bundle ->
             when (CustomStudyAction.fromBundle(bundle)) {
                 CustomStudyAction.CUSTOM_STUDY_SESSION -> {
                     Timber.d("Custom study created")
@@ -620,16 +622,12 @@ open class DeckPicker :
             }
         }
 
-        supportFragmentManager.setFragmentResultListener(DeckPickerContextMenu.REQUEST_KEY_CONTEXT_MENU, this) { requestKey, arguments ->
-            when (requestKey) {
-                DeckPickerContextMenu.REQUEST_KEY_CONTEXT_MENU ->
-                    handleContextMenuSelection(
-                        arguments.getSerializableCompat<DeckPickerContextMenuOption>(DeckPickerContextMenu.CONTEXT_MENU_DECK_OPTION)
-                            ?: error("Unable to retrieve selected context menu option"),
-                        arguments.getLong(DeckPickerContextMenu.CONTEXT_MENU_DECK_ID, -1),
-                    )
-                else -> error("Unexpected fragment result key! Did you forget to update DeckPicker?")
-            }
+        setFragmentResultListener(DeckPickerContextMenu.REQUEST_KEY_CONTEXT_MENU) { _, bundle ->
+            handleContextMenuSelection(
+                bundle.getSerializableCompat<DeckPickerContextMenuOption>(DeckPickerContextMenu.CONTEXT_MENU_DECK_OPTION)
+                    ?: error("Unable to retrieve selected context menu option"),
+                bundle.getLong(DeckPickerContextMenu.CONTEXT_MENU_DECK_ID, -1),
+            )
         }
 
         pullToSyncWrapper.configureView(
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/IntroductionActivity.kt b/AnkiDroid/src/main/java/com/ichi2/anki/IntroductionActivity.kt
index 061d375d9b60..c885256c469f 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/IntroductionActivity.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/IntroductionActivity.kt
@@ -23,10 +23,13 @@ import android.os.Bundle
 import androidx.activity.result.ActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.content.edit
+import androidx.core.os.BundleCompat
 import com.ichi2.anki.introduction.SetupCollectionFragment
 import com.ichi2.anki.introduction.SetupCollectionFragment.CollectionSetupOption
-import com.ichi2.anki.introduction.SetupCollectionFragment.Companion.handleCollectionSetupOption
+import com.ichi2.anki.introduction.SetupCollectionFragment.Companion.FRAGMENT_KEY
+import com.ichi2.anki.introduction.SetupCollectionFragment.Companion.RESULT_KEY
 import com.ichi2.anki.preferences.sharedPrefs
+import com.ichi2.anki.utils.ext.setFragmentResultListener
 import com.ichi2.annotations.NeedsTest
 import timber.log.Timber
 
@@ -58,7 +61,9 @@ class IntroductionActivity : AnkiActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.introduction_activity)
 
-        handleCollectionSetupOption { option ->
+        setFragmentResultListener(FRAGMENT_KEY) { _, bundle ->
+            val option =
+                BundleCompat.getParcelable(bundle, RESULT_KEY, CollectionSetupOption::class.java) ?: error("Missing introduction option!")
             when (option) {
                 CollectionSetupOption.DeckPickerWithNewCollection -> startDeckPicker()
                 CollectionSetupOption.SyncFromExistingAccount -> openLoginDialog()
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/SingleFragmentActivity.kt b/AnkiDroid/src/main/java/com/ichi2/anki/SingleFragmentActivity.kt
index 7ecca6d63af6..3a16a46575b7 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/SingleFragmentActivity.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/SingleFragmentActivity.kt
@@ -25,6 +25,7 @@ import androidx.fragment.app.commit
 import com.ichi2.anki.android.input.ShortcutGroup
 import com.ichi2.anki.android.input.ShortcutGroupProvider
 import com.ichi2.anki.dialogs.customstudy.CustomStudyDialog.CustomStudyAction
+import com.ichi2.anki.utils.ext.setFragmentResultListener
 import com.ichi2.themes.setTransparentStatusBar
 import com.ichi2.utils.FragmentFactoryUtils
 import timber.log.Timber
@@ -74,7 +75,7 @@ open class SingleFragmentActivity : AnkiActivity() {
             replace(R.id.fragment_container, fragment, FRAGMENT_TAG)
         }
 
-        supportFragmentManager.setFragmentResultListener(CustomStudyAction.REQUEST_KEY, this) { requestKey, bundle ->
+        setFragmentResultListener(CustomStudyAction.REQUEST_KEY) { _, bundle ->
             when (CustomStudyAction.fromBundle(bundle)) {
                 CustomStudyAction.CUSTOM_STUDY_SESSION,
                 CustomStudyAction.EXTEND_STUDY_LIMITS,
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/StudyOptionsActivity.kt b/AnkiDroid/src/main/java/com/ichi2/anki/StudyOptionsActivity.kt
index d67c13b3f845..198fc72c3278 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/StudyOptionsActivity.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/StudyOptionsActivity.kt
@@ -26,6 +26,8 @@ import anki.collection.OpChanges
 import com.ichi2.anki.CollectionManager.withCol
 import com.ichi2.anki.StudyOptionsFragment.StudyOptionsListener
 import com.ichi2.anki.dialogs.customstudy.CustomStudyDialog.CustomStudyAction
+import com.ichi2.anki.dialogs.customstudy.CustomStudyDialog.CustomStudyAction.Companion.REQUEST_KEY
+import com.ichi2.anki.utils.ext.setFragmentResultListener
 import com.ichi2.libanki.ChangeManager
 import com.ichi2.ui.RtlCompliantActionProvider
 import com.ichi2.widget.WidgetStatus
@@ -49,7 +51,7 @@ class StudyOptionsActivity :
         }
         setResult(RESULT_OK)
 
-        supportFragmentManager.setFragmentResultListener(CustomStudyAction.REQUEST_KEY, this) { requestKey, bundle ->
+        setFragmentResultListener(REQUEST_KEY) { _, bundle ->
             when (CustomStudyAction.fromBundle(bundle)) {
                 CustomStudyAction.CUSTOM_STUDY_SESSION,
                 CustomStudyAction.EXTEND_STUDY_LIMITS,
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/browser/FindAndReplaceDialogFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/browser/FindAndReplaceDialogFragment.kt
index 0c66c92ab586..e8e2c186b54c 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/browser/FindAndReplaceDialogFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/browser/FindAndReplaceDialogFragment.kt
@@ -48,6 +48,7 @@ import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.ARG_SEARCH
 import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.REQUEST_FIND_AND_REPLACE
 import com.ichi2.anki.notetype.ManageNotetypes
 import com.ichi2.anki.ui.internationalization.toSentenceCase
+import com.ichi2.anki.utils.ext.setFragmentResultListener
 import com.ichi2.anki.utils.openUrl
 import com.ichi2.utils.customView
 import com.ichi2.utils.negativeButton
@@ -203,16 +204,15 @@ class FindAndReplaceDialogFragment : AnalyticsDialogFragment() {
 }
 
 fun CardBrowser.registerFindReplaceHandler(action: (FindReplaceResult) -> Unit) {
-    supportFragmentManager.setFragmentResultListener(REQUEST_FIND_AND_REPLACE, this) { _, bundle ->
+    setFragmentResultListener(REQUEST_FIND_AND_REPLACE) { _, bundle ->
         action(
             FindReplaceResult(
                 search = bundle.getString(ARG_SEARCH) ?: error("Missing required argument: search"),
-                replacement =
-                    bundle.getString(ARG_REPLACEMENT) ?: error("Missing required argument: replacement"),
+                replacement = bundle.getString(ARG_REPLACEMENT) ?: error("Missing required argument: replacement"),
                 field = bundle.getString(ARG_FIELD) ?: error("Missing required argument: field"),
-                bundle.getBoolean(ARG_ONLY_SELECTED_NOTES, true),
-                bundle.getBoolean(ARG_MATCH_CASE, false),
-                bundle.getBoolean(ARG_REGEX, false),
+                onlyOnSelectedNotes = bundle.getBoolean(ARG_ONLY_SELECTED_NOTES, true),
+                matchCase = bundle.getBoolean(ARG_MATCH_CASE, false),
+                regex = bundle.getBoolean(ARG_REGEX, false),
             ),
         )
     }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/introduction/SetupCollectionFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/introduction/SetupCollectionFragment.kt
index 838257c96e44..fee8cccd9e08 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/introduction/SetupCollectionFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/introduction/SetupCollectionFragment.kt
@@ -37,10 +37,8 @@ import android.os.Bundle
 import android.os.Parcelable
 import android.view.View
 import android.widget.Button
-import androidx.core.os.BundleCompat
 import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.setFragmentResult
 import com.ichi2.anki.R
 import com.ichi2.anki.introduction.SetupCollectionFragment.CollectionSetupOption.DeckPickerWithNewCollection
@@ -90,13 +88,5 @@ class SetupCollectionFragment : Fragment(R.layout.introduction_layout) {
     companion object {
         const val FRAGMENT_KEY = "collectionSetup"
         const val RESULT_KEY = "result"
-
-        /** Handles a result from a [SetupCollectionFragment] */
-        fun FragmentActivity.handleCollectionSetupOption(handleResult: (CollectionSetupOption) -> Unit) {
-            supportFragmentManager.setFragmentResultListener(FRAGMENT_KEY, this) { _, b ->
-                val item = BundleCompat.getParcelable(b, RESULT_KEY, CollectionSetupOption::class.java)!!
-                handleResult(item)
-            }
-        }
     }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/scheduling/ForgetCardsDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/scheduling/ForgetCardsDialog.kt
index ed8bff778b47..292ee165461e 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/scheduling/ForgetCardsDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/scheduling/ForgetCardsDialog.kt
@@ -31,6 +31,7 @@ import com.ichi2.anki.R
 import com.ichi2.anki.launchCatchingTask
 import com.ichi2.anki.preferences.sharedPrefs
 import com.ichi2.anki.snackbar.showSnackbar
+import com.ichi2.anki.utils.ext.setFragmentResultListener
 import com.ichi2.anki.utils.openUrl
 import com.ichi2.anki.withProgress
 import com.ichi2.annotations.NeedsTest
@@ -156,7 +157,7 @@ class ForgetCardsDialog : DialogFragment() {
  * @param cardsIdsProducer lambda which returns the list of cards for which to reset the progress
  */
 internal fun AnkiActivity.registerOnForgetHandler(cardsIdsProducer: suspend () -> List<CardId>) {
-    supportFragmentManager.setFragmentResultListener(ForgetCardsDialog.REQUEST_KEY_FORGET, this) { _, bundle: Bundle ->
+    setFragmentResultListener(ForgetCardsDialog.REQUEST_KEY_FORGET) { _, bundle ->
         forgetCards(
             cardsIdsProducer = cardsIdsProducer,
             restoreOriginalPositionIfPossible = bundle.getBoolean(ForgetCardsDialog.ARG_RESTORE_ORIGINAL),
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/utils/ext/FragmentResult.kt b/AnkiDroid/src/main/java/com/ichi2/anki/utils/ext/FragmentResult.kt
new file mode 100644
index 000000000000..e7887ab3aedd
--- /dev/null
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/utils/ext/FragmentResult.kt
@@ -0,0 +1,35 @@
+/****************************************************************************************
+ * Copyright (c) 2025 lukstbit <52494258+lukstbit@users.noreply.github.com>             *
+ *                                                                                      *
+ * This program is free software; you can redistribute it and/or modify it under        *
+ * the terms of the GNU General Public License as published by the Free Software        *
+ * Foundation; either version 3 of the License, or (at your option) any later           *
+ * version.                                                                             *
+ *                                                                                      *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY      *
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A      *
+ * PARTICULAR PURPOSE. See the GNU General Public License for more details.             *
+ *                                                                                      *
+ * You should have received a copy of the GNU General Public License along with         *
+ * this program.  If not, see <http://www.gnu.org/licenses/>.                           *
+ ****************************************************************************************/
+package com.ichi2.anki.utils.ext
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import androidx.fragment.app.setFragmentResultListener
+
+/**
+ * Utility method that simplifies setting a fragment result listener in a [FragmentActivity].
+ * Similar to [Fragment.setFragmentResultListener] library method.
+ *
+ * @param requestKey identifier for the request
+ * @param listener a callback triggered when the result associated to [requestKey] is set.
+ */
+fun FragmentActivity.setFragmentResultListener(
+    requestKey: String,
+    listener: ((requestKey: String, bundle: Bundle) -> Unit),
+) {
+    supportFragmentManager.setFragmentResultListener(requestKey, this, listener)
+}

From 2370f783c28783057ad06170c6ceaa68d85f69db Mon Sep 17 00:00:00 2001
From: Ashish Yadav <48384865+criticalAY@users.noreply.github.com>
Date: Tue, 1 Apr 2025 00:15:28 +0530
Subject: [PATCH 157/200] refactor: move KotlinCleanup to common module

---
 .../java/com/ichi2/anki/tests/ContentProviderTest.kt            | 2 +-
 .../java/com/ichi2/anki/tests/NotificationChannelTest.kt        | 2 +-
 AnkiDroid/src/androidTest/java/com/ichi2/anki/tests/Shared.kt   | 2 +-
 AnkiDroid/src/main/java/com/ichi2/anki/AnkiActivity.kt          | 2 +-
 AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidApp.kt          | 2 +-
 AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt           | 2 +-
 AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateEditor.kt    | 2 +-
 AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateNotetype.kt  | 2 +-
 AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt            | 2 +-
 AnkiDroid/src/main/java/com/ichi2/anki/DeckSpinnerSelection.kt  | 2 +-
 AnkiDroid/src/main/java/com/ichi2/anki/FieldEditLine.kt         | 2 +-
 AnkiDroid/src/main/java/com/ichi2/anki/FieldEditText.kt         | 2 +-
 AnkiDroid/src/main/java/com/ichi2/anki/MetaDB.kt                | 2 +-
 AnkiDroid/src/main/java/com/ichi2/anki/MyAccount.kt             | 2 +-
 AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt            | 2 +-
 .../src/main/java/com/ichi2/anki/analytics/UsageAnalytics.kt    | 2 +-
 .../src/main/java/com/ichi2/anki/dialogs/DeckSelectionDialog.kt | 2 +-
 .../com/ichi2/anki/dialogs/customstudy/CustomStudyDialog.kt     | 2 +-
 .../main/java/com/ichi2/anki/dialogs/tags/TagsDialogListener.kt | 2 +-
 .../ichi2/anki/instantnoteeditor/InstantNoteEditorActivity.kt   | 2 +-
 .../java/com/ichi2/anki/multimediacard/fields/ImageField.kt     | 2 +-
 AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/FieldState.kt | 2 +-
 .../main/java/com/ichi2/anki/provider/CardContentProvider.kt    | 2 +-
 AnkiDroid/src/main/java/com/ichi2/anki/reviewer/EaseButton.kt   | 2 +-
 AnkiDroid/src/main/java/com/ichi2/anki/web/HttpFetcher.kt       | 2 +-
 AnkiDroid/src/main/java/com/ichi2/async/CollectionOperations.kt | 2 +-
 AnkiDroid/src/main/java/com/ichi2/compat/BaseCompat.kt          | 2 +-
 AnkiDroid/src/main/java/com/ichi2/libanki/Collection.kt         | 2 +-
 AnkiDroid/src/main/java/com/ichi2/libanki/DB.kt                 | 2 +-
 AnkiDroid/src/main/java/com/ichi2/libanki/Note.kt               | 2 +-
 .../com/ichi2/preferences/IncrementerNumberRangePreference.kt   | 2 +-
 .../src/main/java/com/ichi2/ui/AppCompatPreferenceActivity.kt   | 2 +-
 AnkiDroid/src/main/java/com/ichi2/ui/CheckBoxTriStates.kt       | 2 +-
 AnkiDroid/src/main/java/com/ichi2/utils/HashUtil.kt             | 1 +
 AnkiDroid/src/main/java/com/ichi2/utils/JSONArray.kt            | 1 +
 AnkiDroid/src/main/java/com/ichi2/utils/UniqueArrayList.kt      | 1 +
 AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerTest.kt        | 2 +-
 AnkiDroid/src/test/java/com/ichi2/anki/ReviewerTest.kt          | 2 +-
 .../java/com/ichi2/anki/analytics/AnalyticsConstantsTest.kt     | 2 +-
 .../test/java/com/ichi2/anki/reviewer/ActionButtonStatusTest.kt | 2 +-
 AnkiDroid/src/test/java/com/ichi2/libanki/ModelTest.kt          | 2 +-
 AnkiDroid/src/test/java/com/ichi2/libanki/SchedulerTest.kt      | 2 +-
 .../com/ichi2/anki/common/utils/annotation}/KotlinCleanup.kt    | 2 +-
 43 files changed, 43 insertions(+), 40 deletions(-)
 rename {AnkiDroid/src/main/java/com/ichi2/utils => common/src/main/java/com/ichi2/anki/common/utils/annotation}/KotlinCleanup.kt (96%)

diff --git a/AnkiDroid/src/androidTest/java/com/ichi2/anki/tests/ContentProviderTest.kt b/AnkiDroid/src/androidTest/java/com/ichi2/anki/tests/ContentProviderTest.kt
index c76c3423fbaa..8a970004610c 100644
--- a/AnkiDroid/src/androidTest/java/com/ichi2/anki/tests/ContentProviderTest.kt
+++ b/AnkiDroid/src/androidTest/java/com/ichi2/anki/tests/ContentProviderTest.kt
@@ -27,6 +27,7 @@ import anki.notetypes.StockNotetype
 import com.ichi2.anki.CollectionManager
 import com.ichi2.anki.Ease
 import com.ichi2.anki.FlashCardsContract
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.anki.provider.pureAnswer
 import com.ichi2.anki.testutil.DatabaseUtils.cursorFillWindow
 import com.ichi2.anki.testutil.GrantStoragePermission.storagePermission
@@ -48,7 +49,6 @@ import com.ichi2.libanki.getStockNotetypeLegacy
 import com.ichi2.libanki.sched.Scheduler
 import com.ichi2.libanki.utils.set
 import com.ichi2.testutils.common.assertThrows
-import com.ichi2.utils.KotlinCleanup
 import com.ichi2.utils.emptyStringArray
 import net.ankiweb.rsdroid.exceptions.BackendNotFoundException
 import org.hamcrest.MatcherAssert.assertThat
diff --git a/AnkiDroid/src/androidTest/java/com/ichi2/anki/tests/NotificationChannelTest.kt b/AnkiDroid/src/androidTest/java/com/ichi2/anki/tests/NotificationChannelTest.kt
index 584eacd6d239..40fb10326eeb 100644
--- a/AnkiDroid/src/androidTest/java/com/ichi2/anki/tests/NotificationChannelTest.kt
+++ b/AnkiDroid/src/androidTest/java/com/ichi2/anki/tests/NotificationChannelTest.kt
@@ -23,9 +23,9 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.SdkSuppress
 import com.ichi2.anki.AnkiDroidApp
 import com.ichi2.anki.Channel
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.anki.testutil.GrantStoragePermission
 import com.ichi2.compat.CompatHelper.Companion.sdkVersion
-import com.ichi2.utils.KotlinCleanup
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.greaterThanOrEqualTo
 import org.junit.Before
diff --git a/AnkiDroid/src/androidTest/java/com/ichi2/anki/tests/Shared.kt b/AnkiDroid/src/androidTest/java/com/ichi2/anki/tests/Shared.kt
index 11dad9f111cb..091f29959f3b 100644
--- a/AnkiDroid/src/androidTest/java/com/ichi2/anki/tests/Shared.kt
+++ b/AnkiDroid/src/androidTest/java/com/ichi2/anki/tests/Shared.kt
@@ -18,10 +18,10 @@ package com.ichi2.anki.tests
 import android.annotation.SuppressLint
 import android.content.Context
 import androidx.test.espresso.matcher.ViewMatchers.assertThat
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.compat.CompatHelper
 import com.ichi2.libanki.Collection
 import com.ichi2.libanki.Storage
-import com.ichi2.utils.KotlinCleanup
 import org.hamcrest.CoreMatchers.containsString
 import org.hamcrest.CoreMatchers.not
 import org.junit.Assert.assertTrue
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/AnkiActivity.kt b/AnkiDroid/src/main/java/com/ichi2/anki/AnkiActivity.kt
index d76681163591..04a7ec1b98c5 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/AnkiActivity.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/AnkiActivity.kt
@@ -56,6 +56,7 @@ import com.ichi2.anki.android.input.ShortcutGroup
 import com.ichi2.anki.android.input.ShortcutGroupProvider
 import com.ichi2.anki.android.input.shortcut
 import com.ichi2.anki.common.utils.android.isRobolectric
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.anki.dialogs.AsyncDialogFragment
 import com.ichi2.anki.dialogs.DatabaseErrorDialog
 import com.ichi2.anki.dialogs.DatabaseErrorDialog.CustomExceptionData
@@ -77,7 +78,6 @@ import com.ichi2.libanki.Collection
 import com.ichi2.themes.Themes
 import com.ichi2.utils.AdaptionUtil
 import com.ichi2.utils.HandlerUtils
-import com.ichi2.utils.KotlinCleanup
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidApp.kt b/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidApp.kt
index c6c56b890515..ed4dd6194ed1 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidApp.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidApp.kt
@@ -38,6 +38,7 @@ import anki.collection.OpChanges
 import com.ichi2.anki.CrashReportService.sendExceptionReport
 import com.ichi2.anki.analytics.UsageAnalytics
 import com.ichi2.anki.browser.SharedPreferencesLastDeckIdRepository
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.anki.common.utils.isRunningAsUnitTest
 import com.ichi2.anki.contextmenu.AnkiCardContextMenu
 import com.ichi2.anki.contextmenu.CardBrowserContextMenu
@@ -58,7 +59,6 @@ import com.ichi2.compat.CompatHelper
 import com.ichi2.libanki.ChangeManager
 import com.ichi2.utils.AdaptionUtil
 import com.ichi2.utils.ExceptionUtil
-import com.ichi2.utils.KotlinCleanup
 import com.ichi2.utils.LanguageUtil
 import com.ichi2.utils.Permissions
 import com.ichi2.widget.cardanalysis.CardAnalysisWidget
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt b/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt
index a2d592bdd99a..e4903a4e4301 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt
@@ -77,6 +77,7 @@ import com.ichi2.anki.browser.SaveSearchResult
 import com.ichi2.anki.browser.SharedPreferencesLastDeckIdRepository
 import com.ichi2.anki.browser.registerFindReplaceHandler
 import com.ichi2.anki.browser.toCardBrowserLaunchOptions
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.anki.dialogs.BrowserOptionsDialog
 import com.ichi2.anki.dialogs.CardBrowserMySearchesDialog
 import com.ichi2.anki.dialogs.CardBrowserMySearchesDialog.Companion.newInstance
@@ -123,7 +124,6 @@ import com.ichi2.libanki.NoteId
 import com.ichi2.libanki.SortOrder
 import com.ichi2.libanki.undoableOp
 import com.ichi2.ui.CardBrowserSearchView
-import com.ichi2.utils.KotlinCleanup
 import com.ichi2.utils.LanguageUtil
 import com.ichi2.utils.TagsUtil.getUpdatedTags
 import com.ichi2.utils.dp
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateEditor.kt b/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateEditor.kt
index 02eafe096537..b2dbd70e0cf9 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateEditor.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateEditor.kt
@@ -64,6 +64,7 @@ import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.CollectionManager.withCol
 import com.ichi2.anki.android.input.ShortcutGroup
 import com.ichi2.anki.android.input.shortcut
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.anki.dialogs.ConfirmationDialog
 import com.ichi2.anki.dialogs.DeckSelectionDialog
 import com.ichi2.anki.dialogs.DeckSelectionDialog.DeckSelectionListener
@@ -99,7 +100,6 @@ import com.ichi2.libanki.undoableOp
 import com.ichi2.themes.Themes
 import com.ichi2.ui.FixedEditText
 import com.ichi2.ui.FixedTextView
-import com.ichi2.utils.KotlinCleanup
 import com.ichi2.utils.copyToClipboard
 import com.ichi2.utils.listItems
 import com.ichi2.utils.show
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateNotetype.kt b/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateNotetype.kt
index 811513e56ecc..b3c77d3e70f5 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateNotetype.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateNotetype.kt
@@ -22,6 +22,7 @@ import android.os.Bundle
 import android.os.Parcel
 import android.os.Parcelable
 import androidx.core.os.bundleOf
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.async.saveModel
 import com.ichi2.compat.CompatHelper.Companion.compat
 import com.ichi2.compat.CompatHelper.Companion.getSerializableCompat
@@ -29,7 +30,6 @@ import com.ichi2.libanki.CardTemplate
 import com.ichi2.libanki.Collection
 import com.ichi2.libanki.NoteTypeId
 import com.ichi2.libanki.NotetypeJson
-import com.ichi2.utils.KotlinCleanup
 import timber.log.Timber
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt b/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
index 2c3fe3fc9639..823287d39fec 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
@@ -108,6 +108,7 @@ import com.ichi2.anki.analytics.UsageAnalytics
 import com.ichi2.anki.android.back.exitViaDoubleTapBackCallback
 import com.ichi2.anki.android.input.ShortcutGroup
 import com.ichi2.anki.android.input.shortcut
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.anki.deckpicker.BITMAP_BYTES_PER_PIXEL
 import com.ichi2.anki.deckpicker.BackgroundImage
 import com.ichi2.anki.deckpicker.DeckDeletionResult
@@ -180,7 +181,6 @@ import com.ichi2.utils.AdaptionUtil
 import com.ichi2.utils.ClipboardUtil.IMPORT_MIME_TYPES
 import com.ichi2.utils.ImportUtils
 import com.ichi2.utils.ImportUtils.ImportResult
-import com.ichi2.utils.KotlinCleanup
 import com.ichi2.utils.NetworkUtils
 import com.ichi2.utils.NetworkUtils.isActiveNetworkMetered
 import com.ichi2.utils.SyncStatus
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/DeckSpinnerSelection.kt b/AnkiDroid/src/main/java/com/ichi2/anki/DeckSpinnerSelection.kt
index ca309530d49e..727e1942d579 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/DeckSpinnerSelection.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/DeckSpinnerSelection.kt
@@ -26,6 +26,7 @@ import androidx.annotation.MainThread
 import androidx.appcompat.app.ActionBar
 import androidx.appcompat.app.AppCompatActivity
 import com.ichi2.anki.CollectionManager.withCol
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.anki.dialogs.DeckSelectionDialog
 import com.ichi2.anki.dialogs.DeckSelectionDialog.DeckCreationListener
 import com.ichi2.anki.dialogs.DeckSelectionDialog.SelectableDeck
@@ -36,7 +37,6 @@ import com.ichi2.libanki.Collection
 import com.ichi2.libanki.DeckId
 import com.ichi2.libanki.DeckNameId
 import com.ichi2.utils.FragmentManagerSupplier
-import com.ichi2.utils.KotlinCleanup
 import com.ichi2.utils.asFragmentManagerSupplier
 import timber.log.Timber
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/FieldEditLine.kt b/AnkiDroid/src/main/java/com/ichi2/anki/FieldEditLine.kt
index a44716a0e86d..9040ac348f3a 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/FieldEditLine.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/FieldEditLine.kt
@@ -35,9 +35,9 @@ import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.constraintlayout.widget.ConstraintSet
 import androidx.core.os.ParcelCompat
 import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.ui.AnimationUtil.collapseView
 import com.ichi2.ui.AnimationUtil.expandView
-import com.ichi2.utils.KotlinCleanup
 import java.util.Locale
 
 @KotlinCleanup("replace _name with `field`")
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/FieldEditText.kt b/AnkiDroid/src/main/java/com/ichi2/anki/FieldEditText.kt
index 39e390776131..54bcf3d461f0 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/FieldEditText.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/FieldEditText.kt
@@ -29,6 +29,7 @@ import android.view.inputmethod.EditorInfo
 import android.widget.EditText
 import androidx.annotation.VisibleForTesting
 import com.google.android.material.color.MaterialColors
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.anki.preferences.sharedPrefs
 import com.ichi2.anki.servicelayer.NoteService
 import com.ichi2.anki.snackbar.showSnackbar
@@ -37,7 +38,6 @@ import com.ichi2.utils.ClipboardUtil.getDescription
 import com.ichi2.utils.ClipboardUtil.getPlainText
 import com.ichi2.utils.ClipboardUtil.getUri
 import com.ichi2.utils.ClipboardUtil.hasMedia
-import com.ichi2.utils.KotlinCleanup
 import kotlinx.parcelize.Parcelize
 import timber.log.Timber
 import java.util.Locale
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/MetaDB.kt b/AnkiDroid/src/main/java/com/ichi2/anki/MetaDB.kt
index e60a0cb981c7..75e8a00fadcb 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/MetaDB.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/MetaDB.kt
@@ -7,11 +7,11 @@ import android.database.sqlite.SQLiteDatabase
 import android.database.sqlite.SQLiteException
 import androidx.annotation.WorkerThread
 import androidx.core.database.sqlite.transaction
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.anki.model.WhiteboardPenColor
 import com.ichi2.anki.model.WhiteboardPenColor.Companion.default
 import com.ichi2.anki.reviewer.CardSide
 import com.ichi2.libanki.DeckId
-import com.ichi2.utils.KotlinCleanup
 import com.ichi2.widget.SmallWidgetStatus
 import timber.log.Timber
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/MyAccount.kt b/AnkiDroid/src/main/java/com/ichi2/anki/MyAccount.kt
index ec902be5d98c..f8ccfb5d336b 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/MyAccount.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/MyAccount.kt
@@ -35,6 +35,7 @@ import androidx.core.net.toUri
 import androidx.core.view.isVisible
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.anki.dialogs.help.HelpDialog
 import com.ichi2.anki.pages.RemoveAccountFragment
 import com.ichi2.anki.settings.Prefs
@@ -42,7 +43,6 @@ import com.ichi2.anki.utils.ext.removeFragmentFromContainer
 import com.ichi2.anki.utils.ext.showDialogFragment
 import com.ichi2.ui.TextInputEditField
 import com.ichi2.utils.AdaptionUtil.isUserATestClient
-import com.ichi2.utils.KotlinCleanup
 import com.ichi2.utils.Permissions
 import timber.log.Timber
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt b/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt
index 69c7940bbce9..41ff2bdf50b9 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt
@@ -91,6 +91,7 @@ import com.ichi2.anki.android.input.ShortcutGroup
 import com.ichi2.anki.android.input.ShortcutGroupProvider
 import com.ichi2.anki.android.input.shortcut
 import com.ichi2.anki.bottomsheet.ImageOcclusionBottomSheetFragment
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.anki.dialogs.ConfirmationDialog
 import com.ichi2.anki.dialogs.DeckSelectionDialog.DeckSelectionListener
 import com.ichi2.anki.dialogs.DeckSelectionDialog.SelectableDeck
@@ -168,7 +169,6 @@ import com.ichi2.utils.HashUtil
 import com.ichi2.utils.ImportUtils
 import com.ichi2.utils.IntentUtil.resolveMimeType
 import com.ichi2.utils.KeyUtils
-import com.ichi2.utils.KotlinCleanup
 import com.ichi2.utils.MapUtil
 import com.ichi2.utils.NoteFieldDecorator
 import com.ichi2.utils.TextViewUtil
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/analytics/UsageAnalytics.kt b/AnkiDroid/src/main/java/com/ichi2/anki/analytics/UsageAnalytics.kt
index f9389a8c42ed..5335025d6308 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/analytics/UsageAnalytics.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/analytics/UsageAnalytics.kt
@@ -29,9 +29,9 @@ import com.brsanthu.googleanalytics.request.DefaultRequest
 import com.ichi2.anki.AnkiDroidApp
 import com.ichi2.anki.BuildConfig
 import com.ichi2.anki.R
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.anki.preferences.sharedPrefs
 import com.ichi2.utils.DisplayUtils
-import com.ichi2.utils.KotlinCleanup
 import com.ichi2.utils.WebViewDebugging.hasSetDataDirectory
 import org.acra.ACRA
 import org.acra.util.Installation
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DeckSelectionDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DeckSelectionDialog.kt
index d0491ab47229..3064c6c8f242 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DeckSelectionDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DeckSelectionDialog.kt
@@ -42,6 +42,7 @@ import com.ichi2.anki.DeckSpinnerSelection
 import com.ichi2.anki.OnContextAndLongClickListener.Companion.setOnContextAndLongClickListener
 import com.ichi2.anki.R
 import com.ichi2.anki.analytics.AnalyticsDialogFragment
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.anki.dialogs.DeckSelectionDialog.DecksArrayAdapter.DecksFilter
 import com.ichi2.anki.dialogs.DeckSelectionDialog.SelectableDeck
 import com.ichi2.anki.launchCatchingTask
@@ -51,7 +52,6 @@ import com.ichi2.libanki.DeckId
 import com.ichi2.libanki.DeckNameId
 import com.ichi2.libanki.sched.DeckNode
 import com.ichi2.ui.AccessibleSearchView
-import com.ichi2.utils.KotlinCleanup
 import com.ichi2.utils.TypedFilter
 import com.ichi2.utils.create
 import com.ichi2.utils.customView
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/CustomStudyDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/CustomStudyDialog.kt
index aa8d309e61ba..9af03c8ddced 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/CustomStudyDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/CustomStudyDialog.kt
@@ -41,6 +41,7 @@ import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.CollectionManager.withCol
 import com.ichi2.anki.R
 import com.ichi2.anki.analytics.AnalyticsDialogFragment
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.anki.dialogs.customstudy.CustomStudyDialog.ContextMenuOption
 import com.ichi2.anki.dialogs.customstudy.CustomStudyDialog.ContextMenuOption.EXTEND_NEW
 import com.ichi2.anki.dialogs.customstudy.CustomStudyDialog.ContextMenuOption.EXTEND_REV
@@ -67,7 +68,6 @@ import com.ichi2.libanki.Deck
 import com.ichi2.libanki.DeckId
 import com.ichi2.libanki.undoableOp
 import com.ichi2.utils.BundleUtils.getNullableInt
-import com.ichi2.utils.KotlinCleanup
 import com.ichi2.utils.bundleOfNotNull
 import com.ichi2.utils.cancelable
 import com.ichi2.utils.customView
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/tags/TagsDialogListener.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/tags/TagsDialogListener.kt
index 6c075800209e..4c9305b9dc33 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/tags/TagsDialogListener.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/tags/TagsDialogListener.kt
@@ -18,9 +18,9 @@ package com.ichi2.anki.dialogs.tags
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.anki.model.CardStateFilter
 import com.ichi2.compat.CompatHelper.Companion.getSerializableCompat
-import com.ichi2.utils.KotlinCleanup
 import java.util.ArrayList
 
 @KotlinCleanup("make selectedTags and indeterminateTags non-null")
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/instantnoteeditor/InstantNoteEditorActivity.kt b/AnkiDroid/src/main/java/com/ichi2/anki/instantnoteeditor/InstantNoteEditorActivity.kt
index 2b44cb86a437..abb266a85902 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/instantnoteeditor/InstantNoteEditorActivity.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/instantnoteeditor/InstantNoteEditorActivity.kt
@@ -47,6 +47,7 @@ import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.CustomActionModeCallback
 import com.ichi2.anki.DeckSpinnerSelection
 import com.ichi2.anki.R
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.anki.dialogs.DeckSelectionDialog
 import com.ichi2.anki.dialogs.DiscardChangesDialog
 import com.ichi2.anki.launchCatchingTask
@@ -58,7 +59,6 @@ import com.ichi2.libanki.NotetypeJson
 import com.ichi2.themes.setTransparentBackground
 import com.ichi2.ui.FixedTextView
 import com.ichi2.utils.AssetHelper.TEXT_PLAIN
-import com.ichi2.utils.KotlinCleanup
 import com.ichi2.utils.message
 import com.ichi2.utils.negativeButton
 import com.ichi2.utils.positiveButton
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/fields/ImageField.kt b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/fields/ImageField.kt
index 706edeb7d709..67a4e7793114 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/fields/ImageField.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/fields/ImageField.kt
@@ -22,9 +22,9 @@ package com.ichi2.anki.multimediacard.fields
 import android.net.Uri
 import androidx.annotation.CheckResult
 import androidx.annotation.VisibleForTesting
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.annotations.NeedsTest
 import com.ichi2.libanki.Collection
-import com.ichi2.utils.KotlinCleanup
 import org.jsoup.Jsoup
 import timber.log.Timber
 import java.io.File
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/FieldState.kt b/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/FieldState.kt
index a0453ba041d0..99edfd2b1dd4 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/FieldState.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/FieldState.kt
@@ -22,10 +22,10 @@ import android.view.View
 import com.ichi2.anki.FieldEditLine
 import com.ichi2.anki.NoteEditor
 import com.ichi2.anki.R
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.libanki.Field
 import com.ichi2.libanki.NotetypeJson
 import com.ichi2.libanki.Notetypes
-import com.ichi2.utils.KotlinCleanup
 import com.ichi2.utils.MapUtil.getKeyByValue
 import java.util.ArrayList
 import kotlin.math.min
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/provider/CardContentProvider.kt b/AnkiDroid/src/main/java/com/ichi2/anki/provider/CardContentProvider.kt
index 15d5c0db6696..2d6eee785576 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/provider/CardContentProvider.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/provider/CardContentProvider.kt
@@ -35,6 +35,7 @@ import com.ichi2.anki.CollectionManager
 import com.ichi2.anki.CrashReportService
 import com.ichi2.anki.Ease
 import com.ichi2.anki.FlashCardsContract
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.anki.utils.ext.description
 import com.ichi2.libanki.Card
 import com.ichi2.libanki.CardTemplate
@@ -57,7 +58,6 @@ import com.ichi2.libanki.sched.DeckNode
 import com.ichi2.libanki.utils.TimeManager
 import com.ichi2.utils.FileUtil
 import com.ichi2.utils.FileUtil.internalizeUri
-import com.ichi2.utils.KotlinCleanup
 import com.ichi2.utils.Permissions.arePermissionsDefinedInManifest
 import net.ankiweb.rsdroid.exceptions.BackendDeckIsFilteredException
 import org.json.JSONArray
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/EaseButton.kt b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/EaseButton.kt
index ca59ea266f2f..738a496b65ae 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/EaseButton.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/EaseButton.kt
@@ -25,7 +25,7 @@ import androidx.annotation.StringRes
 import androidx.core.view.isVisible
 import com.ichi2.anki.AbstractFlashcardViewer
 import com.ichi2.anki.Ease
-import com.ichi2.utils.KotlinCleanup
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 
 /**
  * The UI of an ease button
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/web/HttpFetcher.kt b/AnkiDroid/src/main/java/com/ichi2/anki/web/HttpFetcher.kt
index 6b4a3113027b..3b8d5fbc3199 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/web/HttpFetcher.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/web/HttpFetcher.kt
@@ -19,7 +19,7 @@
  ****************************************************************************************/
 
 package com.ichi2.anki.web
-import com.ichi2.utils.KotlinCleanup
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.utils.VersionUtils.pkgVersionName
 import okhttp3.Interceptor
 import okhttp3.OkHttpClient
diff --git a/AnkiDroid/src/main/java/com/ichi2/async/CollectionOperations.kt b/AnkiDroid/src/main/java/com/ichi2/async/CollectionOperations.kt
index 5a862673edaf..56b4e1928725 100644
--- a/AnkiDroid/src/main/java/com/ichi2/async/CollectionOperations.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/async/CollectionOperations.kt
@@ -17,9 +17,9 @@
 package com.ichi2.async
 
 import com.ichi2.anki.CardTemplateNotetype
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.libanki.Collection
 import com.ichi2.libanki.NotetypeJson
-import com.ichi2.utils.KotlinCleanup
 import timber.log.Timber
 
 /**
diff --git a/AnkiDroid/src/main/java/com/ichi2/compat/BaseCompat.kt b/AnkiDroid/src/main/java/com/ichi2/compat/BaseCompat.kt
index 93bf2764d2f1..f2b15c57f7c4 100644
--- a/AnkiDroid/src/main/java/com/ichi2/compat/BaseCompat.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/compat/BaseCompat.kt
@@ -31,7 +31,7 @@ import android.os.Vibrator
 import android.provider.MediaStore
 import android.view.View
 import androidx.appcompat.widget.TooltipCompat
-import com.ichi2.utils.KotlinCleanup
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import timber.log.Timber
 import java.io.File
 import java.io.FileInputStream
diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/Collection.kt b/AnkiDroid/src/main/java/com/ichi2/libanki/Collection.kt
index 4ebee4853098..e0dafcaea3e9 100644
--- a/AnkiDroid/src/main/java/com/ichi2/libanki/Collection.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/libanki/Collection.kt
@@ -40,6 +40,7 @@ import anki.search.BrowserRow
 import anki.search.SearchNode
 import anki.sync.SyncAuth
 import anki.sync.SyncStatusResponse
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.libanki.Utils.ids2str
 import com.ichi2.libanki.backend.model.toBackendNote
 import com.ichi2.libanki.backend.model.toProtoBuf
@@ -50,7 +51,6 @@ import com.ichi2.libanki.sched.Scheduler
 import com.ichi2.libanki.utils.LibAnkiAlias
 import com.ichi2.libanki.utils.NotInLibAnki
 import com.ichi2.libanki.utils.TimeManager
-import com.ichi2.utils.KotlinCleanup
 import net.ankiweb.rsdroid.Backend
 import net.ankiweb.rsdroid.exceptions.BackendInvalidInputException
 import timber.log.Timber
diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/DB.kt b/AnkiDroid/src/main/java/com/ichi2/libanki/DB.kt
index 7ab7b3ba75d9..10c07731bff5 100644
--- a/AnkiDroid/src/main/java/com/ichi2/libanki/DB.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/libanki/DB.kt
@@ -28,8 +28,8 @@ import androidx.annotation.WorkerThread
 import androidx.sqlite.db.SupportSQLiteDatabase
 import com.ichi2.anki.CollectionManager
 import com.ichi2.anki.CrashReportService.sendExceptionReport
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.anki.dialogs.DatabaseErrorDialog
-import com.ichi2.utils.KotlinCleanup
 import net.ankiweb.rsdroid.Backend
 import net.ankiweb.rsdroid.database.AnkiSupportSQLiteDatabase
 import timber.log.Timber
diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/Note.kt b/AnkiDroid/src/main/java/com/ichi2/libanki/Note.kt
index fbf3c1db5b9c..692539d3cf3a 100644
--- a/AnkiDroid/src/main/java/com/ichi2/libanki/Note.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/libanki/Note.kt
@@ -20,11 +20,11 @@ package com.ichi2.libanki
 import androidx.annotation.CheckResult
 import androidx.annotation.VisibleForTesting
 import anki.notes.NoteFieldsCheckResponse
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.libanki.Consts.DEFAULT_DECK_ID
 import com.ichi2.libanki.backend.model.toBackendNote
 import com.ichi2.libanki.utils.LibAnkiAlias
 import com.ichi2.libanki.utils.NotInLibAnki
-import com.ichi2.utils.KotlinCleanup
 import com.ichi2.utils.emptyStringArray
 import java.util.regex.Pattern
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/preferences/IncrementerNumberRangePreference.kt b/AnkiDroid/src/main/java/com/ichi2/preferences/IncrementerNumberRangePreference.kt
index d9b9e51e2c52..a95f8ead199d 100644
--- a/AnkiDroid/src/main/java/com/ichi2/preferences/IncrementerNumberRangePreference.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/preferences/IncrementerNumberRangePreference.kt
@@ -24,7 +24,7 @@ import android.view.ViewGroup
 import android.widget.Button
 import android.widget.LinearLayout
 import com.ichi2.anki.R
-import com.ichi2.utils.KotlinCleanup
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 
 // TODO Tracked in https://github.com/ankidroid/Anki-Android/issues/5019 : use IncrementerNumberRangePreferenceCompat
 @Suppress("deprecation", "OVERRIDE_DEPRECATION")
diff --git a/AnkiDroid/src/main/java/com/ichi2/ui/AppCompatPreferenceActivity.kt b/AnkiDroid/src/main/java/com/ichi2/ui/AppCompatPreferenceActivity.kt
index 00666ba59d2b..3b4e360cbb87 100644
--- a/AnkiDroid/src/main/java/com/ichi2/ui/AppCompatPreferenceActivity.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/ui/AppCompatPreferenceActivity.kt
@@ -41,12 +41,12 @@ import androidx.appcompat.widget.Toolbar
 import androidx.core.content.ContextCompat
 import com.ichi2.anki.CollectionManager
 import com.ichi2.anki.R
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.anki.receiver.SdCardReceiver
 import com.ichi2.compat.CompatHelper.Companion.registerReceiverCompat
 import com.ichi2.libanki.Collection
 import com.ichi2.libanki.Deck
 import com.ichi2.utils.HashUtil
-import com.ichi2.utils.KotlinCleanup
 import com.ichi2.utils.message
 import com.ichi2.utils.positiveButton
 import com.ichi2.utils.show
diff --git a/AnkiDroid/src/main/java/com/ichi2/ui/CheckBoxTriStates.kt b/AnkiDroid/src/main/java/com/ichi2/ui/CheckBoxTriStates.kt
index 6f3904518ceb..cb994c8033bc 100644
--- a/AnkiDroid/src/main/java/com/ichi2/ui/CheckBoxTriStates.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/ui/CheckBoxTriStates.kt
@@ -22,7 +22,7 @@ import android.util.AttributeSet
 import android.widget.CompoundButton.OnCheckedChangeListener
 import androidx.appcompat.widget.AppCompatCheckBox
 import com.ichi2.anki.R
-import com.ichi2.utils.KotlinCleanup
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 
 /**
  * Based on https://gist.github.com/kevin-barrientos/d75a5baa13a686367d45d17aaec7f030.
diff --git a/AnkiDroid/src/main/java/com/ichi2/utils/HashUtil.kt b/AnkiDroid/src/main/java/com/ichi2/utils/HashUtil.kt
index e26a56ee38f1..846cbd8b61f0 100644
--- a/AnkiDroid/src/main/java/com/ichi2/utils/HashUtil.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/utils/HashUtil.kt
@@ -15,6 +15,7 @@
  ****************************************************************************************/
 package com.ichi2.utils
 
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import java.util.HashMap
 import java.util.HashSet
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/utils/JSONArray.kt b/AnkiDroid/src/main/java/com/ichi2/utils/JSONArray.kt
index df2677024670..08b4c91f3486 100644
--- a/AnkiDroid/src/main/java/com/ichi2/utils/JSONArray.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/utils/JSONArray.kt
@@ -41,6 +41,7 @@
  */
 package com.ichi2.utils
 
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import org.json.JSONArray
 import org.json.JSONObject
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/utils/UniqueArrayList.kt b/AnkiDroid/src/main/java/com/ichi2/utils/UniqueArrayList.kt
index 3d0bcd22ca67..fbfc4f4769b2 100644
--- a/AnkiDroid/src/main/java/com/ichi2/utils/UniqueArrayList.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/utils/UniqueArrayList.kt
@@ -18,6 +18,7 @@
 
 package com.ichi2.utils
 
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import org.apache.commons.collections4.list.SetUniqueList
 import java.util.Arrays
 import java.util.Spliterator
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerTest.kt
index c635c8c9c135..5123c652575a 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerTest.kt
@@ -14,6 +14,7 @@ import androidx.core.content.pm.ShortcutManagerCompat
 import androidx.core.view.children
 import androidx.fragment.app.FragmentManager
 import androidx.test.core.app.ActivityScenario
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.anki.dialogs.DatabaseErrorDialog
 import com.ichi2.anki.dialogs.DatabaseErrorDialog.DatabaseErrorDialogType
 import com.ichi2.anki.dialogs.DeckPickerContextMenu
@@ -32,7 +33,6 @@ import com.ichi2.testutils.common.Flaky
 import com.ichi2.testutils.common.OS
 import com.ichi2.testutils.grantWritePermissions
 import com.ichi2.testutils.revokeWritePermissions
-import com.ichi2.utils.KotlinCleanup
 import com.ichi2.utils.ResourceLoader
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.containsInAnyOrder
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerTest.kt
index 0d1d4278a1a6..ea0837643a2a 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerTest.kt
@@ -33,6 +33,7 @@ import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.cardviewer.Gesture
 import com.ichi2.anki.cardviewer.ViewerCommand.FLIP_OR_ANSWER_EASE1
 import com.ichi2.anki.cardviewer.ViewerCommand.MARK
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.anki.model.CardStateFilter
 import com.ichi2.anki.preferences.PreferenceTestUtils
 import com.ichi2.anki.preferences.sharedPrefs
@@ -51,7 +52,6 @@ import com.ichi2.testutils.common.Flaky
 import com.ichi2.testutils.common.OS
 import com.ichi2.testutils.ext.addNote
 import com.ichi2.utils.BASIC_MODEL_NAME
-import com.ichi2.utils.KotlinCleanup
 import junit.framework.TestCase.assertEquals
 import junit.framework.TestCase.assertFalse
 import junit.framework.TestCase.assertTrue
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/analytics/AnalyticsConstantsTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/analytics/AnalyticsConstantsTest.kt
index df42e0036648..c619f69f48b1 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/analytics/AnalyticsConstantsTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/analytics/AnalyticsConstantsTest.kt
@@ -12,7 +12,7 @@
  */
 package com.ichi2.anki.analytics
 
-import com.ichi2.utils.KotlinCleanup
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
 import org.hamcrest.Matchers.not
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/ActionButtonStatusTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/ActionButtonStatusTest.kt
index 5c5ca1e2a90c..08cdb2a44a66 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/ActionButtonStatusTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/ActionButtonStatusTest.kt
@@ -18,8 +18,8 @@ package com.ichi2.anki.reviewer
 import android.content.SharedPreferences
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.anki.preferences.PreferenceTestUtils
-import com.ichi2.utils.KotlinCleanup
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.containsInAnyOrder
 import org.junit.Test
diff --git a/AnkiDroid/src/test/java/com/ichi2/libanki/ModelTest.kt b/AnkiDroid/src/test/java/com/ichi2/libanki/ModelTest.kt
index 559e230389b2..a70318e42a80 100644
--- a/AnkiDroid/src/test/java/com/ichi2/libanki/ModelTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/libanki/ModelTest.kt
@@ -16,11 +16,11 @@
 package com.ichi2.libanki
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.libanki.Utils.stripHTML
 import com.ichi2.libanki.exception.ConfirmModSchemaException
 import com.ichi2.testutils.JvmTest
 import com.ichi2.testutils.ext.addNote
-import com.ichi2.utils.KotlinCleanup
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.containsString
 import org.hamcrest.Matchers.endsWith
diff --git a/AnkiDroid/src/test/java/com/ichi2/libanki/SchedulerTest.kt b/AnkiDroid/src/test/java/com/ichi2/libanki/SchedulerTest.kt
index cb2f7311dd47..9f36f8cfec09 100644
--- a/AnkiDroid/src/test/java/com/ichi2/libanki/SchedulerTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/libanki/SchedulerTest.kt
@@ -18,6 +18,7 @@ package com.ichi2.libanki
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import anki.scheduler.UnburyDeckRequest
 import com.ichi2.anki.Ease
+import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.anki.utils.SECONDS_PER_DAY
 import com.ichi2.libanki.CardType.Relearning
 import com.ichi2.libanki.Consts.LEECH_SUSPEND
@@ -29,7 +30,6 @@ import com.ichi2.libanki.utils.TimeManager.time
 import com.ichi2.testutils.AnkiAssert
 import com.ichi2.testutils.JvmTest
 import com.ichi2.testutils.ext.addNote
-import com.ichi2.utils.KotlinCleanup
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert
 import org.hamcrest.Matchers
diff --git a/AnkiDroid/src/main/java/com/ichi2/utils/KotlinCleanup.kt b/common/src/main/java/com/ichi2/anki/common/utils/annotation/KotlinCleanup.kt
similarity index 96%
rename from AnkiDroid/src/main/java/com/ichi2/utils/KotlinCleanup.kt
rename to common/src/main/java/com/ichi2/anki/common/utils/annotation/KotlinCleanup.kt
index 9cc624ecb13f..29a789bab9ae 100644
--- a/AnkiDroid/src/main/java/com/ichi2/utils/KotlinCleanup.kt
+++ b/common/src/main/java/com/ichi2/anki/common/utils/annotation/KotlinCleanup.kt
@@ -18,7 +18,7 @@
         "@RunWith(AndroidJUnit4::class) to speed up tests (if no other Android references)",
 )
 
-package com.ichi2.utils
+package com.ichi2.anki.common.utils.annotation
 
 /** Use when code can be changed after further conversion to Kotlin */
 @Target(

From 5dcb3844d1f330730e7902f6bc703e47f791de08 Mon Sep 17 00:00:00 2001
From: Ashish Yadav <48384865+criticalAY@users.noreply.github.com>
Date: Tue, 1 Apr 2025 00:54:59 +0530
Subject: [PATCH 158/200] refactor: move JSON array and JSON object to common
 module

---
 AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidJsAPI.kt       | 2 +-
 AnkiDroid/src/main/java/com/ichi2/anki/FilteredDeckOptions.kt  | 2 +-
 AnkiDroid/src/main/java/com/ichi2/anki/utils/ext/NoteType.kt   | 2 +-
 AnkiDroid/src/main/java/com/ichi2/libanki/CardTemplate.kt      | 1 +
 AnkiDroid/src/main/java/com/ichi2/libanki/Decks.kt             | 2 +-
 AnkiDroid/src/main/java/com/ichi2/libanki/NotetypeJson.kt      | 2 +-
 .../src/main/java/com/ichi2/libanki/utils/PythonExtensions.kt  | 2 +-
 .../src/main/java/com/ichi2/preferences/StepsPreference.kt     | 2 +-
 AnkiDroid/src/main/java/com/ichi2/utils/JSONContainer.kt       | 1 +
 .../src/test/java/com/ichi2/libanki/PythonExtensionsTest.kt    | 2 +-
 .../main/java/com/ichi2/anki/common/utils/ext}/JSONArray.kt    | 3 ++-
 .../main/java/com/ichi2/anki/common/utils/ext}/JSONObject.kt   | 1 +
 12 files changed, 13 insertions(+), 9 deletions(-)
 rename {AnkiDroid/src/main/java/com/ichi2/utils => common/src/main/java/com/ichi2/anki/common/utils/ext}/JSONArray.kt (98%)
 rename {AnkiDroid/src/main/java/com/ichi2/utils => common/src/main/java/com/ichi2/anki/common/utils/ext}/JSONObject.kt (98%)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidJsAPI.kt b/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidJsAPI.kt
index 16a4c4ab201f..cef4a6b0435d 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidJsAPI.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidJsAPI.kt
@@ -36,6 +36,7 @@ import com.ichi2.anki.AnkiDroidJsAPIConstants.ANKI_JS_ERROR_CODE_SUSPEND_NOTE
 import com.ichi2.anki.AnkiDroidJsAPIConstants.flagCommands
 import com.ichi2.anki.CollectionManager.withCol
 import com.ichi2.anki.cardviewer.ViewerCommand
+import com.ichi2.anki.common.utils.ext.stringIterable
 import com.ichi2.anki.model.CardsOrNotes
 import com.ichi2.anki.servicelayer.rescheduleCards
 import com.ichi2.anki.servicelayer.resetCards
@@ -48,7 +49,6 @@ import com.ichi2.libanki.Decks
 import com.ichi2.libanki.Note
 import com.ichi2.libanki.SortOrder
 import com.ichi2.utils.NetworkUtils
-import com.ichi2.utils.stringIterable
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/FilteredDeckOptions.kt b/AnkiDroid/src/main/java/com/ichi2/anki/FilteredDeckOptions.kt
index 72ddd31dbdf4..4669b155e79b 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/FilteredDeckOptions.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/FilteredDeckOptions.kt
@@ -28,13 +28,13 @@ import android.preference.Preference
 import android.preference.PreferenceCategory
 import androidx.core.content.edit
 import com.ichi2.anki.analytics.UsageAnalytics
+import com.ichi2.anki.common.utils.ext.stringIterable
 import com.ichi2.annotations.NeedsTest
 import com.ichi2.libanki.Collection
 import com.ichi2.preferences.StepsPreference.Companion.convertFromJSON
 import com.ichi2.preferences.StepsPreference.Companion.convertToJSON
 import com.ichi2.themes.Themes
 import com.ichi2.ui.AppCompatPreferenceActivity
-import com.ichi2.utils.stringIterable
 import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/utils/ext/NoteType.kt b/AnkiDroid/src/main/java/com/ichi2/anki/utils/ext/NoteType.kt
index da8277a977c8..06e501fac2d6 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/utils/ext/NoteType.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/utils/ext/NoteType.kt
@@ -17,9 +17,9 @@
 package com.ichi2.anki.utils.ext
 
 import anki.notetypes.StockNotetype.OriginalStockKind.ORIGINAL_STOCK_KIND_IMAGE_OCCLUSION_VALUE
+import com.ichi2.anki.common.utils.ext.jsonObjectIterable
 import com.ichi2.anki.utils.CardTemplateJson
 import com.ichi2.libanki.NotetypeJson
-import com.ichi2.utils.jsonObjectIterable
 import org.json.JSONException
 
 /**
diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/CardTemplate.kt b/AnkiDroid/src/main/java/com/ichi2/libanki/CardTemplate.kt
index 10551b66d071..7fbdbe6a0dc4 100644
--- a/AnkiDroid/src/main/java/com/ichi2/libanki/CardTemplate.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/libanki/CardTemplate.kt
@@ -16,6 +16,7 @@
 
 package com.ichi2.libanki
 
+import com.ichi2.anki.common.utils.ext.deepClone
 import com.ichi2.utils.JSONObjectHolder
 import com.ichi2.utils.deepClone
 import net.ankiweb.rsdroid.RustCleanup
diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/Decks.kt b/AnkiDroid/src/main/java/com/ichi2/libanki/Decks.kt
index 6d5e9a73ea73..00d28a323000 100644
--- a/AnkiDroid/src/main/java/com/ichi2/libanki/Decks.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/libanki/Decks.kt
@@ -36,6 +36,7 @@ import anki.decks.DeckTreeNode
 import anki.decks.FilteredDeckForUpdate
 import anki.decks.SetDeckCollapsedRequest
 import anki.decks.copy
+import com.ichi2.anki.common.utils.ext.jsonObjectIterable
 import com.ichi2.annotations.NeedsTest
 import com.ichi2.libanki.backend.BackendUtils
 import com.ichi2.libanki.backend.BackendUtils.toJsonBytes
@@ -43,7 +44,6 @@ import com.ichi2.libanki.utils.LibAnkiAlias
 import com.ichi2.libanki.utils.NotInLibAnki
 import com.ichi2.libanki.utils.append
 import com.ichi2.libanki.utils.len
-import com.ichi2.utils.jsonObjectIterable
 import net.ankiweb.rsdroid.RustCleanup
 import net.ankiweb.rsdroid.exceptions.BackendDeckIsFilteredException
 import net.ankiweb.rsdroid.exceptions.BackendNotFoundException
diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/NotetypeJson.kt b/AnkiDroid/src/main/java/com/ichi2/libanki/NotetypeJson.kt
index f492e4332348..02d7c6394859 100644
--- a/AnkiDroid/src/main/java/com/ichi2/libanki/NotetypeJson.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/libanki/NotetypeJson.kt
@@ -17,8 +17,8 @@
 package com.ichi2.libanki
 
 import androidx.annotation.CheckResult
+import com.ichi2.anki.common.utils.ext.toStringList
 import com.ichi2.utils.deepClonedInto
-import com.ichi2.utils.toStringList
 import org.intellij.lang.annotations.Language
 import org.json.JSONArray
 import org.json.JSONObject
diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/utils/PythonExtensions.kt b/AnkiDroid/src/main/java/com/ichi2/libanki/utils/PythonExtensions.kt
index e656b1d47d6d..38799f141212 100644
--- a/AnkiDroid/src/main/java/com/ichi2/libanki/utils/PythonExtensions.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/libanki/utils/PythonExtensions.kt
@@ -16,7 +16,7 @@
 
 package com.ichi2.libanki.utils
 
-import com.ichi2.utils.jsonObjectIterable
+import com.ichi2.anki.common.utils.ext.jsonObjectIterable
 import org.json.JSONArray
 import org.json.JSONObject
 import java.util.Optional
diff --git a/AnkiDroid/src/main/java/com/ichi2/preferences/StepsPreference.kt b/AnkiDroid/src/main/java/com/ichi2/preferences/StepsPreference.kt
index 091566e65865..0ca9fd333b4d 100644
--- a/AnkiDroid/src/main/java/com/ichi2/preferences/StepsPreference.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/preferences/StepsPreference.kt
@@ -22,8 +22,8 @@ import android.util.AttributeSet
 import android.view.View
 import com.ichi2.anki.AnkiDroidApp
 import com.ichi2.anki.R
+import com.ichi2.anki.common.utils.ext.stringIterable
 import com.ichi2.anki.showThemedToast
-import com.ichi2.utils.stringIterable
 import org.json.JSONArray
 import org.json.JSONException
 import timber.log.Timber
diff --git a/AnkiDroid/src/main/java/com/ichi2/utils/JSONContainer.kt b/AnkiDroid/src/main/java/com/ichi2/utils/JSONContainer.kt
index 540711eb02a4..894aac999b57 100644
--- a/AnkiDroid/src/main/java/com/ichi2/utils/JSONContainer.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/utils/JSONContainer.kt
@@ -17,6 +17,7 @@
 package com.ichi2.utils
 
 import androidx.annotation.VisibleForTesting
+import com.ichi2.anki.common.utils.ext.jsonObjectIterator
 import com.ichi2.libanki.utils.NotInLibAnki
 import com.ichi2.libanki.utils.append
 import com.ichi2.libanki.utils.index
diff --git a/AnkiDroid/src/test/java/com/ichi2/libanki/PythonExtensionsTest.kt b/AnkiDroid/src/test/java/com/ichi2/libanki/PythonExtensionsTest.kt
index 9e44595be396..21bc706c81a7 100644
--- a/AnkiDroid/src/test/java/com/ichi2/libanki/PythonExtensionsTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/libanki/PythonExtensionsTest.kt
@@ -17,8 +17,8 @@
 package com.ichi2.libanki
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.common.utils.ext.jsonObjectIterable
 import com.ichi2.libanki.utils.insert
-import com.ichi2.utils.jsonObjectIterable
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.collection.IsIterableContainingInOrder.contains
diff --git a/AnkiDroid/src/main/java/com/ichi2/utils/JSONArray.kt b/common/src/main/java/com/ichi2/anki/common/utils/ext/JSONArray.kt
similarity index 98%
rename from AnkiDroid/src/main/java/com/ichi2/utils/JSONArray.kt
rename to common/src/main/java/com/ichi2/anki/common/utils/ext/JSONArray.kt
index 08b4c91f3486..7581389ccc89 100644
--- a/AnkiDroid/src/main/java/com/ichi2/utils/JSONArray.kt
+++ b/common/src/main/java/com/ichi2/anki/common/utils/ext/JSONArray.kt
@@ -39,9 +39,10 @@
  *    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  *    SOFTWARE.
  */
-package com.ichi2.utils
+package com.ichi2.anki.common.utils.ext
 
 import com.ichi2.anki.common.utils.annotation.KotlinCleanup
+import com.ichi2.utils.deepClone
 import org.json.JSONArray
 import org.json.JSONObject
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/utils/JSONObject.kt b/common/src/main/java/com/ichi2/anki/common/utils/ext/JSONObject.kt
similarity index 98%
rename from AnkiDroid/src/main/java/com/ichi2/utils/JSONObject.kt
rename to common/src/main/java/com/ichi2/anki/common/utils/ext/JSONObject.kt
index 96bfb8d44a67..47ce1f67c4bf 100644
--- a/AnkiDroid/src/main/java/com/ichi2/utils/JSONObject.kt
+++ b/common/src/main/java/com/ichi2/anki/common/utils/ext/JSONObject.kt
@@ -43,6 +43,7 @@ package com.ichi2.utils
 
 import androidx.annotation.CheckResult
 import androidx.annotation.VisibleForTesting
+import com.ichi2.anki.common.utils.ext.deepClone
 import org.json.JSONArray
 import org.json.JSONObject
 

From a0312d285731e3d532807f27baecd5411500e5a6 Mon Sep 17 00:00:00 2001
From: Mike Hardy <github@mikehardy.net>
Date: Wed, 2 Apr 2025 07:02:04 -0500
Subject: [PATCH 159/200] Dependency Updates 20250402

---
 gradle/libs.versions.toml       |   6 +-
 tools/localization/package.json |   8 +-
 tools/localization/yarn.lock    | 139 +++++++++++++++++---------------
 3 files changed, 82 insertions(+), 71 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f0da7fea1bcf..63cc5d871eff 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -40,7 +40,7 @@ androidxFragmentKtx = "1.8.6"
 # https://developer.android.com/jetpack/androidx/releases/media
 androidxMedia = "1.7.0"
 # https://developer.android.com/jetpack/androidx/releases/media3
-androidxMedia3 = "1.5.1"
+androidxMedia3 = "1.6.0"
 # https://developer.android.com/jetpack/androidx/releases/preference
 androidxPreferenceKtx = "1.2.1"
 # https://developer.android.com/jetpack/androidx/releases/recyclerview
@@ -85,7 +85,7 @@ junitJupiter = "5.12.1"
 junitPlatformLauncher = "1.12.1"
 # https://github.com/JetBrains/kotlin/releases/
 kotlin = '2.1.20'
-kotlinxSerializationJson = "1.8.0"
+kotlinxSerializationJson = "1.8.1"
 ktlintGradlePlugin = "12.2.0"
 leakcanaryAndroid = "2.14"
 lint = '31.9.1'
@@ -97,7 +97,7 @@ mockk = "1.13.17"
 nanohttpd = "2.3.1"
 okhttp = "4.12.0"
 # https://github.com/protocolbuffers/protobuf/releases
-protobufKotlinLite = "4.30.1"
+protobufKotlinLite = "4.30.2"
 # ../AnkiDroid/robolectricDownload.gradle may need changes - read instructions in that file
 robolectric = "4.14.1"
 searchpreference = "2.7.2"
diff --git a/tools/localization/package.json b/tools/localization/package.json
index f223cfdee0cd..01845ea5f5ab 100644
--- a/tools/localization/package.json
+++ b/tools/localization/package.json
@@ -27,14 +27,14 @@
         "@eslint/eslintrc": "^3.3.1",
         "@eslint/js": "^9.23.0",
         "@types/jest": "^29.5.14",
-        "@types/node": "^22.13.13",
-        "@typescript-eslint/eslint-plugin": "^8.27.0",
-        "@typescript-eslint/parser": "^8.27.0",
+        "@types/node": "^22.13.14",
+        "@typescript-eslint/eslint-plugin": "^8.28.0",
+        "@typescript-eslint/parser": "^8.28.0",
         "eslint": "^9.23.0",
         "eslint-config-prettier": "^10.1.1",
         "eslint-config-standard": "^17.1.0",
         "eslint-plugin-import": "^2.31.0",
-        "eslint-plugin-n": "^17.16.2",
+        "eslint-plugin-n": "^17.17.0",
         "eslint-plugin-promise": "^7.2.1",
         "globals": "^16.0.0",
         "jest": "^29.7.0",
diff --git a/tools/localization/yarn.lock b/tools/localization/yarn.lock
index 934d34412e87..eb15fd7b9fbf 100644
--- a/tools/localization/yarn.lock
+++ b/tools/localization/yarn.lock
@@ -402,7 +402,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint-community/eslint-utils@npm:^4.1.2, @eslint-community/eslint-utils@npm:^4.2.0, @eslint-community/eslint-utils@npm:^4.4.0, @eslint-community/eslint-utils@npm:^4.4.1":
+"@eslint-community/eslint-utils@npm:^4.1.2, @eslint-community/eslint-utils@npm:^4.2.0, @eslint-community/eslint-utils@npm:^4.4.0":
   version: 4.4.1
   resolution: "@eslint-community/eslint-utils@npm:4.4.1"
   dependencies:
@@ -413,6 +413,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@eslint-community/eslint-utils@npm:^4.5.0":
+  version: 4.5.1
+  resolution: "@eslint-community/eslint-utils@npm:4.5.1"
+  dependencies:
+    eslint-visitor-keys: "npm:^3.4.3"
+  peerDependencies:
+    eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
+  checksum: 10c0/b520ae1b7bd04531a5c5da2021071815df4717a9f7d13720e3a5ddccf5c9c619532039830811fcbae1c2f1c9d133e63af2435ee69e0fc0fabbd6d928c6800fb2
+  languageName: node
+  linkType: hard
+
 "@eslint-community/regexpp@npm:^4.10.0, @eslint-community/regexpp@npm:^4.11.0, @eslint-community/regexpp@npm:^4.12.1":
   version: 4.12.1
   resolution: "@eslint-community/regexpp@npm:4.12.1"
@@ -1073,12 +1084,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:^22.13.13":
-  version: 22.13.13
-  resolution: "@types/node@npm:22.13.13"
+"@types/node@npm:^22.13.14":
+  version: 22.13.14
+  resolution: "@types/node@npm:22.13.14"
   dependencies:
     undici-types: "npm:~6.20.0"
-  checksum: 10c0/daf792ba5dcff1316abf4b33680f94b792f8d54d6ae495efc8929531e0ba1284a248d29aab117d2259f9280284d986ad5799b193b0516e2b926d713aab835f7d
+  checksum: 10c0/fa2ab5b8277bfbcc86c42e46a3ea9871b0d559894cc9d955685d17178c9499f0b1bf03d1d1ea8d92ef2dda818988f4035acb8abf9dc15423a998fa56173ab804
   languageName: node
   linkType: hard
 
@@ -1114,15 +1125,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/eslint-plugin@npm:^8.27.0":
-  version: 8.27.0
-  resolution: "@typescript-eslint/eslint-plugin@npm:8.27.0"
+"@typescript-eslint/eslint-plugin@npm:^8.28.0":
+  version: 8.28.0
+  resolution: "@typescript-eslint/eslint-plugin@npm:8.28.0"
   dependencies:
     "@eslint-community/regexpp": "npm:^4.10.0"
-    "@typescript-eslint/scope-manager": "npm:8.27.0"
-    "@typescript-eslint/type-utils": "npm:8.27.0"
-    "@typescript-eslint/utils": "npm:8.27.0"
-    "@typescript-eslint/visitor-keys": "npm:8.27.0"
+    "@typescript-eslint/scope-manager": "npm:8.28.0"
+    "@typescript-eslint/type-utils": "npm:8.28.0"
+    "@typescript-eslint/utils": "npm:8.28.0"
+    "@typescript-eslint/visitor-keys": "npm:8.28.0"
     graphemer: "npm:^1.4.0"
     ignore: "npm:^5.3.1"
     natural-compare: "npm:^1.4.0"
@@ -1131,64 +1142,64 @@ __metadata:
     "@typescript-eslint/parser": ^8.0.0 || ^8.0.0-alpha.0
     eslint: ^8.57.0 || ^9.0.0
     typescript: ">=4.8.4 <5.9.0"
-  checksum: 10c0/95bbab011bfe51ca657ff346e4c6cac25652c88e5188a5e74d14372dba45c3d7aa713f4c90f80ebc885d77a8be89e131e8b77c096145c90da6c251a475b125fc
+  checksum: 10c0/f01b7d231b01ec2c1cc7c40599ddceb329532f2876664a39dec9d25c0aed4cfdbef3ec07f26bac357df000d798f652af6fdb6a2481b6120e43bfa38f7c7a7c48
   languageName: node
   linkType: hard
 
-"@typescript-eslint/parser@npm:^8.27.0":
-  version: 8.27.0
-  resolution: "@typescript-eslint/parser@npm:8.27.0"
+"@typescript-eslint/parser@npm:^8.28.0":
+  version: 8.28.0
+  resolution: "@typescript-eslint/parser@npm:8.28.0"
   dependencies:
-    "@typescript-eslint/scope-manager": "npm:8.27.0"
-    "@typescript-eslint/types": "npm:8.27.0"
-    "@typescript-eslint/typescript-estree": "npm:8.27.0"
-    "@typescript-eslint/visitor-keys": "npm:8.27.0"
+    "@typescript-eslint/scope-manager": "npm:8.28.0"
+    "@typescript-eslint/types": "npm:8.28.0"
+    "@typescript-eslint/typescript-estree": "npm:8.28.0"
+    "@typescript-eslint/visitor-keys": "npm:8.28.0"
     debug: "npm:^4.3.4"
   peerDependencies:
     eslint: ^8.57.0 || ^9.0.0
     typescript: ">=4.8.4 <5.9.0"
-  checksum: 10c0/2ada98167ca5a474544fada7658d7c8d54ea4dfdd692e3d30d18b5531e50d7308a5b09d23dca651f9fe841f96075ccd18643431f4b61d0e4e7e7ccde888258e8
+  checksum: 10c0/4bde6887bbf3fe031c01e46db90f9f384a8cac2e67c2972b113a62d607db75e01db943601279aac847b9187960a038981814042cb02fd5aa27ea4613028f9313
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:8.27.0":
-  version: 8.27.0
-  resolution: "@typescript-eslint/scope-manager@npm:8.27.0"
+"@typescript-eslint/scope-manager@npm:8.28.0":
+  version: 8.28.0
+  resolution: "@typescript-eslint/scope-manager@npm:8.28.0"
   dependencies:
-    "@typescript-eslint/types": "npm:8.27.0"
-    "@typescript-eslint/visitor-keys": "npm:8.27.0"
-  checksum: 10c0/d87daeffb81f4e70f168c38f01c667713bda71c4545e28fcdf0792378fb3df171894ef77854c5c1a5e5a22c784ee1ccea2dd856b5baf825840710a6a74c14ac9
+    "@typescript-eslint/types": "npm:8.28.0"
+    "@typescript-eslint/visitor-keys": "npm:8.28.0"
+  checksum: 10c0/f3bd76b3f54e60f1efe108b233b2d818e44ecf0dc6422cc296542f784826caf3c66d51b8acc83d8c354980bd201e1d9aa1ea01011de96e0613d320c00e40ccfd
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:8.27.0":
-  version: 8.27.0
-  resolution: "@typescript-eslint/type-utils@npm:8.27.0"
+"@typescript-eslint/type-utils@npm:8.28.0":
+  version: 8.28.0
+  resolution: "@typescript-eslint/type-utils@npm:8.28.0"
   dependencies:
-    "@typescript-eslint/typescript-estree": "npm:8.27.0"
-    "@typescript-eslint/utils": "npm:8.27.0"
+    "@typescript-eslint/typescript-estree": "npm:8.28.0"
+    "@typescript-eslint/utils": "npm:8.28.0"
     debug: "npm:^4.3.4"
     ts-api-utils: "npm:^2.0.1"
   peerDependencies:
     eslint: ^8.57.0 || ^9.0.0
     typescript: ">=4.8.4 <5.9.0"
-  checksum: 10c0/f38cdc660ebcb3b71496182b9ea52301ab08a4f062558aa7061a5f0b759ae3e8f68ae250a29e74251cb52c6c56733d7dabed7002b993544cbe0933bb75d67a57
+  checksum: 10c0/b8936edc2153bf794efba39bfb06393a228217830051767360f4b691fed7c82f3831c4fc6deac6d78b90a58596e61f866c17eaee9dd793c3efda3ebdcf5a71d8
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:8.27.0":
-  version: 8.27.0
-  resolution: "@typescript-eslint/types@npm:8.27.0"
-  checksum: 10c0/9c5f2ba816a9baea5982feeadebe4d19f4df77ddb025a7b2307f9e1e6914076b63cbad81f7f915814e64b4d915052cf27bd79ce3e5a831340cb5ab244133941b
+"@typescript-eslint/types@npm:8.28.0":
+  version: 8.28.0
+  resolution: "@typescript-eslint/types@npm:8.28.0"
+  checksum: 10c0/1f95895e20dac1cf063dc93c99142fd1871e53be816bcbbee93f22a05e6b2a82ca83c20ce3a551f65555910aa0956443a23268edbb004369d0d5cb282d13c377
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:8.27.0":
-  version: 8.27.0
-  resolution: "@typescript-eslint/typescript-estree@npm:8.27.0"
+"@typescript-eslint/typescript-estree@npm:8.28.0":
+  version: 8.28.0
+  resolution: "@typescript-eslint/typescript-estree@npm:8.28.0"
   dependencies:
-    "@typescript-eslint/types": "npm:8.27.0"
-    "@typescript-eslint/visitor-keys": "npm:8.27.0"
+    "@typescript-eslint/types": "npm:8.28.0"
+    "@typescript-eslint/visitor-keys": "npm:8.28.0"
     debug: "npm:^4.3.4"
     fast-glob: "npm:^3.3.2"
     is-glob: "npm:^4.0.3"
@@ -1197,32 +1208,32 @@ __metadata:
     ts-api-utils: "npm:^2.0.1"
   peerDependencies:
     typescript: ">=4.8.4 <5.9.0"
-  checksum: 10c0/c04d602825ff2a7b2a89746a68b32f7052fb4ce3d2355d1f4e6f43fd064f17c3b44fb974c98838a078fdebdc35152d2ab0af34663dfca99db7a790bd3fc5d8ac
+  checksum: 10c0/97a91c95b1295926098c12e2d2c2abaa68994dc879da132dcce1e75ec9d7dee8187695eaa5241d09cbc42b5e633917b6d35c624e78e3d3ee9bda42d1318080b6
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:8.27.0":
-  version: 8.27.0
-  resolution: "@typescript-eslint/utils@npm:8.27.0"
+"@typescript-eslint/utils@npm:8.28.0":
+  version: 8.28.0
+  resolution: "@typescript-eslint/utils@npm:8.28.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.4.0"
-    "@typescript-eslint/scope-manager": "npm:8.27.0"
-    "@typescript-eslint/types": "npm:8.27.0"
-    "@typescript-eslint/typescript-estree": "npm:8.27.0"
+    "@typescript-eslint/scope-manager": "npm:8.28.0"
+    "@typescript-eslint/types": "npm:8.28.0"
+    "@typescript-eslint/typescript-estree": "npm:8.28.0"
   peerDependencies:
     eslint: ^8.57.0 || ^9.0.0
     typescript: ">=4.8.4 <5.9.0"
-  checksum: 10c0/dcfd5f2c17f1a33061e3ec70d0946ff23a4238aabacae3d85087165beccedf84fb8506d30848f2470e3b60ab98b230aef79c6e8b4c5d39648a37ac559ac5b1e0
+  checksum: 10c0/d3425be7f86c1245a11f0ea39136af681027797417348d8e666d38c76646945eaed7b35eb8db66372b067dee8b02a855caf2c24c040ec9c31e59681ab223b59d
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:8.27.0":
-  version: 8.27.0
-  resolution: "@typescript-eslint/visitor-keys@npm:8.27.0"
+"@typescript-eslint/visitor-keys@npm:8.28.0":
+  version: 8.28.0
+  resolution: "@typescript-eslint/visitor-keys@npm:8.28.0"
   dependencies:
-    "@typescript-eslint/types": "npm:8.27.0"
+    "@typescript-eslint/types": "npm:8.28.0"
     eslint-visitor-keys: "npm:^4.2.0"
-  checksum: 10c0/d86fd4032db07123816aab3a6b8b53f840387385ab2a4d8f96b22fc76b5438fb27ac8dc42b63caf23f3d265c33e9075dbf1ce8d31f939df12f5cd077d3b10295
+  checksum: 10c0/245a78ed983fe95fbd1b0f2d4cb9e9d1d964bddc0aa3e3d6ab10c19c4273855bfb27d840bb1fd55deb7ae3078b52f26592472baf6fd2c7019a5aa3b1da974f35
   languageName: node
   linkType: hard
 
@@ -1299,16 +1310,16 @@ __metadata:
     "@eslint/eslintrc": "npm:^3.3.1"
     "@eslint/js": "npm:^9.23.0"
     "@types/jest": "npm:^29.5.14"
-    "@types/node": "npm:^22.13.13"
-    "@typescript-eslint/eslint-plugin": "npm:^8.27.0"
-    "@typescript-eslint/parser": "npm:^8.27.0"
+    "@types/node": "npm:^22.13.14"
+    "@typescript-eslint/eslint-plugin": "npm:^8.28.0"
+    "@typescript-eslint/parser": "npm:^8.28.0"
     axios: "npm:^1.8.4"
     dotenv: "npm:^16.4.7"
     eslint: "npm:^9.23.0"
     eslint-config-prettier: "npm:^10.1.1"
     eslint-config-standard: "npm:^17.1.0"
     eslint-plugin-import: "npm:^2.31.0"
-    eslint-plugin-n: "npm:^17.16.2"
+    eslint-plugin-n: "npm:^17.17.0"
     eslint-plugin-promise: "npm:^7.2.1"
     extract-zip: "npm:^2.0.1"
     globals: "npm:^16.0.0"
@@ -2349,11 +2360,11 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-n@npm:^17.16.2":
-  version: 17.16.2
-  resolution: "eslint-plugin-n@npm:17.16.2"
+"eslint-plugin-n@npm:^17.17.0":
+  version: 17.17.0
+  resolution: "eslint-plugin-n@npm:17.17.0"
   dependencies:
-    "@eslint-community/eslint-utils": "npm:^4.4.1"
+    "@eslint-community/eslint-utils": "npm:^4.5.0"
     enhanced-resolve: "npm:^5.17.1"
     eslint-plugin-es-x: "npm:^7.8.0"
     get-tsconfig: "npm:^4.8.1"
@@ -2363,7 +2374,7 @@ __metadata:
     semver: "npm:^7.6.3"
   peerDependencies:
     eslint: ">=8.23.0"
-  checksum: 10c0/25a77159b363814384b141d6f74b2c2e5787c58756c936f5547c01cb0e3b28f7ca4f32d77fe4214af6f1359dd35693380921395cdfc14c72595d89117ab92e9a
+  checksum: 10c0/ac6b2e2bbdc8f49a84be1bf1add8a412093a56fe95e8820610ecd5185fa00a348197a06fe3fe36080c09dc5d5a8f0f4f543cb3cf193265ace3fd071a79a07e88
   languageName: node
   linkType: hard
 

From 5e3455043a93d06d4b9c69c7615aabdbaf2ce9e4 Mon Sep 17 00:00:00 2001
From: AnkiDroid Translations <ankidroid@ankidroid.org>
Date: Wed, 2 Apr 2025 11:51:18 +0000
Subject: [PATCH 160/200] Updated strings from Crowdin

---
 AnkiDroid/src/main/res/values-cs/01-core.xml  |  2 +-
 .../src/main/res/values-eo/02-strings.xml     | 20 ++++++-------
 .../src/main/res/values-eo/03-dialogs.xml     | 10 +++----
 .../src/main/res/values-eo/07-cardbrowser.xml | 14 ++++-----
 .../src/main/res/values-eo/10-preferences.xml | 12 ++++----
 .../main/res/values-eo/17-model-manager.xml   |  4 +--
 AnkiDroid/src/main/res/values-gu/01-core.xml  |  2 +-
 .../src/main/res/values-gu/02-strings.xml     | 26 ++++++++--------
 .../src/main/res/values-gu/06-statistics.xml  |  2 +-
 .../src/main/res/values-ja/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-pl/01-core.xml  |  2 +-
 .../src/main/res/values-pl/02-strings.xml     |  2 +-
 .../src/main/res/values-pl/03-dialogs.xml     | 30 +++++++++----------
 .../src/main/res/values-pl/06-statistics.xml  |  2 +-
 .../src/main/res/values-pl/07-cardbrowser.xml | 16 +++++-----
 .../src/main/res/values-pl/08-widget.xml      | 24 +++++++--------
 .../src/main/res/values-pl/10-preferences.xml | 28 ++++++++---------
 .../src/main/res/values-pl/11-arrays.xml      |  4 +--
 .../res/values-pl/16-multimedia-editor.xml    |  2 +-
 .../main/res/values-pl/17-model-manager.xml   |  4 +--
 .../src/main/res/values-pt-rPT/03-dialogs.xml |  4 +--
 .../src/main/res/values-tr/03-dialogs.xml     |  4 +--
 .../src/main/res/values-ug/02-strings.xml     | 18 +++++------
 .../src/main/res/values-ug/03-dialogs.xml     | 10 +++----
 .../src/main/res/values-ug/07-cardbrowser.xml |  2 +-
 .../src/main/res/values-ug/10-preferences.xml |  3 +-
 .../main/res/values-ug/17-model-manager.xml   |  4 +--
 .../src/main/res/values-zh-rCN/03-dialogs.xml |  4 +--
 .../marketdescription-pl.txt                  |  2 +-
 29 files changed, 130 insertions(+), 129 deletions(-)

diff --git a/AnkiDroid/src/main/res/values-cs/01-core.xml b/AnkiDroid/src/main/res/values-cs/01-core.xml
index d83a83f21c90..1218cd742beb 100644
--- a/AnkiDroid/src/main/res/values-cs/01-core.xml
+++ b/AnkiDroid/src/main/res/values-cs/01-core.xml
@@ -209,5 +209,5 @@
     <string name="image_occlusion">Okluze obrázku</string>
     <string name="remove_account" comment="open a website to start the deletion of an AnkiWeb account">Odebrat účet</string>
     <!-- Instant Note Editor -->
-    <string name="instant_card" comment="This does not need to be translated literally, translate the concept of quickly adding a Cloze note with a popup. Used in the Android system context menu/share dialog.">Instant card</string>
+    <string name="instant_card" comment="This does not need to be translated literally, translate the concept of quickly adding a Cloze note with a popup. Used in the Android system context menu/share dialog.">Okamžitá karta</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-eo/02-strings.xml b/AnkiDroid/src/main/res/values-eo/02-strings.xml
index 0a3d7257afe3..740d881ae8ce 100644
--- a/AnkiDroid/src/main/res/values-eo/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-eo/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Fono</string>
     <string name="choose_an_image" maxLength="41">Elekti bildon</string>
-    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Forigi fonon</string>
     <string name="remove_background_image">Ĉu forigi fonon?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restarigi implicitajn</string>
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">La bildo estas tro granda, enmetu la bildon permane</string>
     <string name="note_editor_video_too_large">La filmeto estas tro granda enmetu la filmeton permane</string>
     <string name="note_editor_audio_too_large">La sonaĵo estas tro granda, enmetu la sonaĵon permane</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Restarigado de Android-sekurkopio. Reprovu</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">Uzu iManager por permesi al AnkiDroid krei fenestraĵojn</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Via aplikaĵlanĉilo ne permesas al AnkiDroid krei fenestraĵojn</string>
     <string name="create_shortcut_error">Eraro dum krei fenestraĵon: %s</string>
@@ -249,7 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Elŝuti kartaron</string>
-    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Malfermi en retfoliumilo</string>
     <string name="try_again">Reprovi</string>
     <string name="cancel_download">Rezigni elŝuton</string>
     <string name="cancel_download_question_title">Ĉu rezigni elŝuton?</string>
@@ -303,17 +303,17 @@
     <string name="show_notes" comment="Label for toggle notes button in BrowserOptionsDialog">Notoj</string>
     <string name="toggle_cards_notes">Baskuli kartojn/notojn</string>
     <string name="truncate_content_help">Senpintigi alton de ĉiu vico de la foliumilo por montri nur 3 unuajn liniojn de enhavo</string>
-    <string name="browser_options_dialog_heading">Browser options</string>
+    <string name="browser_options_dialog_heading">Agordoj pri foliumilo</string>
     <string name="audio_saved">Sonaĵo konservita</string>
     <string name="deleting_selected_notes">Forigado de elektitaj notoj</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Frapetu voĉon por aŭskulti ĝin</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voĉo devas esti instalita antaŭ ol uzi ĝin</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Uzi malgraŭ tio</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Eraro pri parolsintezilo (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Rete</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Instali</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Malsukcesis malfermi agordojn pri parolsintezo</string>
     <string name="shared_decks_login_required">Ensalutu por elŝuti pliajn kartarojn</string>
     <string name="deck_description_field_hint">Priskribo</string>
     <string name="failed_to_copy">Malsukcesis kopii</string>
diff --git a/AnkiDroid/src/main/res/values-eo/03-dialogs.xml b/AnkiDroid/src/main/res/values-eo/03-dialogs.xml
index 143bc971539f..6d5f264ae7b7 100644
--- a/AnkiDroid/src/main/res/values-eo/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-eo/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Eraro pri datumbazo</string>
     <string name="answering_error_message">Malsukcesis skribi al la kolekto. La datumbazo povas esti difektita aŭ eble mankas spaco en la konservejo.\n\nSe tio ĉi okazos pli ofte, provu kontroli la datumbazon, ripari la kolekton aŭ restarigi ĝin el sekurkopio. Frapetu “agordojn” por fari tion.\nAŭ tio ĉi povas esti eraro en AnkiDroid, do bonvolu raporti ĝin por ke ni povu ĝin ripari.</string>
     <string name="answering_error_report">Raporti eraron</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
+    <string name="storage_full_message">Mankas spaco en la konservejo por malfermi AnkiDroid. Liberigu iom da spaco por pluigi.</string>
     <string name="repair_deck_dialog">Ĉu vi certe volas ripari la datumbazon?\n\nAntaŭ ol komenci, kopio estos kreita en subdosierujo “%s”.</string>
     <string name="intent_aedict_empty">La ĉefa kategorio estas malplena</string>
     <string name="intent_aedict_category">Por aldoni kartojn al AnkiDroid, forigu ĉiujn kategoriojn de kajero kaj aldonu unu nomitan «default»</string>
@@ -104,8 +104,8 @@
     <string name="check_media_title">Ĉu kontroli aŭdvidaĵojn?</string>
     <string name="check_media_warning">Tio ĉi povas okupi multan tempon por grandaj aŭdvidaĵaj kolektoj</string>
     <string name="check_media_message">Kontrolado de aŭdvidaĵoj&#8230;</string>
-    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
-    <string name="check_media_tags_added">Tags added</string>
+    <string name="check_media_adding_missing_tag">Aldonado de etikedoj&#8230;</string>
+    <string name="check_media_tags_added">Aldonis etikedojn</string>
     <string name="delete_media_message">Forigado de aŭdvidaĵoj&#8230;</string>
     <string name="delete_media_result_title">Rezulto de forigo</string>
     <plurals name="delete_media_result_message">
@@ -210,8 +210,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Poste</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Ne montri denove</string>
     <string name="dismiss_backup_warning_title">Averto pri perdi datumojn</string>
-    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
-    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_new_user">Pro privatecaj ŝanĝoj en la operaciumo Android, viaj datumoj kaj aŭtomataj sekurkopioj estos forigitaj el via telefono, se la aplikaĵo estos malinstalita</string>
+    <string name="dismiss_backup_warning_upgrade">Pro privatecaj ŝanĝoj en la operaciumo Android, viaj datumoj kaj aŭtomataj sekurkopioj estos nealireblaj, se la aplikaĵo estos malinstalita</string>
     <string name="deck_already_exists">Kartaro jam ekzistas</string>
     <string name="empty_deck_name">Nomo de kartaro ne estu malplena</string>
     <string name="create_deck_numeric_hint">Se vi havas problemojn pri karta ordigo (ekzemple “10” troviĝas antaŭ “2”), renomu “2” al “02”</string>
diff --git a/AnkiDroid/src/main/res/values-eo/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-eo/07-cardbrowser.xml
index 8c24be37e45b..7ce36a3206bb 100644
--- a/AnkiDroid/src/main/res/values-eo/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-eo/07-cardbrowser.xml
@@ -112,11 +112,11 @@
     <string name="edit_tags_dialog" comment="Description of the shortcut that opens the edit tags dialog">Malfermi redaktilon de etikedoj</string>
     <string name="show_order_dialog" comment="Description of the shortcut that shows the order dialog">Ŝanĝi ordigon</string>
     <!-- Manage columns dialog -->
-    <string name="browse_manage_columns_main_heading">Columns</string>
-    <string name="browse_manage_columns">Manage columns</string>
-    <string name="user_active_columns">Active</string>
-    <string name="user_potential_columns">Available</string>
-    <string name="include_column">Include column</string>
-    <string name="exclude_column">Exclude column</string>
-    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
+    <string name="browse_manage_columns_main_heading">Kolumnoj</string>
+    <string name="browse_manage_columns">Alĝustigi kolumnojn</string>
+    <string name="user_active_columns">Aktivaj</string>
+    <string name="user_potential_columns">Disponeblaj</string>
+    <string name="include_column">Aldoni kolumnon</string>
+    <string name="exclude_column">Forigi kolumnon</string>
+    <string name="browser_find_replace_loading_fields">Akirado de nomoj de kampoj&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-eo/10-preferences.xml b/AnkiDroid/src/main/res/values-eo/10-preferences.xml
index 0181c4dd504a..7c1fdd94fe18 100644
--- a/AnkiDroid/src/main/res/values-eo/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-eo/10-preferences.xml
@@ -97,7 +97,7 @@
     <string name="gestures_summ">Asigni gestojn al agoj, kiel respondi aŭ redakti karton.</string>
     <string name="gestures_corner_touch" maxLength="41">9-punkta frapeto</string>
     <string name="gestures_corner_touch_summary">Ebligi gestojn en anguloj de la ekrano</string>
-    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Montri ŝparklavojn</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Naviga tirmenuo sur plenekrano</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Malfermi navigan tirmenuon per ŝovumi dekstren sur la plenekrano</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Neniu</string>
@@ -161,7 +161,7 @@
     <string name="disable_extended_text_ui_summ">Montri la kuntekstan menuon “truteksta malpleno” kiam en horizontala orientiĝo.</string>
     <string name="vertical_centering" maxLength="41">Centrigi vertikale</string>
     <string name="vertical_centering_summ">Centrigi enhavon de kartoj vertikale</string>
-    <string name="pref_double_tap_time_interval" maxLength="41">Ignori duan frapeton antaŭ (milisekundoj)</string>
+    <string name="pref_double_tap_time_interval" maxLength="41">Ignori duan frapeton antaŭ ol (milisekundoj)</string>
     <string name="pref_double_tap_time_interval_summary">La dua frapeto sur la butonoj de respondoj estos ignorita, se ĝi okazos antaŭ la agordita tempo Tio ĉi preventas de fari neatenditajn duoblaj frapetojn</string>
     <string name="pref_show_answer_long_press_time" maxLength="41">Montri respondon post frapetadi</string>
     <string name="pref_show_answer_long_press_time_summary">Minimuma tempo de frapetado post kiu la butono “Montri respondon” registras frapeton.</string>
@@ -292,7 +292,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Programistaj agordoj</string>
     <string name="dev_options_enabled_pref" maxLength="41">Aktivigi programistajn agordojn</string>
     <string name="disable_dev_options">Malaktivigi programistajn agordojn</string>
-    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
+    <string name="dev_options_warning">Antaŭ ol aktivigi programistajn agordojn, certiĝu, ke vi scias kion vi faras. Tiuj agordoj estas danĝeraj kaj povas difekti la aplikaĵon aŭ vian kolekton.\n\nRimarko: tiuj agordoj ne taŭgas por kutimaj uzantoj, do ne estas tradukitaj (estas en la angla).</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
@@ -357,9 +357,9 @@ Vi povas restarigi el sekurkopio aŭ elporti vian kolekton per la menuo de listo
     <string name="ignore_display_cutout" maxLength="41">Ignori eltondaĵojn en la ekrano</string>
     <string name="hide_answer_buttons" maxLength="41">Kaŝi respondajn butonojn</string>
     <string name="hide_hard_and_easy" maxLength="41">Kaŝi butonojn “malfacile” kaj “facile”</string>
-    <string name="reviewer_frame_style" maxLength="41">Frame style</string>
-    <string name="reviewer_frame_style_card" maxLength="41" comment="Style name of the \'Card\' card frame of the Reviewer">Card</string>
-    <string name="reviewer_frame_style_box" maxLength="41" comment="Style name of the \'Box\' card frame of the Reviewer">Box</string>
+    <string name="reviewer_frame_style" maxLength="41">Stilo de kadro</string>
+    <string name="reviewer_frame_style_card" maxLength="41" comment="Style name of the \'Card\' card frame of the Reviewer">karta</string>
+    <string name="reviewer_frame_style_box" maxLength="41" comment="Style name of the \'Box\' card frame of the Reviewer">plena</string>
     <!--Keyboard shortcuts dialog-->
     <string name="open_settings" comment="Description of the shortcut that opens the app settings">Malfermi agordojn</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-eo/17-model-manager.xml b/AnkiDroid/src/main/res/values-eo/17-model-manager.xml
index e2dc5e1ccbf2..7901888edcee 100644
--- a/AnkiDroid/src/main/res/values-eo/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-eo/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Ĉu vi certe volas forigi tiun ĉi nototipon?</string>
     <string name="field_delete_warning">Ĉu vi efektive volas forigi tiun kampon?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s</string>
+    <string name="model_browser_add_add">Aldoni: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s</string>
+    <string name="model_browser_add_clone">Kloni: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Enigu la ŝablonon, kiu estos uzata de la kart‑foliumilo por vidigi kartojn. Uzu tion ĉi por vidigi pli koncizan respondon.\n\nEkzemple  la antaŭa ŝablono de\n\n“La ĉefurbo de {{Country}} estas:”\npovus esti mallongigita al\n“Ĉefurbo: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Formo de demando</string>
diff --git a/AnkiDroid/src/main/res/values-gu/01-core.xml b/AnkiDroid/src/main/res/values-gu/01-core.xml
index dd9a8257c4b9..5a5ae3bb6cd5 100644
--- a/AnkiDroid/src/main/res/values-gu/01-core.xml
+++ b/AnkiDroid/src/main/res/values-gu/01-core.xml
@@ -129,7 +129,7 @@
     <string name="empty_deck">આ ડેક ખાલી છે</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">ડેક શોધ</string>
     <string name="invalid_deck_name">અમાન્ય ડેક નામ</string>
-    <string name="studyoptions_congrats_finished">Congratulations! You have finished for today.</string>
+    <string name="studyoptions_congrats_finished">અભિનંદ! તમે આજનું કાર્ય પૂરું કરી લીધુ છે.</string>
     <string name="studyoptions_congrats_next_due_in" comment="The param will be replaced with \'The next card will be ready in X time\'">ડેક હમણાં માટે સમાપ્ત! %s</string>
     <string name="studyoptions_no_cards_due">હજુ સુધી કોઈ કાર્ડ બાકી નથી</string>
     <string name="sd_card_not_mounted">ઉપકરણ સંગ્રહ માઉન્ટ થયેલ નથી</string>
diff --git a/AnkiDroid/src/main/res/values-gu/02-strings.xml b/AnkiDroid/src/main/res/values-gu/02-strings.xml
index 55298b7b52b6..ac29941ccb52 100644
--- a/AnkiDroid/src/main/res/values-gu/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-gu/02-strings.xml
@@ -87,8 +87,8 @@
         <item quantity="one">+%d புதைக்கப்பட்டது</item>
         <item quantity="other">+%d புதைக்கப்பட்டது</item>
     </plurals>
-    <string name="studyoptions_total_new_label">Total new cards</string>
-    <string name="studyoptions_total_label">Total cards</string>
+    <string name="studyoptions_total_new_label">કુલ નવા પત્તા </string>
+    <string name="studyoptions_total_label">તમામ પત્તા </string>
     <!-- Card editor -->
     <string name="cardeditor_title_edit_card" maxLength="28">નોંધ સંપાદિત કરો</string>
     <string name="discard">રદ્દ કરો</string>
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">પૃષ્ઠભૂમિ</string>
     <string name="choose_an_image" maxLength="41">છબી પસંદ કરો</string>
-    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">બેકગ્રાઉડ હટાવો </string>
     <string name="remove_background_image">પૃષ્ઠભૂમિ દૂર કરીએ?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">મૂળભૂત પુનઃસ્થાપિત</string>
@@ -232,8 +232,8 @@
     <string name="remove_toolbar_item">ટૂલબાર આઇટમ દૂર કરીએ?</string>
     <string name="note_editor_image_too_large">படம் மிகவும் பெரிதாக உள்ளது, படத்தை கைமுறையாக செருகவும்</string>
     <string name="note_editor_video_too_large">வீடியோ கோப்பு மிகவும் பெரியதாக உள்ளது, வீடியோவை கைமுறையாக செருகவும்</string>
-    <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
+    <string name="note_editor_audio_too_large">ઓડિયો ફાઇલ ખૂબ મોટી છે, મહેરબાની કરીને ઓડિયો ફાઇલ જાતે ઉમેરો</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">એન્ડ્રોઈડ બેકઅપ પ્રક્રિયામાં છે. મહેરબાની કરીને પછી પ્રયત્ન કરો</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">AnkiDroid ને શૉર્ટકટ્સ ઉમેરવાની મંજૂરી આપવા માટે તમારે iManager નો ઉપયોગ કરવાની જરૂર પડી શકે છે</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">તમારી હોમ સ્ક્રીન AnkiDroid ને શોર્ટકટ ઉમેરવાની મંજૂરી આપતી નથી</string>
     <string name="create_shortcut_error">શૉર્ટકટ ઉમેરવામાં ભૂલ: %s</string>
@@ -249,7 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">ડેક ડાઉનલોડ કરો</string>
-    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">બ્રાઉઝર માં ખોલો </string>
     <string name="try_again">ફરીથી પ્રયત્ન કરો</string>
     <string name="cancel_download">ડાઉનલોડ રદ કરો</string>
     <string name="cancel_download_question_title">ડાઉનલોડ રદ કરીએ?</string>
@@ -303,17 +303,17 @@
     <string name="show_notes" comment="Label for toggle notes button in BrowserOptionsDialog">નોંધો</string>
     <string name="toggle_cards_notes">કાર્ડ્સ/નોટ્સ ટૉગલ કરો</string>
     <string name="truncate_content_help">સામગ્રીની માત્ર પ્રથમ 3 લીટીઓ બતાવવા માટે બ્રાઉઝરની દરેક હરોળની ઊંચાઈને કાપો</string>
-    <string name="browser_options_dialog_heading">Browser options</string>
+    <string name="browser_options_dialog_heading">બ્રાઉઝર ઓપ્શન્સ </string>
     <string name="audio_saved">રેકોર્ડિંગ સાચવ્યું</string>
     <string name="deleting_selected_notes">પસંદ કરેલી નોંધો કાઢી નાખી રહ્યાં છીએ</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">અવાજ સંભાભડવા માટે દબાવો</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">અવાજ સંભાળ્યા પેહલા ઇન્સ્ટોલ થવો જરૂરી છે </string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">ગમેતે રીતે વાપરો</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">ટેક્સ્ટ ટુ સ્પીચ ભૂલ (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">ઇન્ટરનેટ </string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">ઇન્સ્ટોલ </string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">ટેક્સ્ટ થી સ્પીચ સેટિંગ ખોલવામાં અસફળ રહ્યા </string>
     <string name="shared_decks_login_required">વધુ ડેક ડાઉનલોડ કરવા માટે કૃપા કરીને લૉગ ઇન કરો</string>
     <string name="deck_description_field_hint">વર્ણન</string>
     <string name="failed_to_copy">કૉપિ કરવામાં નિષ્ફળ</string>
diff --git a/AnkiDroid/src/main/res/values-gu/06-statistics.xml b/AnkiDroid/src/main/res/values-gu/06-statistics.xml
index a50118f626c8..3ad0a9dcca17 100644
--- a/AnkiDroid/src/main/res/values-gu/06-statistics.xml
+++ b/AnkiDroid/src/main/res/values-gu/06-statistics.xml
@@ -44,5 +44,5 @@
 ~ this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <resources>
-    <string name="open_statistics" comment="Description of the shortcut that opens the statistics page">Open statistics</string>
+    <string name="open_statistics" comment="Description of the shortcut that opens the statistics page">આંકડા ખોલો </string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ja/10-preferences.xml b/AnkiDroid/src/main/res/values-ja/10-preferences.xml
index ccfaae53d456..74fe1346d4ec 100644
--- a/AnkiDroid/src/main/res/values-ja/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ja/10-preferences.xml
@@ -154,7 +154,7 @@
     <string name="software_render" maxLength="41">カードのハードウェアレンダリングを無効にする</string>
     <string name="software_render_summ">ハードウェアによるレンダリングは高速ですが、問題が発生する可能性があります（特にAndroid 8/8.1において）。 カード学習画面のユーザーインターフェースの一部が表示されない場合は、この設定を試してみてください</string>
     <string name="safe_display" maxLength="41">安全表示モード</string>
-    <string name="safe_display_summ">アニメーションを無効にし、より不具合が起こりくい方法でカードを表示します。電子ペーパー端末ではこの設定が必要となる場合があります</string>
+    <string name="safe_display_summ">アニメーションを無効にし、より不具合が起こりにくい方法でカードを表示します。電子ペーパー端末ではこの設定が必要となる場合があります</string>
     <string name="disable_extended_text_ui" maxLength="41">単一フィールド編集モードを無効にする</string>
     <!--See: multimedia_editor_popup_cloze. We can\'t use format strings as this is auto-generated-->
     <string name="disable_extended_text_ui_summ">ランドスケープモード時に「穴埋め問題箇所」のコンテキストメニューを許可します</string>
diff --git a/AnkiDroid/src/main/res/values-pl/01-core.xml b/AnkiDroid/src/main/res/values-pl/01-core.xml
index c41b11adeab3..dd64f49a51ad 100644
--- a/AnkiDroid/src/main/res/values-pl/01-core.xml
+++ b/AnkiDroid/src/main/res/values-pl/01-core.xml
@@ -209,5 +209,5 @@
     <string name="image_occlusion">Okluzja obrazu</string>
     <string name="remove_account" comment="open a website to start the deletion of an AnkiWeb account">Usuń konto</string>
     <!-- Instant Note Editor -->
-    <string name="instant_card" comment="This does not need to be translated literally, translate the concept of quickly adding a Cloze note with a popup. Used in the Android system context menu/share dialog.">Instant card</string>
+    <string name="instant_card" comment="This does not need to be translated literally, translate the concept of quickly adding a Cloze note with a popup. Used in the Android system context menu/share dialog.">Szybka karta</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-pl/02-strings.xml b/AnkiDroid/src/main/res/values-pl/02-strings.xml
index f00f93f9d3ba..574a4863b6fb 100644
--- a/AnkiDroid/src/main/res/values-pl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-pl/02-strings.xml
@@ -342,7 +342,7 @@
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Nie można usunąć typu karty</string>
     <string name="orphan_note_message">Usunięcie tej karty spowoduje pozostawienie niektórych notatek bez żadnej karty.</string>
-    <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
+    <string name="voice_not_supported">Głos nie jest obsługiwany. Spróbuj użyć innego lub zainstaluj silnik głosowy.</string>
     <!--Keyboard shortcuts dialog-->
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Wybór talii</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Usuń talię bez potwierdzenia</string>
diff --git a/AnkiDroid/src/main/res/values-pl/03-dialogs.xml b/AnkiDroid/src/main/res/values-pl/03-dialogs.xml
index 31db8554c6ee..52e77114e368 100644
--- a/AnkiDroid/src/main/res/values-pl/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-pl/03-dialogs.xml
@@ -49,10 +49,10 @@
     <string name="contextmenu_deckpicker_delete_deck" maxLength="28">Skasuj talię</string>
     <string name="delete_deck_title">Skasuj talię</string>
     <plurals name="delete_deck_message">
-        <item quantity="one">Delete all cards in %1$s? It contains %2$d card</item>
-        <item quantity="few">Delete all cards in %1$s? It contains %2$d cards</item>
-        <item quantity="many">Delete all cards in %1$s? It contains %2$d cards</item>
-        <item quantity="other">Delete all cards in %1$s? It contains %2$d cards</item>
+        <item quantity="one">Usunąć wszystkie karty z %1$s? Jest tam %2$d karta</item>
+        <item quantity="few">Usunąć wszystkie karty z %1$s? Są tam %2$d karty</item>
+        <item quantity="many">Usunąć wszystkie karty z %1$s? Jest tam %2$d kart</item>
+        <item quantity="other">Usunąć wszystkie karty z %1$s? Jest tam %2$d kart</item>
     </plurals>
     <string name="delete_cram_deck_message">Czy na pewno chcesz usunąć filtrowaną talię %s i przenieść wszystkie karty do ich oryginalnych talii?</string>
     <string name="no_tts_available_message">Brak dostępnego języka zamiany tekstu na mowę</string>
@@ -68,7 +68,7 @@
     <string name="answering_error_title">Błąd bazy danych</string>
     <string name="answering_error_message">Wystąpił błąd podczas zapisywania do kolekcji. Powodem może być uszkodzenie bazy danych albo niewystarczająca ilość miejsca na dysku.\n\nJeśli błąd ten występuje często, spróbuj użyć opcji \"sprawdź bazę danych\" oraz naprawić kolekcję lub przywróć ją z kopii zapasowej (by tego dokonać kliknij „opcje”).\n\nRównie dobrze może to być też błąd AnkiDroid; zgłoś go abyśmy mogli to sprawdzić.</string>
     <string name="answering_error_report">Zgłoś błąd</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
+    <string name="storage_full_message">Nie ma wystarczającej ilości wolnego miejsca, aby otworzyć AnkiDroid. Zwolnij trochę miejsca, aby kontynuować.</string>
     <string name="repair_deck_dialog">Czy na pewno chcesz próbować naprawić bazę danych? \n\nPrzed próbą naprawy zostanie utworzona kopia w katalogu \'%s\'.</string>
     <string name="intent_aedict_empty">Kategoria \'Domyślne\' jest pusta</string>
     <string name="intent_aedict_category">Aby dodać karty AnkiDroid usuń wszystkie kategorie Notatnika lub dodaj jedną o nazwie \'default\'</string>
@@ -108,8 +108,8 @@
     <string name="check_media_title">Sprawdzić media?</string>
     <string name="check_media_warning">To może trwać bardzo długo przy dużych kolekcjach</string>
     <string name="check_media_message">Sprawdzanie mediów&#8230;</string>
-    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
-    <string name="check_media_tags_added">Tags added</string>
+    <string name="check_media_adding_missing_tag">Dodawanie etykiet&#8230;</string>
+    <string name="check_media_tags_added">Etykiety dodane</string>
     <string name="delete_media_message">Usuwanie mediów&#8230;</string>
     <string name="delete_media_result_title">Wynik usuwania</string>
     <plurals name="delete_media_result_message">
@@ -218,10 +218,10 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Później</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Nie pokazuj ponownie</string>
     <string name="dismiss_backup_warning_title">Ostrzeżenie o utracie danych</string>
-    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_new_user">Ze względu na zmiany prywatności w systemie Android, twoje dane i automatyczne kopie zapasowe zostaną usunięte z telefonu, jeśli aplikacja zostanie odinstalowana</string>
     <string name="dismiss_backup_warning_upgrade">Ze względu na zmiany prywatności w systemie Android Twoje dane i automatyczne kopie zapasowe będą niedostępne, jeśli aplikacja zostanie odinstalowana</string>
     <string name="deck_already_exists">Taka talia już istnieje</string>
-    <string name="empty_deck_name">Deck name cannot be empty</string>
+    <string name="empty_deck_name">Nazwa talii nie może być pusta</string>
     <string name="create_deck_numeric_hint">W przypadku wystąpienia problemów związanych z kolejnością talii (np. „10” pojawia się przed „2”), „2” należy zastąpić „02”.</string>
     <!-- Set Due Date -->
     <string name="set_due_date_match_interval" comment="when setting a card\'s due date, this checkbox also changes the interval of the card">Ustaw interwał na tę samą wartość</string>
@@ -247,20 +247,20 @@
     <string name="set_due_date_range_start" comment="\'Set Due Date\' may change the due date of a card to a random number of days in the future. This labels the \'minimum\' value of this range (inclusive)">Od</string>
     <string name="set_due_date_range_end" comment="\'Set Due Date\' may change the due date of a card to a random number of days in the future. This labels the \'maximum\' value of this range (inclusive)">Do</string>
     <!-- Instant Note Editor -->
-    <string name="cloze_note_required">Cloze Type Note Required</string>
+    <string name="cloze_note_required">Wymagana Notatka typu \"Luka\"</string>
     <string name="cloze_not_found_message">No Cloze type note found, open the Note Editor or try again after adding a Cloze type note.</string>
     <string name="open">Otwórz</string>
     <string name="change_cloze_number">Change cloze number</string>
     <string name="cloze_number">Cloze number:</string>
     <string name="change_editor_mode">Zmień tryb edytora</string>
-    <string name="open_note_editor">Open note editor</string>
+    <string name="open_note_editor">Otwórz edytor notatek</string>
     <string name="change_cloze_mode">Change cloze mode</string>
     <!-- Outdated WebView dialog -->
     <string name="webview_update_message">System WebView jest nieaktualny. Niektóre funkcje nie będą działać poprawnie. Zaktualizuj go.\n\nZainstalowana wersja: %1$d\nMinimalna wymagana wersja: %2$d</string>
-    <string name="compress">Compress</string>
+    <string name="compress">Kompresuj</string>
     <!-- Tts playback error dialog -->
     <string name="tts_error_dialog_title">Ten język nie jest obsługiwany</string>
-    <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
-    <string name="tts_error_dialog_change_button_text">Change engine</string>
-    <string name="tts_error_dialog_supported_voices_button_text">Voice options</string>
+    <string name="tts_error_dialog_reason_text">Silnik zamiany tekstu na mowę <b>%1$s</b> nie obsługuje następującego języka: <b>%2$s</b></string>
+    <string name="tts_error_dialog_change_button_text">Zmień silnik</string>
+    <string name="tts_error_dialog_supported_voices_button_text">Opcje głosów</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-pl/06-statistics.xml b/AnkiDroid/src/main/res/values-pl/06-statistics.xml
index a50118f626c8..1b68a441affc 100644
--- a/AnkiDroid/src/main/res/values-pl/06-statistics.xml
+++ b/AnkiDroid/src/main/res/values-pl/06-statistics.xml
@@ -44,5 +44,5 @@
 ~ this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <resources>
-    <string name="open_statistics" comment="Description of the shortcut that opens the statistics page">Open statistics</string>
+    <string name="open_statistics" comment="Description of the shortcut that opens the statistics page">Otwórz statystyki</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-pl/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-pl/07-cardbrowser.xml
index 934c1dda5d52..5f7cf441f166 100644
--- a/AnkiDroid/src/main/res/values-pl/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-pl/07-cardbrowser.xml
@@ -76,7 +76,7 @@
     <string name="card_browser_list_my_searches_new_name">Nazwa bieżącego wyszukiwania</string>
     <string name="card_browser_list_my_searches_new_search_error_empty_name">Nie można zapisać wyszukiwania bez nazwy</string>
     <string name="card_browser_list_my_searches_new_search_error_dup">Nazwa już istnieje</string>
-    <string name="no_note_to_edit">No note to edit</string>
+    <string name="no_note_to_edit">Brak notatki do edycji</string>
     <string name="card_browser_list_my_searches_remove_content">Usunąć \"%1$s\"?</string>
     <string name="card_browser_change_display_order" maxLength="28">Zmień kolejność wyświetlania</string>
     <string name="card_browser_search_hint" comment="Message displayed in the search text field in the card browser.">Szukaj</string>
@@ -124,11 +124,11 @@
     <string name="edit_tags_dialog" comment="Description of the shortcut that opens the edit tags dialog">Okno dialogowe edycji tagów</string>
     <string name="show_order_dialog" comment="Description of the shortcut that shows the order dialog">Show order dialog</string>
     <!-- Manage columns dialog -->
-    <string name="browse_manage_columns_main_heading">Columns</string>
-    <string name="browse_manage_columns">Manage columns</string>
-    <string name="user_active_columns">Active</string>
-    <string name="user_potential_columns">Available</string>
-    <string name="include_column">Include column</string>
-    <string name="exclude_column">Exclude column</string>
-    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
+    <string name="browse_manage_columns_main_heading">Kolumny</string>
+    <string name="browse_manage_columns">Zarządzaj kolumnami</string>
+    <string name="user_active_columns">Aktywne</string>
+    <string name="user_potential_columns">Dostępne</string>
+    <string name="include_column">Dołącz kolumnę</string>
+    <string name="exclude_column">Wyklucz kolumnę</string>
+    <string name="browser_find_replace_loading_fields">Pobieranie nazw pól&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-pl/08-widget.xml b/AnkiDroid/src/main/res/values-pl/08-widget.xml
index 0420aa70b50d..4aa402e35c99 100644
--- a/AnkiDroid/src/main/res/values-pl/08-widget.xml
+++ b/AnkiDroid/src/main/res/values-pl/08-widget.xml
@@ -66,20 +66,20 @@
         <item quantity="other">Pozostało %d minut</item>
     </plurals>
     <string name="widget_add_note_button">Dodaj nową notatkę AnkiDroid</string>
-    <string name="deck_picker_widget_description" comment="Title of the Deck Picker Widget. Displayed to the user in Android\'s Widget Selection menu">Deck Picker</string>
-    <string name="card_analysis_extra_widget_description">Card Analysis</string>
+    <string name="deck_picker_widget_description" comment="Title of the Deck Picker Widget. Displayed to the user in Android\'s Widget Selection menu">Wybór talii</string>
+    <string name="card_analysis_extra_widget_description">Analiza karty</string>
     <!-- Strings to explain usage in Deck Picker and Card Analysis Widget Configuration screen -->
-    <string name="select_decks_title" comment="Title for Deck Selection Dialog">Select decks</string>
-    <string name="select_deck_title" comment="Title for Deck Selection Dialog">Select a deck</string>
-    <string name="no_selected_deck_placeholder_title" comment="Placeholder title when no decks are selected">Select decks to display in the widget. Select decks with the + icon.</string>
-    <string name="deck_removed_from_widget" comment="Snackbar when deck is removed from widget">Deck removed</string>
-    <string name="deck_already_selected_message" comment="Snackbar when user try to select the same deck again">This deck is already selected</string>
+    <string name="select_decks_title" comment="Title for Deck Selection Dialog">Wybierz talie</string>
+    <string name="select_deck_title" comment="Title for Deck Selection Dialog">Wybierz talię</string>
+    <string name="no_selected_deck_placeholder_title" comment="Placeholder title when no decks are selected">Wybierz talie do wyświetlenia w widżecie. Wybierz talie, używając ikony +.</string>
+    <string name="deck_removed_from_widget" comment="Snackbar when deck is removed from widget">Talia usunięta</string>
+    <string name="deck_already_selected_message" comment="Snackbar when user try to select the same deck again">Ta talia jest już wybrana</string>
     <plurals name="deck_limit_reached">
-        <item quantity="one">You can select up to %d deck.</item>
-        <item quantity="few">You can select up to %d decks.</item>
-        <item quantity="many">You can select up to %d decks.</item>
-        <item quantity="other">You can select up to %d decks.</item>
+        <item quantity="one">Możesz wybrać do %d talii</item>
+        <item quantity="few">Możesz wybrać do %d talii</item>
+        <item quantity="many">Możesz wybrać do %d talii</item>
+        <item quantity="other">Możesz wybrać do %d talii</item>
     </plurals>
-    <string name="empty_widget_state" comment="To denote the widget is empty">Missing deck. Tap to reconfigure.</string>
+    <string name="empty_widget_state" comment="To denote the widget is empty">Brakuje talii. Dotknij, aby ponownie skonfigurować.</string>
     <string name="empty_collection_state_in_widget" comment="To denote the collection is empty">Kolekcja jest pusta, użyj aplikacji do dodawania talii i skonfiguruj ponownie</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-pl/10-preferences.xml b/AnkiDroid/src/main/res/values-pl/10-preferences.xml
index a6ed05f686a1..0bc2cb186686 100644
--- a/AnkiDroid/src/main/res/values-pl/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-pl/10-preferences.xml
@@ -99,7 +99,7 @@
     <string name="gestures_summ">Przydziel gesty do akcji takich jak odpowiedzi lub edycja kart.</string>
     <string name="gestures_corner_touch" maxLength="41">Dotyk 9-punktowy</string>
     <string name="gestures_corner_touch_summary">Zezwalaj na gesty dotykowe w rogach ekranu</string>
-    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Pokaż skróty klawiszowe</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Panel nawigacyjny w pełnym ekranie</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Otwórz panel nawigacyjny po przesunięciu w prawo w dowolnym miejscu ekranu</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Brak</string>
@@ -140,7 +140,7 @@
     <string name="metered_sync_title" maxLength="41">Zezwalaj na synchronizację przy połączeniach taryfowych</string>
     <string name="metered_sync_summary">Jeśli wyłączone, zostaniesz ostrzeżony, jeśli spróbujesz zsynchronizować używając połączenia taryfowego</string>
     <string name="backup_limits_frequency">Częstotliwość</string>
-    <string name="backup_limits_lifetime">Lifetime</string>
+    <string name="backup_limits_lifetime">Okres</string>
     <string name="app_theme" maxLength="41">Motyw</string>
     <string name="day_theme" maxLength="41">Motyw na dzień</string>
     <string name="night_theme" maxLength="41">Motyw na noc</string>
@@ -269,7 +269,7 @@
     <string name="key_picker_default_press_key">Naciśnij klawisz</string>
     <string name="binding_add_axis">Add joystick/motion controller</string>
     <string name="axis_picker_move_joystick">Move a joystick/motion controller</string>
-    <string name="user_actions" maxLength="41">User actions</string>
+    <string name="user_actions" maxLength="41">Działania użytkownika</string>
     <string name="user_actions_summary" maxLength="41">Trigger JavaScript from the review screen</string>
     <string name="user_action_1" maxLength="28">Akcja użytkownika 1</string>
     <string name="user_action_2" maxLength="28">Akcja użytkownika 2</string>
@@ -280,7 +280,7 @@
     <string name="user_action_7" maxLength="28">Akcja użytkownika 7</string>
     <string name="user_action_8" maxLength="28">Akcja użytkownika 8</string>
     <string name="user_action_9" maxLength="28">Akcja użytkownika 9</string>
-    <string name="toggle_auto_advance" maxLength="41">Toggle auto advance</string>
+    <string name="toggle_auto_advance" maxLength="41">Przełącz auto-postęp</string>
     <!-- Select card side -->
     <string name="card_side_selection_title">Wybierz stronę karty</string>
     <string name="card_side_question">Pytanie</string>
@@ -363,17 +363,17 @@
     <string name="pref__etc__snackbar__fetching" comment="Generic snackbar message to be shown when user taps on a preference,         the value of which is being fetched">Pobieranie&#8230;</string>
     <string name="pref__etc__snackbar__calculating" comment="Generic snackbar message to be shown when user taps on a preference,         the value of which, such as folder size on disk, is being calculated">Obliczanie&#8230;</string>
     <string name="pref__etc__snackbar__no_collection" comment="Generic snackbar message to be shown when user taps on a preference         that is not usable because the collection does not exist">Kolekcja nie istnieje</string>
-    <string name="hide_system_bars" maxLength="41" comment="Title of a setting that allows to hide the system bars">Hide system bars</string>
-    <string name="hide_system_bars_none" comment="Setting option to not hide any of the system bars">None</string>
-    <string name="hide_system_bars_status_bar" comment="Setting option to hide the system status bar (the top one with clock, battery status, etc)">Status bar</string>
-    <string name="hide_system_bars_navigation_bar" comment="Setting option to hide the system navigation bar (the bottom one that can go back, to home, etc)">Navigation bar</string>
-    <string name="hide_system_bars_all_bars" comment="Setting option to hide all the system bars">All</string>
+    <string name="hide_system_bars" maxLength="41" comment="Title of a setting that allows to hide the system bars">Ukryj paski systemowe</string>
+    <string name="hide_system_bars_none" comment="Setting option to not hide any of the system bars">Żaden</string>
+    <string name="hide_system_bars_status_bar" comment="Setting option to hide the system status bar (the top one with clock, battery status, etc)">Pasek stanu</string>
+    <string name="hide_system_bars_navigation_bar" comment="Setting option to hide the system navigation bar (the bottom one that can go back, to home, etc)">Pasek nawigacyjny</string>
+    <string name="hide_system_bars_all_bars" comment="Setting option to hide all the system bars">Wszystkie</string>
     <string name="ignore_display_cutout" maxLength="41">Ignore display cutout</string>
-    <string name="hide_answer_buttons" maxLength="41">Hide answer buttons</string>
+    <string name="hide_answer_buttons" maxLength="41">Ukryj przyciski odpowiedzi</string>
     <string name="hide_hard_and_easy" maxLength="41">Ukryj przyciski \'Trudna\' i \'Łatwa\'</string>
-    <string name="reviewer_frame_style" maxLength="41">Frame style</string>
-    <string name="reviewer_frame_style_card" maxLength="41" comment="Style name of the \'Card\' card frame of the Reviewer">Card</string>
-    <string name="reviewer_frame_style_box" maxLength="41" comment="Style name of the \'Box\' card frame of the Reviewer">Box</string>
+    <string name="reviewer_frame_style" maxLength="41">Styl ramki</string>
+    <string name="reviewer_frame_style_card" maxLength="41" comment="Style name of the \'Card\' card frame of the Reviewer">Karta</string>
+    <string name="reviewer_frame_style_box" maxLength="41" comment="Style name of the \'Box\' card frame of the Reviewer">Pudełko</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="open_settings" comment="Description of the shortcut that opens the app settings">Open settings</string>
+    <string name="open_settings" comment="Description of the shortcut that opens the app settings">Otwórz ustawienia</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-pl/11-arrays.xml b/AnkiDroid/src/main/res/values-pl/11-arrays.xml
index 383e13f805e2..f7f9b3c805ce 100644
--- a/AnkiDroid/src/main/res/values-pl/11-arrays.xml
+++ b/AnkiDroid/src/main/res/values-pl/11-arrays.xml
@@ -84,7 +84,7 @@
     <string name="answer_good" maxLength="41">Odpowiedz \"Dobra\"</string>
     <string name="answer_easy" maxLength="41">Odpowiedz \"Łatwa\"</string>
     <string name="gesture_play" maxLength="41">Odtwarzaj</string>
-    <string name="gesture_abort_learning" maxLength="41">Close reviewer</string>
+    <string name="gesture_abort_learning" maxLength="41">Zamknij recenzenta</string>
     <string name="gesture_flag_red" maxLength="41">Włącz/wyłącz czerwoną flagę</string>
     <string name="gesture_flag_orange" maxLength="41">Włącz/wyłącz pomarańczową flagę</string>
     <string name="gesture_flag_green" maxLength="41">Włącz/wyłącz zieloną flagę</string>
@@ -95,7 +95,7 @@
     <string name="gesture_flag_remove" maxLength="41">Usuń flagę</string>
     <string name="gesture_page_up" maxLength="41">Przewiń w górę</string>
     <string name="gesture_page_down" maxLength="41">Przewiń w dół</string>
-    <string name="gesture_abort_sync" maxLength="41">Close reviewer and Sync</string>
+    <string name="gesture_abort_sync" maxLength="41">Zamknij recenzenta i synchronizuj</string>
     <string name="gesture_toggle_whiteboard" maxLength="41">Przełącz Tablicę</string>
     <string name="gesture_show_hint" maxLength="41">Pokaż podpowiedź</string>
     <string name="gesture_show_all_hints" maxLength="41">Pokaż wszystkie podpowiedzi</string>
diff --git a/AnkiDroid/src/main/res/values-pl/16-multimedia-editor.xml b/AnkiDroid/src/main/res/values-pl/16-multimedia-editor.xml
index 8affd39f0787..44986e4fe24f 100644
--- a/AnkiDroid/src/main/res/values-pl/16-multimedia-editor.xml
+++ b/AnkiDroid/src/main/res/values-pl/16-multimedia-editor.xml
@@ -72,5 +72,5 @@
     <string name="save_dialog_content">Aktualny rozmiar obrazu to %sMB. Domyślny limit rozmiaru obrazu to 1 MB. Czy chcesz skompresować obraz?</string>
     <string name="select_image_failed">"Wybieranie obrazu nie powiodło się, spróbuj ponownie"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Zawartość pola</string>
-    <string name="reselect" maxLength="28">Reselect</string>
+    <string name="reselect" maxLength="28">Wybierz ponownie</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-pl/17-model-manager.xml b/AnkiDroid/src/main/res/values-pl/17-model-manager.xml
index d061da19d934..18c77c406630 100644
--- a/AnkiDroid/src/main/res/values-pl/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-pl/17-model-manager.xml
@@ -68,9 +68,9 @@
     <string name="model_delete_warning">Czy na pewno chcesz usunąć ten typ notatki?</string>
     <string name="field_delete_warning">Czy na pewno chcesz usunąć to pole?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s</string>
+    <string name="model_browser_add_add">Dodaj: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s</string>
+    <string name="model_browser_add_clone">Sklonuj: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Wprowadź szablon, który przeglądarka kart będzie używała do wyświetlania twoich kart. Możesz użyć tego by wyświetlać bardziej zwięzłe odpowiedzi.\n\nSzablon \n\"Stolicą kraju {{Country}} jest:\"\nmoże być skrócony w przeglądarce kart do\n\"Stolica: {{Country}}\"</string>
     <string name="card_template_browser_appearance_question_format">Format pytania</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rPT/03-dialogs.xml b/AnkiDroid/src/main/res/values-pt-rPT/03-dialogs.xml
index 08f08bd7651e..1dee5c98cba7 100644
--- a/AnkiDroid/src/main/res/values-pt-rPT/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-pt-rPT/03-dialogs.xml
@@ -104,8 +104,8 @@
     <string name="check_media_title">Verificar multimédia?</string>
     <string name="check_media_warning">Isto pode demorar bastante tempo para coleções grandes de multimédia</string>
     <string name="check_media_message">A verificar multimédia&#8230;</string>
-    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
-    <string name="check_media_tags_added">Tags added</string>
+    <string name="check_media_adding_missing_tag">A adicionar etiquetas&#8230;</string>
+    <string name="check_media_tags_added">Etiquetas adicionadas</string>
     <string name="delete_media_message">A apagar ficheiros de multimédia&#8230;</string>
     <string name="delete_media_result_title">Resultado da remoção</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-tr/03-dialogs.xml b/AnkiDroid/src/main/res/values-tr/03-dialogs.xml
index 54c742b2c3d3..f14440d55ae8 100644
--- a/AnkiDroid/src/main/res/values-tr/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-tr/03-dialogs.xml
@@ -104,8 +104,8 @@
     <string name="check_media_title">Medya kontrol edilsin mi?</string>
     <string name="check_media_warning">Bu, büyük medya koleksiyonlarıyla uzun sürebilir.</string>
     <string name="check_media_message">Medya kontrol ediliyor&#8230;</string>
-    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
-    <string name="check_media_tags_added">Tags added</string>
+    <string name="check_media_adding_missing_tag">Etiketler ekleniyor&#8230;</string>
+    <string name="check_media_tags_added">Etiketler eklendi</string>
     <string name="delete_media_message">Medya siliniyor&#8230;</string>
     <string name="delete_media_result_title">Silme sonuçları</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-ug/02-strings.xml b/AnkiDroid/src/main/res/values-ug/02-strings.xml
index 8c3d21686006..81e3236aacff 100644
--- a/AnkiDroid/src/main/res/values-ug/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ug/02-strings.xml
@@ -187,7 +187,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">تەگلىك</string>
     <string name="choose_an_image" maxLength="41">سۈرەت تاللاش</string>
-    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">تەگلىكنى چىقىرىۋەت</string>
     <string name="remove_background_image">تەگلىكنى چىقىرىۋېتەمدۇ؟</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">كۆڭۈلدىكىگە قايتۇر</string>
@@ -233,7 +233,7 @@
     <string name="note_editor_image_too_large">سۈرەت بەك چوڭ، سۈرەتنى قولدا قىستۇرۇڭ</string>
     <string name="note_editor_video_too_large">سىن ھۆججىتى بەك چوڭ، سىننى قولدا قىستۇرۇڭ</string>
     <string name="note_editor_audio_too_large">ئۈن ھۆججىتى بەك چوڭ، ئۈننى قولدا قىستۇرۇڭ</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android زاپاسلاش ئىجرا قىلىنىۋاتىدۇ. قايتا سىناڭ</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">iManager نى ئىشلىتىپ AnkiDroid نىڭ تېزلەتمە قوشۇشىغا يول قويۇڭ</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">باش ئېكرانىڭىز AnkiDroid نىڭ تېزلەتمە قوشۇشىغا يول قويمايدۇ</string>
     <string name="create_shortcut_error">تېزلەتمە قوشۇش خاتالىقى: %s</string>
@@ -249,7 +249,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">دەستە چۈشۈر</string>
-    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">توركۆرگۈدە ئاچ</string>
     <string name="try_again">قايتا سىنا</string>
     <string name="cancel_download">چۈشۈرۈشتىن ۋاز كەچ</string>
     <string name="cancel_download_question_title">چۈشۈرۈشتىن ۋاز كېچەمدۇ؟</string>
@@ -306,14 +306,14 @@
     <string name="browser_options_dialog_heading">توركۆرگۈ تاللانما</string>
     <string name="audio_saved">خاتىرە ساقلاندى</string>
     <string name="deleting_selected_notes">تاللانغان خاتىرىنى ئۆچۈرۈۋاتىدۇ</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">ئاۋاز چېكىلسە ئاڭلىنىدۇ</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">ئىشلىتىشتىن ئىلگىرى ئاۋاز ئورنىتىلغان بولۇشى كېرەك</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">ئىشلىتىۋەر</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">تېكىستتىن ئاۋازغا خاتالىقى (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
-    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
+    <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">ئىنتېرنېت</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">ئورنات</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">تېكىستتىن ئاۋازغا تەڭشىكىنى ئاچالمىدى</string>
     <string name="shared_decks_login_required">تېخىمۇ كۆپ دەستە چۈشۈرۈش ئۈچۈن تىزىمغا كىرىڭ</string>
     <string name="deck_description_field_hint">چۈشەندۈرۈش</string>
     <string name="failed_to_copy">كۆچۈرەلمىدى</string>
diff --git a/AnkiDroid/src/main/res/values-ug/03-dialogs.xml b/AnkiDroid/src/main/res/values-ug/03-dialogs.xml
index 7f09668126f1..febd8e0f976c 100644
--- a/AnkiDroid/src/main/res/values-ug/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ug/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">ساندان خاتالىقى</string>
     <string name="answering_error_message">توپلامغا يازالمىدى. ساندان بۇزۇلغان بولۇشى ياكى دىسكىدا يېتەرلىك بوشلۇق بولماسلىقى مۇمكىن.\n\nئەگەر بۇ خىل ئەھۋال دائىم يۈز بەرسە، سانداننى تەكشۈرۈڭ، توپلامنى ئوڭشاڭ ياكى زاپاستىن ئەسلىگە كەلتۈرۈڭ. بۇنىڭ ئۈچۈن «تاللانما» نى چېكىڭ.\n\ياكى AnkiDroid كەمتۈكى بولۇشى مۇمكىن؛ خاتالىقنى مەلۇم قىلسىڭىز بىز ئۇنى تەكشۈرەلەيمىز.</string>
     <string name="answering_error_report">خاتالىق مەلۇم قىل</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
+    <string name="storage_full_message">AnkiDroid نى ئېچىشقا يېتەرلىك دىسكا بوشلۇقى يوق. داۋاملاشتۇرۇش ئۈچۈن ئارزاق بوشلۇق بوشىتىڭ.</string>
     <string name="repair_deck_dialog">سانداننى ھەقىقەتەن ئوڭشامسىز؟\n\nباشلاشتىن ئىلگىرى، بىر نۇسخا كۆچۈرۈلمىسى «%s» تارماق قىسقۇچقا قۇرۇلىدۇ.</string>
     <string name="intent_aedict_empty">سەھىپە «كۆڭۈلدىكى» بوش</string>
     <string name="intent_aedict_category">AnkiDroid قا كارتا قوشۇشتا بارلىق خاتىرە دەپتەر سەھىپىنى چىقىرىۋېتىدۇ ياكى «كۆڭۈلدىكى» ئاتىدا بىرنى قوشىدۇ</string>
@@ -104,8 +104,8 @@
     <string name="check_media_title">ۋاسىتە تەكشۈرەمدۇ؟</string>
     <string name="check_media_warning">چوڭ ۋاسىتە توپلىمىغا ئۇزۇن ۋاقىت كېتىشى مۇمكىن</string>
     <string name="check_media_message">ۋاسىتە تەكشۈرۈۋاتىدۇ&#8230;</string>
-    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
-    <string name="check_media_tags_added">Tags added</string>
+    <string name="check_media_adding_missing_tag">بەلگە قوش&#8230;</string>
+    <string name="check_media_tags_added">بەلگە قوشۇلدى</string>
     <string name="delete_media_message">ۋاسىتە ئۆچۈرۈۋاتىدۇ&#8230;</string>
     <string name="delete_media_result_title">ئۆچۈرۈش نەتىجىسى</string>
     <plurals name="delete_media_result_message">
@@ -210,8 +210,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">كېيىن</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">قايتا كۆرسەتمە</string>
     <string name="dismiss_backup_warning_title">سانلىق-مەلۇمات يوقۇلۇش ئاگاھلاندۇرۇشى</string>
-    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
-    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_new_user">Android شەخسىيەت تۈزۈمى ئۆزگەرگەنلىكتىن، ئەگەر ئەپ ئۆچۈرۈلسە، سانلىق مەلۇماتىڭىز ۋە ئۆزلۈكىدىن زاپاسلانغانلار تېلېفونىڭىزدىن ئۆچۈرۈلىدۇ</string>
+    <string name="dismiss_backup_warning_upgrade">Android شەخسىيەت تۈزۈمى ئۆزگەرگەنلىكتىن، ئەگەر ئەپ ئۆچۈرۈلسە، سانلىق مەلۇماتىڭىز ۋە ئۆزلۈكىدىن زاپاسلانغانلارنى زىيارەت قىلغىلى بولمايدۇ</string>
     <string name="deck_already_exists">دەستە مەۋجۇت</string>
     <string name="empty_deck_name">دەستە ئىسمى بوش قالمايدۇ</string>
     <string name="create_deck_numeric_hint">ئەگەر دەستە تەرتىپ مەسىلىسى بولسا (مەسىلەن، «10»«2»)دىن ئىلگىرى كۆرۈنسە، «2» نى «02» گە ئالماشتۇرۇڭ)</string>
diff --git a/AnkiDroid/src/main/res/values-ug/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-ug/07-cardbrowser.xml
index 776a550d2471..894be6a566ab 100644
--- a/AnkiDroid/src/main/res/values-ug/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-ug/07-cardbrowser.xml
@@ -118,5 +118,5 @@
     <string name="user_potential_columns">ئىشلىتىلىشچان</string>
     <string name="include_column">رەت ئىچىدە</string>
     <string name="exclude_column">رەت سىرتىدا</string>
-    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
+    <string name="browser_find_replace_loading_fields">بۆلەك ئىسمىغا ئېرىشىۋاتىدۇ&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ug/10-preferences.xml b/AnkiDroid/src/main/res/values-ug/10-preferences.xml
index 3d20edd3019a..d696fb5ae134 100644
--- a/AnkiDroid/src/main/res/values-ug/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ug/10-preferences.xml
@@ -297,7 +297,8 @@
     <string name="pref_cat_dev_options" maxLength="41">ئىجادكارلار تاللانمىسى</string>
     <string name="dev_options_enabled_pref" maxLength="41">ئىجادكارلار تاللانمىسىنى قوزغىتىدۇ</string>
     <string name="disable_dev_options">ئىجادكارلار تاللانمىسىنى چەكلەيدۇ</string>
-    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
+    <string name="dev_options_warning">ئىجادكارلار تاللانمىسىنىڭ قوزغىتىلغانلىقىغا كاپالەتلىك قىلىڭ. بۇ تاللانما خەتەرلىك ئەپ ياكى توپلامنى بۇزۇشى مۇمكىن.\n\nئەسكەرتىش بۇ تاللانما كۆپىنچە ئىشلەتكۈچىگە ماس كەلمەيدۇ، ئۇنىڭ ئۈستىگە تەرجىمە قىلىنمىغان شۇڭا ئىنگلىزچە.
+    </string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-ug/17-model-manager.xml b/AnkiDroid/src/main/res/values-ug/17-model-manager.xml
index 31f361f6aecb..6ce64254cfed 100644
--- a/AnkiDroid/src/main/res/values-ug/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-ug/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">راستلا بۇ بۆلەك تۈرىنى ئۆچۈرەمسىز؟</string>
     <string name="field_delete_warning">بۇ بۆلەكنى راستتىنلا ئۆچۈرەمسىز؟</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s</string>
+    <string name="model_browser_add_add">قوش: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s</string>
+    <string name="model_browser_add_clone">نۇسخىلا: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">كارتا كۆرگۈچ كارتىڭىزنى كۆرسىتىشكە ئىشلىتىدىغان قېلىپنى كىرگۈزۈڭ. بۇنى ئىشلىتىپ تېخىمۇ كۆپ قىسقا جاۋابنى كۆرسىتىدۇ.\n\nقېلىپتىكى «The capital of {{Country}} is:» كارتا كۆرگۈچتە «Capital: {{Country}}» غا قىسقارتىلىشى مۇمكىن</string>
     <string name="card_template_browser_appearance_question_format">سوئال پىچىمى</string>
diff --git a/AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml b/AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml
index 9c52a2e0ab26..20259444f461 100644
--- a/AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml
@@ -102,8 +102,8 @@
     <string name="check_media_title">是否检查媒体？</string>
     <string name="check_media_warning">如果媒体数据较多，检查媒体文件可能会需要较长的时间</string>
     <string name="check_media_message">正在检查媒体文件&#8230;</string>
-    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
-    <string name="check_media_tags_added">Tags added</string>
+    <string name="check_media_adding_missing_tag">正在添加标签&#8230;</string>
+    <string name="check_media_tags_added">标签已添加</string>
     <string name="delete_media_message">正在删除媒体&#8230;</string>
     <string name="delete_media_result_title">填空结果</string>
     <plurals name="delete_media_result_message">
diff --git a/docs/marketing/localized_description/marketdescription-pl.txt b/docs/marketing/localized_description/marketdescription-pl.txt
index f06761477c2a..ea739c46ce0d 100644
--- a/docs/marketing/localized_description/marketdescription-pl.txt
+++ b/docs/marketing/localized_description/marketdescription-pl.txt
@@ -6,7 +6,7 @@ Ucz się czegokolwiek zechcesz, gdziekolwiek zechcesz. Wykorzystaj wolny czas w
 
 Twórz własne talie lub pobierz talie darmowe, tworzone dla wielu języków oraz dziedzin (dostępnych jest ponad 6000 talii).
 
-Dodawanie materiału za pomocą desktopowego programu Anki lub bezpośrednio w AnkiDroidzie. Aplikacja wspiera nawet dodawanie materiału automatycznie z poziomu słownika!
+Dodawaj materiał za pomocą desktopowego programu Anki lub bezpośrednio w AnkiDroidzie. Aplikacja umożliwia nawet dodawanie materiału automatycznie z poziomu słownika!
 
 ★ Podstawowe cechy:
 • karty mogą zawierać: tekst, obrazki, dźwięki, LaTeX

From 4949e1c669b632bf6b25f2146d6731a10e8e711e Mon Sep 17 00:00:00 2001
From: lukstbit <52494258+lukstbit@users.noreply.github.com>
Date: Sun, 9 Feb 2025 18:51:59 +0200
Subject: [PATCH 161/200] Refactor CustomStudyDialog to handle the STUDY_TAGS
 path

This is a no-op commit that adds the required code for CustomStudyDialog
to handle the STUDY_TAGS option like the other paths. The new code is not
used yet as the dialog will still go through TagsDialog.

For tags, the ui will show an input box to enter the amount of cards(like
the other options) but it will also show a Spinner with 4 entries to select a
card state to further limit the cards available for studying.

The enum CustomStudyCardState models the 4 cards states the user
can select from before selecting the tags.
---
 .../dialogs/customstudy/CustomStudyDialog.kt  | 63 ++++++++++++++++---
 .../styled_custom_study_details_dialog.xml    |  6 ++
 AnkiDroid/src/main/res/values/03-dialogs.xml  |  1 +
 .../src/main/res/values/sentence-case.xml     |  2 +
 4 files changed, 63 insertions(+), 9 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/CustomStudyDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/CustomStudyDialog.kt
index 9af03c8ddced..c29149da7f05 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/CustomStudyDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/CustomStudyDialog.kt
@@ -21,21 +21,27 @@ import android.annotation.SuppressLint
 import android.app.Dialog
 import android.content.res.Resources
 import android.os.Bundle
+import android.os.Parcelable
 import android.util.TypedValue
 import android.view.WindowManager
 import android.view.inputmethod.EditorInfo
+import android.widget.ArrayAdapter
 import android.widget.EditText
 import android.widget.FrameLayout
 import android.widget.LinearLayout
 import android.widget.ScrollView
+import android.widget.Spinner
 import android.widget.TextView
 import androidx.annotation.VisibleForTesting
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.edit
 import androidx.core.os.bundleOf
+import androidx.core.view.isVisible
 import androidx.core.widget.doAfterTextChanged
 import androidx.fragment.app.setFragmentResult
 import anki.scheduler.CustomStudyDefaultsResponse
+import anki.scheduler.CustomStudyRequest.Cram.CramKind
+import anki.scheduler.copy
 import anki.scheduler.customStudyRequest
 import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.CollectionManager.withCol
@@ -78,6 +84,7 @@ import com.ichi2.utils.setPaddingRelative
 import com.ichi2.utils.textAsIntOrNull
 import com.ichi2.utils.title
 import kotlinx.coroutines.runBlocking
+import kotlinx.parcelize.Parcelize
 import net.ankiweb.rsdroid.exceptions.BackendDeckIsFilteredException
 import org.json.JSONObject
 import timber.log.Timber
@@ -248,6 +255,17 @@ class CustomStudyDialog :
         v.findViewById<TextView>(R.id.custom_study_details_text2).apply {
             text = text2
         }
+        v.findViewById<Spinner>(R.id.cards_state_selector).apply {
+            isVisible = contextMenuOption == STUDY_TAGS
+            adapter =
+                ArrayAdapter(
+                    requireContext(),
+                    android.R.layout.simple_spinner_item,
+                    CustomStudyCardState.entries.map { it.labelProducer() },
+                ).apply {
+                    setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+                }
+        }
         val editText =
             v.findViewById<EditText>(R.id.custom_study_details_edittext2).apply {
                 setText(defaultValue)
@@ -259,6 +277,12 @@ class CustomStudyDialog :
                     inputType = EditorInfo.TYPE_CLASS_NUMBER or EditorInfo.TYPE_NUMBER_FLAG_SIGNED
                 }
             }
+        val positiveBtnLabel =
+            if (contextMenuOption == STUDY_TAGS) {
+                TR.customStudyChooseTags().toSentenceCase(requireContext(), R.string.sentence_choose_tags)
+            } else {
+                getString(R.string.dialog_ok)
+            }
 
         // Set material dialog parameters
         @Suppress("RedundantValueArgument") // click = null
@@ -266,7 +290,7 @@ class CustomStudyDialog :
             AlertDialog
                 .Builder(requireActivity())
                 .customView(view = v, paddingStart = 64, paddingEnd = 64, paddingTop = 32, paddingBottom = 32)
-                .positiveButton(R.string.dialog_ok, click = null)
+                .positiveButton(text = positiveBtnLabel, click = null)
                 .negativeButton(R.string.dialog_cancel) {
                     requireActivity().dismissAllDialogFragments()
                 }.create()
@@ -312,6 +336,9 @@ class CustomStudyDialog :
     private suspend fun customStudy(
         contextMenuOption: ContextMenuOption,
         userEntry: Int,
+        cramKind: CramKind = CramKind.CRAM_KIND_NEW,
+        tagsSelectedForInclude: List<String> = emptyList(),
+        tagsSelectedForExclude: List<String> = emptyList(),
     ) {
         Timber.i("Custom study: $contextMenuOption; input = $userEntry")
 
@@ -324,7 +351,16 @@ class CustomStudyDialog :
                     STUDY_FORGOT -> forgotDays = userEntry
                     STUDY_AHEAD -> reviewAheadDays = userEntry
                     STUDY_PREVIEW -> previewDays = userEntry
-                    STUDY_TAGS -> TODO("This branch has not been covered before")
+                    STUDY_TAGS -> {
+                        // https://github.com/ankitects/anki/blob/acaeee91fa853e4a7a78dcddbb832d009ec3529a/qt/aqt/customstudy.py#L169-L177
+                        cram =
+                            cram.copy {
+                                kind = cramKind
+                                cardLimit = userEntry
+                                tagsToInclude.addAll(tagsSelectedForInclude)
+                                tagsToExclude.addAll(tagsSelectedForExclude)
+                            }
+                    }
                 }
             }
 
@@ -332,8 +368,7 @@ class CustomStudyDialog :
         val action =
             when (contextMenuOption) {
                 EXTEND_NEW, EXTEND_REV -> CustomStudyAction.EXTEND_STUDY_LIMITS
-                STUDY_FORGOT, STUDY_AHEAD, STUDY_PREVIEW -> CustomStudyAction.CUSTOM_STUDY_SESSION
-                STUDY_TAGS -> TODO("This branch has not been covered before")
+                STUDY_FORGOT, STUDY_AHEAD, STUDY_PREVIEW, STUDY_TAGS -> CustomStudyAction.CUSTOM_STUDY_SESSION
             }
 
         setFragmentResult(CustomStudyAction.REQUEST_KEY, bundleOf(CustomStudyAction.BUNDLE_KEY to action.ordinal))
@@ -346,7 +381,7 @@ class CustomStudyDialog :
             EXTEND_NEW, EXTEND_REV -> {
                 // Nothing to do in ankidroid. The default value is provided by the backend.
             }
-            STUDY_TAGS -> TODO("This branch has not been covered before")
+            STUDY_TAGS -> sharedPrefs().edit { putInt("amountOfCards", userEntry) }
         }
     }
 
@@ -405,9 +440,8 @@ class CustomStudyDialog :
                 STUDY_FORGOT -> res.getString(R.string.custom_study_forgotten)
                 STUDY_AHEAD -> res.getString(R.string.custom_study_ahead)
                 STUDY_PREVIEW -> res.getString(R.string.custom_study_preview)
-                STUDY_TAGS,
-                null,
-                -> ""
+                STUDY_TAGS -> res.getString(R.string.custom_study_tags)
+                null -> ""
             }
         }
 
@@ -421,7 +455,7 @@ class CustomStudyDialog :
                 STUDY_FORGOT -> prefs.getInt("forgottenDays", 1).toString()
                 STUDY_AHEAD -> prefs.getInt("aheadDays", 1).toString()
                 STUDY_PREVIEW -> prefs.getInt("previewDays", 1).toString()
-                STUDY_TAGS,
+                STUDY_TAGS -> prefs.getInt("amountOfCards", 100).toString()
                 null,
                 -> ""
             }
@@ -532,6 +566,17 @@ class CustomStudyDialog :
         STUDY_TAGS({ getString(R.string.custom_study_limit_tags) }),
     }
 
+    @Parcelize
+    enum class CustomStudyCardState(
+        val labelProducer: () -> String,
+        val kind: CramKind,
+    ) : Parcelable {
+        NewCardsOnly({ TR.customStudyNewCardsOnly() }, CramKind.CRAM_KIND_NEW),
+        DueCardsOnly({ TR.customStudyDueCardsOnly() }, CramKind.CRAM_KIND_DUE),
+        ReviewCardsRandom({ TR.customStudyAllReviewCardsInRandomOrder() }, CramKind.CRAM_KIND_REVIEW),
+        AllCardsRandom({ TR.customStudyAllCardsInRandomOrderDont() }, CramKind.CRAM_KIND_ALL),
+    }
+
     /**
      * Default values for extending deck limits, and default tag selection
      *
diff --git a/AnkiDroid/src/main/res/layout/styled_custom_study_details_dialog.xml b/AnkiDroid/src/main/res/layout/styled_custom_study_details_dialog.xml
index 260650209f29..d795bb7b774b 100644
--- a/AnkiDroid/src/main/res/layout/styled_custom_study_details_dialog.xml
+++ b/AnkiDroid/src/main/res/layout/styled_custom_study_details_dialog.xml
@@ -63,4 +63,10 @@
         android:inputType="number"
         android:text="1"
         tools:ignore="HardcodedText"/>
+
+    <Spinner
+        android:id="@+id/cards_state_selector"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
 </LinearLayout>
diff --git a/AnkiDroid/src/main/res/values/03-dialogs.xml b/AnkiDroid/src/main/res/values/03-dialogs.xml
index c9f3b810b9b9..f8b1c9b8a8a0 100644
--- a/AnkiDroid/src/main/res/values/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values/03-dialogs.xml
@@ -49,6 +49,7 @@
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead">Review ahead by x days:</string>
     <string name="custom_study_preview">Preview new cards added in the last x days:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
 
     <string name="storage_full_title">Storage full</string>
     <string name="storage_almost_full_title">Storage almost full</string>
diff --git a/AnkiDroid/src/main/res/values/sentence-case.xml b/AnkiDroid/src/main/res/values/sentence-case.xml
index f4b327710cb5..97334e9ba59b 100644
--- a/AnkiDroid/src/main/res/values/sentence-case.xml
+++ b/AnkiDroid/src/main/res/values/sentence-case.xml
@@ -47,4 +47,6 @@ undoActionUndone()
     <string name="sentence_find_and_replace">Find and replace</string>
     <string name="sentence_all_fields">All fields</string>
     <string name="sentence_check_media_delete_unused">Delete unused</string>
+    <string name="sentence_choose_tags">Choose tags</string>
+
 </resources>
\ No newline at end of file

From 5c1eaf12783dc62610eac00e6d4076b671439d5d Mon Sep 17 00:00:00 2001
From: lukstbit <52494258+lukstbit@users.noreply.github.com>
Date: Sun, 9 Feb 2025 18:52:24 +0200
Subject: [PATCH 162/200] Replicate desktop custom study by tags functionality

Folow ui/functionality from desktop.

A new dialog(instead of using/absuing TagsDialog), TagLimit, was
created to show the same ui as desktop.
---
 .../dialogs/customstudy/CustomStudyDialog.kt  | 225 ++++++------------
 .../IncludedExcludedTagsAdapter.kt            | 143 +++++++++++
 .../dialogs/customstudy/TagLimitFragment.kt   | 168 +++++++++++++
 .../src/main/res/drawable/list_border.xml     |   4 +
 .../res/layout-land/fragment_tag_limit.xml    | 114 +++++++++
 .../main/res/layout/fragment_tag_limit.xml    | 103 ++++++++
 .../res/layout/item_require_exclude_tag.xml   |  11 +
 .../styled_custom_study_details_dialog.xml    |   2 -
 AnkiDroid/src/main/res/values/01-core.xml     |   2 -
 AnkiDroid/src/main/res/values/02-strings.xml  |   3 +-
 .../src/main/res/values/sentence-case.xml     |   1 +
 11 files changed, 621 insertions(+), 155 deletions(-)
 create mode 100644 AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/IncludedExcludedTagsAdapter.kt
 create mode 100644 AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/TagLimitFragment.kt
 create mode 100644 AnkiDroid/src/main/res/drawable/list_border.xml
 create mode 100644 AnkiDroid/src/main/res/layout-land/fragment_tag_limit.xml
 create mode 100644 AnkiDroid/src/main/res/layout/fragment_tag_limit.xml
 create mode 100644 AnkiDroid/src/main/res/layout/item_require_exclude_tag.xml

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/CustomStudyDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/CustomStudyDialog.kt
index c29149da7f05..8b881aac199f 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/CustomStudyDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/CustomStudyDialog.kt
@@ -25,6 +25,7 @@ import android.os.Parcelable
 import android.util.TypedValue
 import android.view.WindowManager
 import android.view.inputmethod.EditorInfo
+import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import android.widget.EditText
 import android.widget.FrameLayout
@@ -56,20 +57,17 @@ import com.ichi2.anki.dialogs.customstudy.CustomStudyDialog.ContextMenuOption.ST
 import com.ichi2.anki.dialogs.customstudy.CustomStudyDialog.ContextMenuOption.STUDY_PREVIEW
 import com.ichi2.anki.dialogs.customstudy.CustomStudyDialog.ContextMenuOption.STUDY_TAGS
 import com.ichi2.anki.dialogs.customstudy.CustomStudyDialog.CustomStudyDefaults.Companion.toDomainModel
-import com.ichi2.anki.dialogs.tags.TagsDialog
-import com.ichi2.anki.dialogs.tags.TagsDialogListener
+import com.ichi2.anki.dialogs.customstudy.TagLimitFragment.Companion.KEY_EXCLUDED_TAGS
+import com.ichi2.anki.dialogs.customstudy.TagLimitFragment.Companion.KEY_INCLUDED_TAGS
+import com.ichi2.anki.dialogs.customstudy.TagLimitFragment.Companion.REQUEST_CUSTOM_STUDY_TAGS
 import com.ichi2.anki.launchCatchingTask
-import com.ichi2.anki.model.CardStateFilter
 import com.ichi2.anki.preferences.sharedPrefs
-import com.ichi2.anki.showThemedToast
 import com.ichi2.anki.ui.internationalization.toSentenceCase
 import com.ichi2.anki.utils.ext.dismissAllDialogFragments
 import com.ichi2.anki.utils.ext.sharedPrefs
 import com.ichi2.anki.utils.ext.showDialogFragment
 import com.ichi2.anki.withProgress
 import com.ichi2.annotations.NeedsTest
-import com.ichi2.libanki.Consts
-import com.ichi2.libanki.Consts.DynPriority
 import com.ichi2.libanki.Deck
 import com.ichi2.libanki.DeckId
 import com.ichi2.libanki.undoableOp
@@ -85,29 +83,23 @@ import com.ichi2.utils.textAsIntOrNull
 import com.ichi2.utils.title
 import kotlinx.coroutines.runBlocking
 import kotlinx.parcelize.Parcelize
-import net.ankiweb.rsdroid.exceptions.BackendDeckIsFilteredException
-import org.json.JSONObject
 import timber.log.Timber
 
 /**
  * Implements custom studying either by:
- * 1. modifying the limits of the current selected deck for when the user has reached the daily deck limits and wishes to study more
+ * 1. modifying the limits of the current selected deck for when the user has reached the daily
+ *    deck limits and wishes to study more
  * 2. creating a filtered "Custom study deck" where a user can study outside the typical schedule
  *
  *
  * ## UI
  * [CustomStudyDialog] represents either:
- * * A [main menu][buildContextMenu], offering [methods of custom study][ContextMenuOption]:
+ * * A [main menu][buildContextMenu], offering [methods of custom study][ContextMenuOption]
  * * An [input dialog][buildInputDialog] to input additional constraints for a [ContextMenuOption]
- *   * Example: changing the number of new cards
+ *    * Example: changing the number of new cards
  *
- * #### Not Implemented
- * Anki Desktop contains the following items which are not yet implemented
- * * Study by card state or tags
- *   * New cards only
- *   * Due cards only
- *   * All review cards in random order
- *   * All cards in random order (don't reschedule)
+ * Note: when studying by tags the input dialog will also display a state selector and on user
+ * action will show one extra dialog(for actual tag selection, see [TagLimitFragment])
  *
  * ## Nomenclature
  * Filtered decks were previously known as 'dynamic' decks, and before that: 'cram' decks
@@ -119,11 +111,12 @@ import timber.log.Timber
  * * [com.ichi2.libanki.sched.Scheduler.customStudy]
  *     * [sched.proto: CustomStudyRequest](https://github.com/search?q=repo%3Aankitects%2Fanki+CustomStudyRequest+language%3A%22Protocol+Buffer%22&type=code&l=Protocol+Buffer)
  * * [https://github.com/ankitects/anki/blob/main/qt/aqt/customstudy.py](https://github.com/ankitects/anki/blob/main/qt/aqt/customstudy.py)
+ * * [https://github.com/ankitects/anki/blob/main/qt/aqt/taglimit](https://github.com/ankitects/anki/blob/main/qt/aqt/taglimit.py)
+ *
+ * @see TagLimitFragment
  */
 @KotlinCleanup("remove 'runBlocking' calls'")
-class CustomStudyDialog :
-    AnalyticsDialogFragment(),
-    TagsDialogListener {
+class CustomStudyDialog : AnalyticsDialogFragment() {
     /** ID of the [Deck] which this dialog was created for */
     private val dialogDeckId: DeckId
         get() = requireArguments().getLong(ARG_DID)
@@ -135,12 +128,39 @@ class CustomStudyDialog :
     private val selectedSubDialog: ContextMenuOption?
         get() = requireArguments().getNullableInt(ARG_SUB_DIALOG_ID)?.let { ContextMenuOption.entries[it] }
 
+    private val selectedStatePosition: Int
+        get() =
+            dialog
+                ?.findViewById<Spinner>(R.id.cards_state_selector)
+                ?.selectedItemPosition ?: AdapterView.INVALID_POSITION
+    private val userInputValue: Int?
+        get() =
+            dialog
+                ?.findViewById<EditText>(R.id.custom_study_details_edittext2)
+                ?.textAsIntOrNull()
+
     /** @see CustomStudyDefaults */
     private lateinit var defaults: CustomStudyDefaults
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        registerFragmentResultReceiver()
+        parentFragmentManager.setFragmentResultListener(REQUEST_CUSTOM_STUDY_TAGS, this) { _, bundle ->
+            val tagsToInclude = bundle.getStringArrayList(KEY_INCLUDED_TAGS) ?: emptyList<String>()
+            val tagsToExclude = bundle.getStringArrayList(KEY_EXCLUDED_TAGS) ?: emptyList<String>()
+            val option = selectedSubDialog ?: return@setFragmentResultListener
+            if (selectedStatePosition == AdapterView.INVALID_POSITION) return@setFragmentResultListener
+            val kind = CustomStudyCardState.entries[selectedStatePosition].kind
+            val cardsAmount = userInputValue ?: 100 // the default value
+            requireActivity().launchCatchingTask {
+                withProgress {
+                    try {
+                        customStudy(option, cardsAmount, kind, tagsToInclude, tagsToExclude)
+                    } finally {
+                        requireActivity().dismissAllDialogFragments()
+                    }
+                }
+            }
+        }
     }
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
@@ -159,38 +179,13 @@ class CustomStudyDialog :
     }
 
     /**
-     * Handles selecting an item from the main menu of the dialog
+     * Continues the custom study process by showing an input dialog where the user can enter an
+     * amount specific to that type of custom study(eg. cards, days etc).
      */
-    private fun onMenuItemSelected(item: ContextMenuOption) =
-        launchCatchingTask {
-            when (item) {
-                STUDY_TAGS -> {
-            /*
-             * This is a special Dialog for CUSTOM STUDY, where instead of only collecting a
-             * number, it is necessary to collect a list of tags. This case handles the creation
-             * of that Dialog.
-             */
-                    val dialogFragment =
-                        TagsDialog().withArguments(
-                            context = requireContext(),
-                            type = TagsDialog.DialogType.CUSTOM_STUDY_TAGS,
-                            checkedTags = ArrayList(),
-                            allTags = ArrayList(withCol { tags.byDeck(dialogDeckId) }),
-                        )
-                    requireActivity().showDialogFragment(dialogFragment)
-                }
-                EXTEND_NEW,
-                EXTEND_REV,
-                STUDY_FORGOT,
-                STUDY_AHEAD,
-                STUDY_PREVIEW,
-                -> {
-                    // User asked for a standard custom study option
-                    val dialog: CustomStudyDialog = createInstance(dialogDeckId, item)
-                    requireActivity().showDialogFragment(dialog)
-                }
-            }
-        }
+    private fun onMenuItemSelected(item: ContextMenuOption) {
+        val dialog: CustomStudyDialog = createInstance(dialogDeckId, item)
+        requireActivity().showDialogFragment(dialog)
+    }
 
     private fun buildContextMenu(): AlertDialog {
         val customMenuView = ScrollView(requireContext())
@@ -286,11 +281,18 @@ class CustomStudyDialog :
 
         // Set material dialog parameters
         @Suppress("RedundantValueArgument") // click = null
+        val horizontalPadding = 32.dp.toPx(requireContext())
+        val verticalPadding = 16.dp.toPx(requireContext())
         val dialog =
             AlertDialog
                 .Builder(requireActivity())
-                .customView(view = v, paddingStart = 64, paddingEnd = 64, paddingTop = 32, paddingBottom = 32)
-                .positiveButton(text = positiveBtnLabel, click = null)
+                .customView(
+                    view = v,
+                    paddingStart = horizontalPadding,
+                    paddingEnd = horizontalPadding,
+                    paddingTop = verticalPadding,
+                    paddingBottom = verticalPadding,
+                ).positiveButton(text = positiveBtnLabel, click = null)
                 .negativeButton(R.string.dialog_cancel) {
                     requireActivity().dismissAllDialogFragments()
                 }.create()
@@ -313,12 +315,21 @@ class CustomStudyDialog :
                         allowSubmit = true
                         return@setOnClickListener
                     }
-
+                if (contextMenuOption == STUDY_TAGS) {
+                    // mark allowSubmit as true because, if the user cancels TagLimitFragment, when
+                    // we come back we wouldn't be able to trigger again TagLimitFragment
+                    allowSubmit = true
+                    val tagsSelectionDialog = TagLimitFragment.newInstance(dialogDeckId)
+                    tagsSelectionDialog.show(parentFragmentManager, TagLimitFragment.TAG)
+                    return@setOnClickListener
+                }
                 requireActivity().launchCatchingTask {
-                    try {
-                        customStudy(contextMenuOption, n)
-                    } finally {
-                        requireActivity().dismissAllDialogFragments()
+                    withProgress {
+                        try {
+                            customStudy(contextMenuOption, n)
+                        } finally {
+                            requireActivity().dismissAllDialogFragments()
+                        }
                     }
                 }
             }
@@ -333,6 +344,8 @@ class CustomStudyDialog :
         return dialog
     }
 
+    // TODO cram kind and the included/excluded tags lists are only relevant for STUDY_TAGS and
+    //  should be included in the option to not leak in the method's api
     private suspend fun customStudy(
         contextMenuOption: ContextMenuOption,
         userEntry: Int,
@@ -385,37 +398,6 @@ class CustomStudyDialog :
         }
     }
 
-    /**
-     * Gathers the final selection of tags and type of cards,
-     * Generates the search screen for the custom study deck.
-     */
-    @NeedsTest("14537: limit to particular tags")
-    override fun onSelectedTags(
-        selectedTags: List<String>,
-        indeterminateTags: List<String>,
-        stateFilter: CardStateFilter,
-    ) {
-        val sb = StringBuilder(stateFilter.toSearch)
-        val arr: MutableList<String?> = ArrayList(selectedTags.size)
-        if (selectedTags.isNotEmpty()) {
-            for (tag in selectedTags) {
-                arr.add("tag:\"$tag\"")
-            }
-            sb.append("(").append(arr.joinToString(" or ")).append(")")
-        }
-        activity?.launchCatchingTask {
-            withProgress {
-                createTagsCustomStudySession(
-                    arrayOf(
-                        sb.toString(),
-                        Consts.DYN_MAX_SIZE,
-                        Consts.DYN_RANDOM,
-                    ),
-                )
-            }
-        }
-    }
-
     /** Line 1 of the number entry dialog */
     private val text1: String
         get() =
@@ -455,70 +437,13 @@ class CustomStudyDialog :
                 STUDY_FORGOT -> prefs.getInt("forgottenDays", 1).toString()
                 STUDY_AHEAD -> prefs.getInt("aheadDays", 1).toString()
                 STUDY_PREVIEW -> prefs.getInt("previewDays", 1).toString()
+                // currently(as of Anki 25.02) not upstream
                 STUDY_TAGS -> prefs.getInt("amountOfCards", 100).toString()
                 null,
                 -> ""
             }
         }
 
-    /**
-     * Create a custom study session
-     * @param terms search terms
-     */
-    private suspend fun createTagsCustomStudySession(terms: Array<Any>) {
-        val dyn: Deck
-
-        val deckToStudyName = withCol { decks.name(dialogDeckId) }
-        val customStudyDeck = resources.getString(R.string.custom_study_deck_name)
-        val cur = withCol { decks.byName(customStudyDeck) }
-        if (cur != null) {
-            Timber.i("Found deck: '%s'", customStudyDeck)
-            if (cur.isNormal) {
-                Timber.w("Deck: '%s' was non-dynamic", customStudyDeck)
-                showThemedToast(requireContext(), getString(R.string.custom_study_deck_exists), true)
-                return
-            } else {
-                Timber.i("Emptying dynamic deck '%s' for custom study", customStudyDeck)
-                // safe to empty
-                withCol { sched.emptyDyn(cur.getLong("id")) }
-                // reuse; don't delete as it may have children
-                dyn = cur
-                withCol { decks.select(cur.getLong("id")) }
-            }
-        } else {
-            Timber.i("Creating Dynamic Deck '%s' for custom study", customStudyDeck)
-            dyn =
-                try {
-                    withCol { decks.get(decks.newFiltered(customStudyDeck))!! }
-                } catch (ex: BackendDeckIsFilteredException) {
-                    showThemedToast(requireActivity(), ex.localizedMessage ?: ex.message ?: "", true)
-                    return
-                }
-        }
-        // and then set various options
-        dyn.put("delays", JSONObject.NULL)
-        val ar = dyn.getJSONArray("terms")
-        ar.getJSONArray(0).put(0, """deck:"$deckToStudyName" ${terms[0]}""")
-        ar.getJSONArray(0).put(1, terms[1])
-        @DynPriority val priority = terms[2] as Int
-        ar.getJSONArray(0).put(2, priority)
-        dyn.put("resched", true)
-        // Rebuild the filtered deck
-        Timber.i("Rebuilding Custom Study Deck")
-        // PERF: Should be in background
-        withCol { decks.save(dyn) }
-        Timber.d("Rebuilding dynamic deck...")
-        withCol { sched.rebuildDyn(decks.selected()) }
-        setFragmentResult(
-            CustomStudyAction.REQUEST_KEY,
-            bundleOf(
-                CustomStudyAction.BUNDLE_KEY to CustomStudyAction.CUSTOM_STUDY_SESSION.ordinal,
-            ),
-        )
-        // Hide the dialogs (required due to a DeckPicker issue)
-        requireActivity().dismissAllDialogFragments()
-    }
-
     /**
      * Represents actions for managing custom study sessions and extending study limits.
      * These actions are passed between fragments and activities via the FragmentResult API.
@@ -563,7 +488,7 @@ class CustomStudyDialog :
         STUDY_PREVIEW({ TR.customStudyPreviewNewCards() }),
 
         /** Limit to particular tags */
-        STUDY_TAGS({ getString(R.string.custom_study_limit_tags) }),
+        STUDY_TAGS({ TR.customStudyStudyByCardStateOrTag() }),
     }
 
     @Parcelize
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/IncludedExcludedTagsAdapter.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/IncludedExcludedTagsAdapter.kt
new file mode 100644
index 000000000000..e6b21199c081
--- /dev/null
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/IncludedExcludedTagsAdapter.kt
@@ -0,0 +1,143 @@
+/****************************************************************************************
+ * Copyright (c) 2025 lukstbit <52494258+lukstbit@users.noreply.github.com>             *
+ *                                                                                      *
+ * This program is free software; you can redistribute it and/or modify it under        *
+ * the terms of the GNU General Public License as published by the Free Software        *
+ * Foundation; either version 3 of the License, or (at your option) any later           *
+ * version.                                                                             *
+ *                                                                                      *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY      *
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A      *
+ * PARTICULAR PURPOSE. See the GNU General Public License for more details.             *
+ *                                                                                      *
+ * You should have received a copy of the GNU General Public License along with         *
+ * this program.  If not, see <http://www.gnu.org/licenses/>.                           *
+ ****************************************************************************************/
+package com.ichi2.anki.dialogs.customstudy
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.graphics.Color
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.annotation.ColorRes
+import androidx.recyclerview.widget.RecyclerView
+import anki.scheduler.CustomStudyDefaultsResponse
+import com.ichi2.anki.R
+import com.ichi2.anki.dialogs.customstudy.IncludedExcludedTagsAdapter.TagsSelectionMode.Exclude
+import com.ichi2.anki.dialogs.customstudy.IncludedExcludedTagsAdapter.TagsSelectionMode.Include
+import com.ichi2.anki.utils.ext.findViewById
+
+/**
+ * Shows a simple list of tags from which the user can select for a custom study session. For
+ * simplicity this adapter is used for both types of lists.
+ *
+ * @param mode determines how the tags in the list backing this adapter are to be handled(either as
+ * included or excluded tags for the custom study)
+ *
+ * @see TagLimitFragment
+ * @see TagIncludedExcluded
+ */
+@SuppressLint("UseKtx") // properties initialization issues when using the extension function
+class IncludedExcludedTagsAdapter(
+    context: Context,
+    val mode: TagsSelectionMode,
+) : RecyclerView.Adapter<IncludedExcludedTagsAdapter.RequireExcludeTagsViewHolder>() {
+    private val inflater = LayoutInflater.from(context)
+    var tags: MutableList<TagIncludedExcluded> = mutableListOf()
+        set(value) {
+            field = value
+            notifyDataSetChanged()
+        }
+
+    /**
+     * Included tags are enabled only if the relevant checkbox is checked.
+     */
+    var isEnabled = false
+        set(value) {
+            field = value
+            notifyDataSetChanged()
+        }
+
+    /** Default background for a tag that is not selected. */
+    private val selectableItemBackground: Int
+
+    /** Background color for a tag that is selected(references R.attr.colorPrimary). */
+    // TODO implement a ripple effect or combine the two backgrounds into one background drawable
+    @ColorRes
+    private val selectedItemBackground: Int
+
+    init {
+        val ta =
+            context.obtainStyledAttributes(
+                intArrayOf(android.R.attr.selectableItemBackground, com.google.android.material.R.attr.colorPrimary),
+            )
+        selectableItemBackground = ta.getResourceId(0, 0)
+        selectedItemBackground = ta.getColor(1, Color.BLUE)
+        ta.recycle()
+    }
+
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ): RequireExcludeTagsViewHolder =
+        RequireExcludeTagsViewHolder(
+            inflater.inflate(
+                R.layout.item_require_exclude_tag,
+                parent,
+                false,
+            ),
+        )
+
+    override fun getItemCount(): Int = tags.size
+
+    override fun onBindViewHolder(
+        holder: RequireExcludeTagsViewHolder,
+        position: Int,
+    ) {
+        val model = tags[position]
+        holder.tagView.text = model.userFacingLabel
+        val isSelected =
+            when (mode) {
+                Include -> model.isIncluded
+                Exclude -> model.isExcluded
+            }
+        if (isSelected) {
+            holder.tagView.setBackgroundColor(selectedItemBackground)
+        } else {
+            holder.tagView.setBackgroundResource(selectableItemBackground)
+        }
+        // "included" tags are allowed only if the relevant checkbox is checked
+        holder.tagView.isEnabled = !(mode == Include && !isEnabled)
+        holder.tagView.setOnClickListener {
+            when (mode) {
+                Include -> tags[position].isIncluded = !tags[position].isIncluded
+                Exclude -> tags[position].isExcluded = !tags[position].isExcluded
+            }
+            notifyDataSetChanged()
+        }
+    }
+
+    inner class RequireExcludeTagsViewHolder(
+        rowView: View,
+    ) : RecyclerView.ViewHolder(rowView) {
+        val tagView: TextView = findViewById(R.id.tag)
+    }
+
+    enum class TagsSelectionMode {
+        Include,
+        Exclude,
+    }
+}
+
+/** @see [CustomStudyDefaultsResponse.Tag] */
+data class TagIncludedExcluded(
+    val name: String,
+    var isIncluded: Boolean = false,
+    var isExcluded: Boolean = false,
+) {
+    val userFacingLabel: String
+        get() = name.replace("_", " ")
+}
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/TagLimitFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/TagLimitFragment.kt
new file mode 100644
index 000000000000..7505d6a2534f
--- /dev/null
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/TagLimitFragment.kt
@@ -0,0 +1,168 @@
+/****************************************************************************************
+ * Copyright (c) 2025 lukstbit <52494258+lukstbit@users.noreply.github.com>             *
+ *                                                                                      *
+ * This program is free software; you can redistribute it and/or modify it under        *
+ * the terms of the GNU General Public License as published by the Free Software        *
+ * Foundation; either version 3 of the License, or (at your option) any later           *
+ * version.                                                                             *
+ *                                                                                      *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY      *
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A      *
+ * PARTICULAR PURPOSE. See the GNU General Public License for more details.             *
+ *                                                                                      *
+ * You should have received a copy of the GNU General Public License along with         *
+ * this program.  If not, see <http://www.gnu.org/licenses/>.                           *
+ ****************************************************************************************/
+package com.ichi2.anki.dialogs.customstudy
+
+import android.app.Dialog
+import android.content.Context
+import android.os.Bundle
+import android.widget.CheckBox
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.appcompat.app.AlertDialog
+import androidx.constraintlayout.widget.Group
+import androidx.core.os.bundleOf
+import androidx.core.view.isVisible
+import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.setFragmentResult
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.RecyclerView
+import com.ichi2.anki.CollectionManager.TR
+import com.ichi2.anki.CollectionManager.withCol
+import com.ichi2.anki.R
+import com.ichi2.anki.dialogs.customstudy.IncludedExcludedTagsAdapter.TagsSelectionMode.Exclude
+import com.ichi2.anki.dialogs.customstudy.IncludedExcludedTagsAdapter.TagsSelectionMode.Include
+import com.ichi2.anki.snackbar.showSnackbar
+import com.ichi2.anki.ui.internationalization.toSentenceCase
+import com.ichi2.libanki.DeckId
+import com.ichi2.utils.customView
+import com.ichi2.utils.negativeButton
+import com.ichi2.utils.positiveButton
+import com.ichi2.utils.title
+import kotlinx.coroutines.launch
+
+/**
+ * Fragment that allows the user to select tags to include and/or exclude for the custom study
+ * session that is being created. Similar to the desktop TagLimit class.
+ * https://github.com/ankitects/anki/blob/main/qt/aqt/taglimit.py#L17
+ *
+ * Will return, as a fragment result, two lists of tags(as Strings) representing the included and
+ * excluded tags for custom studying.
+ *
+ * @see CustomStudyDialog
+ */
+class TagLimitFragment : DialogFragment() {
+    private val loadingViews: Group?
+        get() = dialog?.findViewById(R.id.loading_views_group)
+    private val contentViews: LinearLayout?
+        get() = dialog?.findViewById(R.id.content_views)
+    private val deckId
+        get() = requireArguments().getLong(ARG_DECK_ID)
+    private lateinit var tagsIncludedAdapter: IncludedExcludedTagsAdapter
+    private lateinit var tagsExcludedAdapter: IncludedExcludedTagsAdapter
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        tagsIncludedAdapter = IncludedExcludedTagsAdapter(context, Include)
+        tagsExcludedAdapter = IncludedExcludedTagsAdapter(context, Exclude)
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val dialogView = layoutInflater.inflate(R.layout.fragment_tag_limit, null)
+        dialogView.findViewById<RecyclerView>(R.id.tags_included)?.adapter = tagsIncludedAdapter
+        dialogView.findViewById<RecyclerView>(R.id.tags_excluded)?.adapter = tagsExcludedAdapter
+        val includeCheck =
+            dialogView.findViewById<CheckBox>(R.id.tag_selection_require_check).apply {
+                text = TR.customStudyRequireOneOrMoreOfThese()
+                setOnCheckedChangeListener { _, isChecked ->
+                    tagsIncludedAdapter.isEnabled = isChecked
+                }
+            }
+        dialogView.findViewById<TextView>(R.id.tag_selection_exclude_label).text =
+            TR.customStudySelectTagsToExclude()
+        val title =
+            TR
+                .customStudySelectiveStudy()
+                .toSentenceCase(requireContext(), R.string.sentence_selective_study)
+        val dialog =
+            AlertDialog
+                .Builder(requireContext())
+                .title(text = title)
+                .customView(dialogView)
+                .negativeButton(R.string.dialog_cancel)
+                .positiveButton(R.string.dialog_ok, null)
+                .create()
+
+        var allowSubmit = true
+        // we set the listener here so 'ok' doesn't immediately close the dialog because we don't
+        // allow more than 100 tags combined to be selected. In this situation we don't close the
+        // dialog(so the user can still act to fix this) and show a Snackbar
+        dialog.setOnShowListener {
+            dialog.positiveButton.setOnClickListener {
+                // prevent race conditions
+                if (!allowSubmit) return@setOnClickListener
+                allowSubmit = false
+                // take the selection only if the require checkbox is currently checked
+                val tagsToInclude =
+                    if (includeCheck.isChecked) {
+                        tagsIncludedAdapter.tags.filter { it.isIncluded }.map { it.name }
+                    } else {
+                        emptyList()
+                    }
+                val tagsToExclude =
+                    tagsExcludedAdapter.tags.filter { it.isExcluded }.map { it.name }
+                if (tagsToInclude.size + tagsToExclude.size > 100) {
+                    showSnackbar(TR.errors100TagsMax().withCollapsedWhitespace())
+                    return@setOnClickListener
+                }
+                // send the selection to the custom study dialog to setup the session
+                setFragmentResult(
+                    REQUEST_CUSTOM_STUDY_TAGS,
+                    bundleOf(
+                        KEY_INCLUDED_TAGS to tagsToInclude,
+                        KEY_EXCLUDED_TAGS to tagsToExclude,
+                    ),
+                )
+                dismiss()
+            }
+        }
+        return dialog
+    }
+
+    // https://github.com/ankitects/anki/blob/main/pylib/anki/lang.py#L243
+    private fun String.withCollapsedWhitespace(): String = replace("\\s+", " ")
+
+    override fun onStart() {
+        super.onStart()
+        lifecycleScope.launch {
+            loadingViews?.isVisible = true
+            contentViews?.isVisible = false
+            val customStudyDefaults = withCol { sched.customStudyDefaults(deckId) }
+            dialog?.findViewById<CheckBox>(R.id.tag_selection_require_check)?.isChecked =
+                customStudyDefaults.tagsList.any { tag -> tag.include }
+            val tags =
+                customStudyDefaults.tagsList.map { backendTag ->
+                    TagIncludedExcluded(backendTag.name, backendTag.include, backendTag.exclude)
+                }
+            tagsIncludedAdapter.tags = tags.toMutableList() // make a copy
+            tagsExcludedAdapter.tags = tags.toMutableList() // make a copy
+            loadingViews?.isVisible = false
+            contentViews?.isVisible = true
+        }
+    }
+
+    companion object {
+        const val TAG = "TagLimitFragment"
+        const val REQUEST_CUSTOM_STUDY_TAGS = "request_custom_study_tags"
+        const val KEY_INCLUDED_TAGS = "key_included_tags"
+        const val KEY_EXCLUDED_TAGS = "key_excluded_tags"
+        private const val ARG_DECK_ID = "arg_deck_id"
+
+        fun newInstance(deckId: DeckId) =
+            TagLimitFragment().apply {
+                arguments = bundleOf(ARG_DECK_ID to deckId)
+            }
+    }
+}
diff --git a/AnkiDroid/src/main/res/drawable/list_border.xml b/AnkiDroid/src/main/res/drawable/list_border.xml
new file mode 100644
index 000000000000..fd5253ff5970
--- /dev/null
+++ b/AnkiDroid/src/main/res/drawable/list_border.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke android:width="1dp" android:color="?attr/currentDeckBackgroundColor"/>
+</shape>
\ No newline at end of file
diff --git a/AnkiDroid/src/main/res/layout-land/fragment_tag_limit.xml b/AnkiDroid/src/main/res/layout-land/fragment_tag_limit.xml
new file mode 100644
index 000000000000..52deae2745f6
--- /dev/null
+++ b/AnkiDroid/src/main/res/layout-land/fragment_tag_limit.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~  Copyright (c) 2025 lukstbit <52494258+lukstbit@users.noreply.github.com>
+  ~
+  ~  This program is free software; you can redistribute it and/or modify it under
+  ~  the terms of the GNU General Public License as published by the Free Software
+  ~  Foundation; either version 3 of the License, or (at your option) any later
+  ~  version.
+  ~
+  ~  This program is distributed in the hope that it will be useful, but WITHOUT ANY
+  ~  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+  ~  PARTICULAR PURPOSE. See the GNU General Public License for more details.
+  ~
+  ~  You should have received a copy of the GNU General Public License along with
+  ~  this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="16dp"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <LinearLayout
+        android:id="@+id/content_views"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_marginEnd="8dp"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <CheckBox
+                android:id="@+id/tag_selection_require_check"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:checked="false"
+                tools:text="Require one or more of these tags:"/>
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/tags_included"
+                android:background="@drawable/list_border"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:scrollbars="vertical"
+                android:minHeight="?attr/listPreferredItemHeightSmall"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                android:layout_marginTop="4dp"
+                android:layout_marginStart="6dp"
+                tools:listitem="@layout/item_require_exclude_tag"/>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+            <TextView
+                android:id="@+id/tag_selection_exclude_label"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:textAppearance="?textAppearanceTitleMedium"
+                tools:text="Select tags to exclude:"/>
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/tags_excluded"
+                android:background="@drawable/list_border"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:scrollbars="vertical"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                android:minHeight="?attr/listPreferredItemHeightSmall"
+                android:layout_marginTop="8dp"
+                tools:listitem="@layout/item_require_exclude_tag"/>
+        </LinearLayout>
+    </LinearLayout>
+
+    <com.google.android.material.progressindicator.CircularProgressIndicator
+        android:id="@+id/loading_indicator"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:indeterminate="true"
+        style="@style/Widget.Material3.CircularProgressIndicator"
+        app:layout_constraintTop_toTopOf="@id/loading_label"
+        app:layout_constraintBottom_toBottomOf="@id/loading_label"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/loading_label"
+        app:layout_constraintHorizontal_chainStyle="packed"/>
+
+    <TextView
+        android:id="@+id/loading_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginVertical="24dp"
+        android:layout_marginStart="12dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/loading_indicator"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:text="@string/custom_study_loading_tags"/>
+
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/loading_views_group"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:constraint_referenced_ids="loading_indicator,loading_label"/>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/AnkiDroid/src/main/res/layout/fragment_tag_limit.xml b/AnkiDroid/src/main/res/layout/fragment_tag_limit.xml
new file mode 100644
index 000000000000..229355ba4404
--- /dev/null
+++ b/AnkiDroid/src/main/res/layout/fragment_tag_limit.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~  Copyright (c) 2025 lukstbit <52494258+lukstbit@users.noreply.github.com>
+  ~
+  ~  This program is free software; you can redistribute it and/or modify it under
+  ~  the terms of the GNU General Public License as published by the Free Software
+  ~  Foundation; either version 3 of the License, or (at your option) any later
+  ~  version.
+  ~
+  ~  This program is distributed in the hope that it will be useful, but WITHOUT ANY
+  ~  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+  ~  PARTICULAR PURPOSE. See the GNU General Public License for more details.
+  ~
+  ~  You should have received a copy of the GNU General Public License along with
+  ~  this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="16dp"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <LinearLayout
+        android:id="@+id/content_views"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <CheckBox
+            android:id="@+id/tag_selection_require_check"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:checked="false"
+            tools:text="Require one or more of these tags:"/>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/tags_included"
+            android:background="@drawable/list_border"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:scrollbars="vertical"
+            android:layout_marginHorizontal="6dp"
+            android:minHeight="?attr/listPreferredItemHeightSmall"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            android:layout_marginTop="4dp"
+            tools:listitem="@layout/item_require_exclude_tag"/>
+
+        <TextView
+            android:id="@+id/tag_selection_exclude_label"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="48dp"
+            android:gravity="center_vertical"
+            android:paddingStart="6dp"
+            android:textAppearance="?textAppearanceTitleMedium"
+            tools:text="Select tags to exclude:"/>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/tags_excluded"
+            android:background="@drawable/list_border"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:scrollbars="vertical"
+            android:layout_marginHorizontal="6dp"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            android:minHeight="?attr/listPreferredItemHeightSmall"
+            android:layout_marginTop="4dp"
+            tools:listitem="@layout/item_require_exclude_tag"/>
+    </LinearLayout>
+
+    <com.google.android.material.progressindicator.CircularProgressIndicator
+        android:id="@+id/loading_indicator"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:indeterminate="true"
+        style="@style/Widget.Material3.CircularProgressIndicator"
+        app:layout_constraintTop_toTopOf="@id/loading_label"
+        app:layout_constraintBottom_toBottomOf="@id/loading_label"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/loading_label"
+        app:layout_constraintHorizontal_chainStyle="packed"/>
+
+    <TextView
+        android:id="@+id/loading_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginVertical="24dp"
+        android:layout_marginStart="12dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/loading_indicator"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:text="@string/custom_study_loading_tags"/>
+
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/loading_views_group"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:constraint_referenced_ids="loading_indicator,loading_label"/>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/AnkiDroid/src/main/res/layout/item_require_exclude_tag.xml b/AnkiDroid/src/main/res/layout/item_require_exclude_tag.xml
new file mode 100644
index 000000000000..810ebfed87ca
--- /dev/null
+++ b/AnkiDroid/src/main/res/layout/item_require_exclude_tag.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/tag"
+    android:minHeight="?attr/listPreferredItemHeightSmall"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:gravity="center_vertical"
+    android:paddingHorizontal="8dp"
+    android:background="?attr/selectableItemBackground"
+    tools:text="Tag entry"/>
diff --git a/AnkiDroid/src/main/res/layout/styled_custom_study_details_dialog.xml b/AnkiDroid/src/main/res/layout/styled_custom_study_details_dialog.xml
index d795bb7b774b..6a88fffe73cf 100644
--- a/AnkiDroid/src/main/res/layout/styled_custom_study_details_dialog.xml
+++ b/AnkiDroid/src/main/res/layout/styled_custom_study_details_dialog.xml
@@ -56,8 +56,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dip"
-        android:layout_marginLeft="4dip"
-        android:layout_marginRight="4dip"
         android:layout_weight="1"
         android:gravity="start|bottom"
         android:inputType="number"
diff --git a/AnkiDroid/src/main/res/values/01-core.xml b/AnkiDroid/src/main/res/values/01-core.xml
index 9884c5152e72..3150b13299fe 100644
--- a/AnkiDroid/src/main/res/values/01-core.xml
+++ b/AnkiDroid/src/main/res/values/01-core.xml
@@ -103,8 +103,6 @@
     <string name="empty_cram_label" maxLength="28">Empty</string>
     <string name="create_subdeck">Create subdeck</string>
     <string name="empty_filtered_deck">Emptying filtered deck…</string>
-    <string name="custom_study_deck_name">Custom study session</string>
-    <string name="custom_study_deck_exists">Rename the existing custom study deck first</string>
     <string name="search_deck" comment="Deck search for selecting it">Deck Search</string>
     <string name="empty_deck">This deck is empty</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Deck Search</string>
diff --git a/AnkiDroid/src/main/res/values/02-strings.xml b/AnkiDroid/src/main/res/values/02-strings.xml
index ada62bdaac83..38ba77b4fd44 100644
--- a/AnkiDroid/src/main/res/values/02-strings.xml
+++ b/AnkiDroid/src/main/res/values/02-strings.xml
@@ -62,7 +62,8 @@
     <string name="filter_by_flags" maxLength="41">Flags</string>
 
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limit to particular tags</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="other">+%d buried</item>
     </plurals>
diff --git a/AnkiDroid/src/main/res/values/sentence-case.xml b/AnkiDroid/src/main/res/values/sentence-case.xml
index 97334e9ba59b..ae94c680ff03 100644
--- a/AnkiDroid/src/main/res/values/sentence-case.xml
+++ b/AnkiDroid/src/main/res/values/sentence-case.xml
@@ -48,5 +48,6 @@ undoActionUndone()
     <string name="sentence_all_fields">All fields</string>
     <string name="sentence_check_media_delete_unused">Delete unused</string>
     <string name="sentence_choose_tags">Choose tags</string>
+    <string name="sentence_selective_study">Selective study</string>
 
 </resources>
\ No newline at end of file

From 8c14a1438df8a54028ba3388659956d5ca9663c4 Mon Sep 17 00:00:00 2001
From: lukstbit <52494258+lukstbit@users.noreply.github.com>
Date: Fri, 14 Feb 2025 12:18:21 +0200
Subject: [PATCH 163/200] Remove unused code in TagsDialog related to custom
 studying

---
 .../com/ichi2/anki/dialogs/tags/TagsDialog.kt |  6 --
 .../ichi2/anki/dialogs/tags/TagsDialogTest.kt | 75 -------------------
 2 files changed, 81 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/tags/TagsDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/tags/TagsDialog.kt
index 011d7b2b8099..9ea5e4df4dcf 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/tags/TagsDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/tags/TagsDialog.kt
@@ -45,7 +45,6 @@ import com.ichi2.utils.positiveButton
 import com.ichi2.utils.show
 import com.ichi2.utils.title
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import org.apache.commons.io.FileUtils
 import timber.log.Timber
@@ -66,11 +65,6 @@ class TagsDialog : AnalyticsDialogFragment {
          * Filter notes by tags
          */
         FILTER_BY_TAG,
-
-        /**
-         * A custom study session filtered by tags
-         */
-        CUSTOM_STUDY_TAGS,
     }
 
     private var type: DialogType? = null
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsDialogTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsDialogTest.kt
index 008e7ea19bf9..cd0cc79a3e12 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsDialogTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsDialogTest.kt
@@ -15,24 +15,17 @@
  */
 package com.ichi2.anki.dialogs.tags
 
-import android.content.DialogInterface
 import android.os.Bundle
-import android.view.View
 import android.widget.EditText
-import android.widget.RadioGroup
 import androidx.appcompat.app.AlertDialog
 import androidx.core.os.BundleCompat
 import androidx.fragment.app.testing.FragmentScenario
 import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.LifecycleRegistry
 import androidx.recyclerview.widget.RecyclerView
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.R
 import com.ichi2.anki.RobolectricTest
 import com.ichi2.anki.dialogs.utils.AnKingTags
-import com.ichi2.anki.model.CardStateFilter
-import com.ichi2.compat.CompatHelper.Companion.getSerializableCompat
 import com.ichi2.testutils.HamcrestUtils.containsInAnyOrder
 import com.ichi2.testutils.ParametersUtils
 import com.ichi2.testutils.RecyclerViewUtils
@@ -44,68 +37,10 @@ import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.Mockito
-import org.mockito.kotlin.whenever
 import timber.log.Timber
-import java.util.concurrent.atomic.AtomicReference
 
 @RunWith(AndroidJUnit4::class)
 class TagsDialogTest : RobolectricTest() {
-    @Test
-    fun testTagsDialogCustomStudyOptionInterface() {
-        val type = TagsDialog.DialogType.CUSTOM_STUDY_TAGS
-        val allTags = listOf("1", "2", "3", "4")
-        val args =
-            TagsDialog(ParametersUtils.whatever())
-                .withTestArguments(type, ArrayList(), allTags)
-                .requireArguments()
-        val mockListener = Mockito.mock(TagsDialogListener::class.java)
-        val factory = TagsDialogFactory(mockListener)
-        runTagsDialogScenario(args, factory) { f: TagsDialog ->
-            val dialog = f.dialog as AlertDialog?
-            assertThat(dialog, IsNull.notNullValue())
-
-            val optionsGroup = dialog!!.findViewById<RadioGroup>(R.id.tags_dialog_options_radiogroup)!!
-            Assert.assertEquals(optionsGroup.visibility.toLong(), View.VISIBLE.toLong())
-            val expectedOption = CardStateFilter.NEW
-            optionsGroup.getChildAt(1).performClick()
-            dialog.getButton(DialogInterface.BUTTON_POSITIVE).callOnClick()
-            advanceRobolectricLooper()
-            Mockito.verify(mockListener, Mockito.times(1)).onSelectedTags(ArrayList(), ArrayList(), expectedOption)
-        }
-    }
-
-    @Test
-    fun testTagsDialogCustomStudyOptionFragmentAPI() {
-        val type = TagsDialog.DialogType.CUSTOM_STUDY_TAGS
-        val allTags = listOf("1", "2", "3", "4")
-        val args =
-            TagsDialog(ParametersUtils.whatever())
-                .withTestArguments(type, ArrayList(), allTags)
-                .requireArguments()
-        runTagsDialogScenario(args) { f: TagsDialog ->
-            val dialog = f.dialog as AlertDialog?
-            assertThat(dialog, IsNull.notNullValue())
-            val returnedList = AtomicReference<List<String>?>()
-            val returnedOption = AtomicReference<CardStateFilter>()
-            f.parentFragmentManager.setFragmentResultListener(
-                TagsDialogListener.ON_SELECTED_TAGS_KEY,
-                mockLifecycleOwner(),
-            ) { _: String?, bundle: Bundle ->
-                returnedList.set(bundle.getStringArrayList(TagsDialogListener.ON_SELECTED_TAGS__SELECTED_TAGS))
-                returnedOption.set(bundle.getSerializableCompat<CardStateFilter>(TagsDialogListener.ON_SELECTED_TAGS__OPTION))
-            }
-
-            val optionsGroup = dialog!!.findViewById<RadioGroup>(R.id.tags_dialog_options_radiogroup)!!
-            Assert.assertEquals(optionsGroup.visibility.toLong(), View.VISIBLE.toLong())
-            val expectedOption = CardStateFilter.DUE
-            optionsGroup.getChildAt(2).performClick()
-            dialog.getButton(DialogInterface.BUTTON_POSITIVE).callOnClick()
-            advanceRobolectricLooper()
-            ListUtil.assertListEquals(ArrayList(), returnedList.get())
-            Assert.assertEquals(expectedOption, returnedOption.get())
-        }
-    }
-
     // regression test #8762
     // test for #8763
     @Test
@@ -711,14 +646,4 @@ class TagsDialogTest : RobolectricTest() {
             }
         }
     }
-
-    companion object {
-        private fun mockLifecycleOwner(): LifecycleOwner {
-            val owner = Mockito.mock(LifecycleOwner::class.java)
-            val lifecycle = LifecycleRegistry(owner)
-            lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_RESUME)
-            whenever(owner.lifecycle).thenReturn(lifecycle)
-            return owner
-        }
-    }
 }

From fe92a688ae7f5b2a6851eaf23cd8d1bc74a1bd75 Mon Sep 17 00:00:00 2001
From: DrunkenCloud <drunkencloud99@gmail.com>
Date: Fri, 28 Mar 2025 10:41:15 +0530
Subject: [PATCH 164/200] fix: memory leak in AnkiPackageImporterFragment due
 to retained postHandler reference

fix: memory leak in AnkiPackageImporterFragment due to retained postHandler reference

fix: memory leak in AnkiPackageImporterFragment due to retained postHandler reference

fix: Memory leak caused by unhandled AnkiServer Instance on deletion and removed LeakingThis Annotation
---
 .../src/main/java/com/ichi2/anki/pages/PageFragment.kt   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/pages/PageFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/pages/PageFragment.kt
index 0235bb741718..944eff939048 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/pages/PageFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/pages/PageFragment.kt
@@ -38,13 +38,12 @@ import kotlin.reflect.KClass
 /**
  * Base class for displaying Anki HTML pages
  */
-@Suppress("LeakingThis")
 open class PageFragment(
     @LayoutRes contentLayoutId: Int = R.layout.page_fragment,
 ) : Fragment(contentLayoutId),
     PostRequestHandler {
     lateinit var webView: WebView
-    private val server = AnkiServer(this).also { it.start() }
+    private lateinit var server: AnkiServer
 
     /**
      * A loading indicator for the page. May be shown before the WebView is loaded to
@@ -103,6 +102,7 @@ open class PageFragment(
         savedInstanceState: Bundle?,
     ) {
         val pageWebViewClient = onCreateWebViewClient(savedInstanceState)
+        server = AnkiServer(this).also { it.start() }
         webView =
             view.findViewById<WebView>(R.id.webview).apply {
                 with(settings) {
@@ -151,6 +151,11 @@ open class PageFragment(
             ?: throw IllegalArgumentException("unhandled method: $methodName")
     }
 
+    override fun onDestroyView() {
+        server.stop()
+        super.onDestroyView()
+    }
+
     companion object {
         const val PATH_ARG_KEY = "path"
         const val TITLE_ARG_KEY = "title"

From e44cf811a7353eb7b4335cd2b5bf0a3ac5895889 Mon Sep 17 00:00:00 2001
From: Ashish Yadav <48384865+criticalAY@users.noreply.github.com>
Date: Wed, 2 Apr 2025 22:40:32 +0530
Subject: [PATCH 165/200] feat: allow pasting images as PNG

---
 .../java/com/ichi2/anki/MediaRegistration.kt  | 265 +++++++++---------
 .../main/java/com/ichi2/anki/NoteEditor.kt    |  46 ++-
 .../src/main/res/values/10-preferences.xml    |   2 +-
 AnkiDroid/src/main/res/values/preferences.xml |   3 +-
 .../src/main/res/xml/preferences_general.xml  |   3 +-
 5 files changed, 172 insertions(+), 147 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/MediaRegistration.kt b/AnkiDroid/src/main/java/com/ichi2/anki/MediaRegistration.kt
index da90ebf9bc82..3387c1cd15fa 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/MediaRegistration.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/MediaRegistration.kt
@@ -23,6 +23,7 @@ import android.net.Uri
 import androidx.annotation.CheckResult
 import com.ichi2.anki.multimediacard.fields.ImageField
 import com.ichi2.anki.multimediacard.fields.MediaClipField
+import com.ichi2.annotations.NeedsTest
 import com.ichi2.compat.CompatHelper
 import com.ichi2.libanki.exception.EmptyMediaException
 import com.ichi2.utils.ClipboardUtil
@@ -30,162 +31,197 @@ import com.ichi2.utils.ContentResolverUtil.getFileName
 import com.ichi2.utils.FileNameAndExtension
 import timber.log.Timber
 import java.io.File
-import java.io.FileNotFoundException
 import java.io.FileOutputStream
 import java.io.IOException
-import java.io.InputStream
-import java.lang.IllegalStateException
+
+private typealias DisplayMediaError = (MediaRegistration.MediaError) -> Unit
 
 /**
- * RegisterMediaForWebView is used for registering media in temp path,
- * this class is required in summer note class for paste image event and in visual editor activity for importing media,
- * (extracted code to avoid duplication of code).
+ * Utility class for media registration and handling errors during media paste actions.
  */
-class MediaRegistration(
-    private val context: Context,
-) {
-    // Use the same HTML if the same image is pasted multiple times.
-    private val pastedMediaCache = HashMap<String, String?>()
+object MediaRegistration {
+    /**
+     * Represents different types of media errors.
+     */
+    sealed class MediaError {
+        data object GenericError : MediaError()
+
+        class ConversionError(
+            val message: String,
+        ) : MediaError()
+
+        data object ImageTooLarge : MediaError()
+
+        data object VideoTooLarge : MediaError()
+
+        data object AudioTooLarge : MediaError()
+
+        fun toHumanReadableString(context: Context): String =
+            when (this) {
+                is GenericError -> context.getString(R.string.multimedia_editor_something_wrong)
+                is ConversionError -> context.getString(R.string.multimedia_editor_png_paste_error, message)
+                is ImageTooLarge -> context.getString(R.string.note_editor_image_too_large)
+                is VideoTooLarge -> context.getString(R.string.note_editor_video_too_large)
+                is AudioTooLarge -> context.getString(R.string.note_editor_audio_too_large)
+            }
+    }
+
+    /**
+     * Maximum allowed media file size in bytes.
+     * The limit is set to 5 MB.
+     */
+    private const val MEDIA_MAX_SIZE_BYTES = 5 * 1000 * 1000
+
+    /**
+     * Handles the paste action for media.
+     *
+     * @param context The application context.
+     * @param uri The URI of the media to be pasted.
+     * @param description The description of the clipboard content.
+     * @param pasteAsPng A flag indicating whether to convert the media to PNG format.
+     * @param showError A callback function for displaying error messages based on media error type.
+     * @return A string reference to the media if successfully processed, or null if an error occurred.
+     */
+    fun onPaste(
+        context: Context,
+        uri: Uri,
+        description: ClipDescription,
+        pasteAsPng: Boolean,
+        showError: DisplayMediaError,
+    ): String? =
+        try {
+            loadMediaIntoCollection(context, uri, description, pasteAsPng, showError)
+        } catch (ex: NullPointerException) {
+            // Tested under FB Messenger and GMail, both apps do nothing if this occurs.
+            // This typically works if the user copies again - don't know the exact cause
+
+            //  java.lang.SecurityException: Permission Denial: opening provider
+            //  org.chromium.chrome.browser.util.ChromeFileProvider from ProcessRecord{80125c 11262:com.ichi2.anki/u0a455}
+            //  (pid=11262, uid=10455) that is not exported from UID 10057
+            Timber.w(ex, "Failed to paste media")
+            showError(MediaError.GenericError)
+            null
+        } catch (ex: SecurityException) {
+            Timber.w(ex, "Failed to paste media")
+            showError(MediaError.GenericError)
+            null
+        } catch (e: Exception) {
+            // NOTE: This is happy path coding which works on Android 9.
+            CrashReportService.sendExceptionReport("File is invalid issue:8880", "RegisterMediaForWebView:onImagePaste URI of file:$uri")
+            Timber.w(e, "Failed to paste media")
+            showError(MediaError.GenericError)
+            null
+        }
+
+    /**
+     * Checks if the media file size exceeds the allowed limit.
+     *
+     * @param bytesWritten The size of the media file in bytes.
+     * @param isImage `true` if the media is an image, otherwise `false`.
+     * @param isVideo `true` if the media is a video, otherwise `false`.
+     * @param showError A callback function to display an error message if the file exceeds the size limit.
+     *                  It receives a [MediaError] type and an optional error message.
+     * @return `true` if the file size is within the allowed limit, otherwise `false`.
+     */
+    @NeedsTest("all cases should work as expected")
+    private fun checkMediaSize(
+        bytesWritten: Long,
+        isImage: Boolean,
+        isVideo: Boolean,
+        showError: DisplayMediaError,
+    ): Boolean {
+        if (bytesWritten <= MEDIA_MAX_SIZE_BYTES) return true
+
+        when {
+            isImage -> showError(MediaError.ImageTooLarge)
+            isVideo -> showError(MediaError.VideoTooLarge)
+            else -> showError(MediaError.AudioTooLarge)
+        }
+        return false
+    }
 
     /**
      * Loads media into the collection.media directory and returns a HTML reference
      * @param uri The uri of the image to load
      * @return HTML referring to the loaded image
      */
+    // TODO: remove the Android dependencies and handle them outside the method
     @Throws(IOException::class)
     fun loadMediaIntoCollection(
+        context: Context,
         uri: Uri,
         description: ClipDescription,
+        pasteAsPng: Boolean,
+        showError: DisplayMediaError,
     ): String? {
         val filename = getFileName(context.contentResolver, uri)
-        val fd = openInputStreamWithURI(uri)
         val (fileName, fileExtensionWithDot) =
             FileNameAndExtension
                 .fromString(filename)
                 ?.renameForCreateTempFile()
                 ?: throw IllegalStateException("Unable to determine valid filename")
-        var clipCopy: File
-        var bytesWritten: Long
+        var clipCopy: File = File.createTempFile(fileName, fileExtensionWithDot)
+        var bytesWritten: Long = 0
         val isImage = ClipboardUtil.hasImage(description)
         val isVideo = ClipboardUtil.hasVideo(description)
 
-        openInputStreamWithURI(uri).use { copyFd ->
-            // no conversion to jpg in cases of gif and jpg and if png image with alpha channel
-            if (shouldConvertToJPG(fileExtensionWithDot, copyFd, isImage)) {
-                clipCopy = File.createTempFile(fileName, ".jpg")
+        // Opens InputStream, copies to file, and converts to PNG if needed. Returns null on failure.
+        context.contentResolver.openInputStream(uri).use { fd ->
+            if (fd == null) return@use
+            if (pasteAsPng) {
+                clipCopy = File.createTempFile(fileName, ".png")
                 bytesWritten = CompatHelper.compat.copyFile(fd, clipCopy.absolutePath)
-                // return null if jpg conversion false.
-                if (!convertToJPG(clipCopy)) {
+                if (!convertToPNG(clipCopy, showError)) {
                     return null
                 }
             } else {
-                clipCopy = File.createTempFile(fileName, fileExtensionWithDot)
                 bytesWritten = CompatHelper.compat.copyFile(fd, clipCopy.absolutePath)
             }
         }
         val tempFilePath = clipCopy.absolutePath
+
+        val checkMediaSize = checkMediaSize(bytesWritten, isImage, isVideo, showError)
+
+        if (!checkMediaSize) {
+            File(tempFilePath).delete()
+            clipCopy.delete()
+            return null
+        }
+
         // register media for webView
         if (!registerMediaForWebView(tempFilePath)) {
+            clipCopy.delete()
             return null
         }
         Timber.d("File was %d bytes", bytesWritten)
-        if (bytesWritten > MEDIA_MAX_SIZE) {
-            Timber.w("File was too large: %d bytes", bytesWritten)
-            val message =
-                if (isImage) {
-                    context.getString(R.string.note_editor_image_too_large)
-                } else if (isVideo) {
-                    context.getString(R.string.note_editor_video_too_large)
-                } else {
-                    context.getString(R.string.note_editor_audio_too_large)
-                }
-            showThemedToast(context, message, false)
-            File(tempFilePath).delete()
-            return null
-        }
-        val field =
-            if (isImage) {
-                ImageField()
-            } else {
-                MediaClipField()
-            }
+
+        val field = if (isImage) ImageField() else MediaClipField()
+
         field.hasTemporaryMedia = true
         field.mediaPath = tempFilePath
         return field.formattedValue
     }
 
-    @Throws(FileNotFoundException::class)
-    private fun openInputStreamWithURI(uri: Uri): InputStream = context.contentResolver.openInputStream(uri)!!
-
-    private fun convertToJPG(file: File): Boolean {
+    @NeedsTest("check the output if being converted")
+    private fun convertToPNG(
+        file: File,
+        showError: DisplayMediaError,
+    ): Boolean {
         val bm = BitmapFactory.decodeFile(file.absolutePath)
         try {
             FileOutputStream(file.absolutePath).use { outStream ->
-                bm.compress(Bitmap.CompressFormat.JPEG, 100, outStream)
+                bm.compress(Bitmap.CompressFormat.PNG, 100, outStream)
                 outStream.flush()
             }
         } catch (e: IOException) {
             Timber.w("MediaRegistration : Unable to convert file to png format")
             CrashReportService.sendExceptionReport(e, "Unable to convert file to png format")
-            showThemedToast(context, context.resources.getString(R.string.multimedia_editor_png_paste_error, e.message), true)
-            return false
-        }
-        return true // successful conversion to jpg.
-    }
-
-    private fun shouldConvertToJPG(
-        fileNameExtension: String,
-        fileStream: InputStream,
-        isImage: Boolean,
-    ): Boolean {
-        if (!isImage) {
+            showError(MediaError.ConversionError(e.message ?: ""))
             return false
         }
-        if (".svg" == fileNameExtension) {
-            return false
-        }
-        if (".jpg" == fileNameExtension) {
-            return false // we are already a jpg, no conversion
-        }
-        if (".gif" == fileNameExtension) {
-            return false // gifs may have animation, conversion would ruin them
-        }
-        if (".png" == fileNameExtension && doesInputStreamContainTransparency(fileStream)) {
-            return false // pngs with transparency would be ruined by conversion
-        }
         return true
     }
 
-    fun onPaste(
-        uri: Uri,
-        description: ClipDescription,
-    ): String? =
-        try {
-            // check if cache already holds registered file or not
-            if (!pastedMediaCache.containsKey(uri.toString())) {
-                pastedMediaCache[uri.toString()] = loadMediaIntoCollection(uri, description)
-            }
-            pastedMediaCache[uri.toString()]
-        } catch (ex: NullPointerException) {
-            // Tested under FB Messenger and GMail, both apps do nothing if this occurs.
-            // This typically works if the user copies again - don't know the exact cause
-
-            //  java.lang.SecurityException: Permission Denial: opening provider
-            //  org.chromium.chrome.browser.util.ChromeFileProvider from ProcessRecord{80125c 11262:com.ichi2.anki/u0a455}
-            //  (pid=11262, uid=10455) that is not exported from UID 10057
-            Timber.w(ex, "Failed to paste media")
-            null
-        } catch (ex: SecurityException) {
-            Timber.w(ex, "Failed to paste media")
-            null
-        } catch (e: Exception) {
-            // NOTE: This is happy path coding which works on Android 9.
-            CrashReportService.sendExceptionReport("File is invalid issue:8880", "RegisterMediaForWebView:onImagePaste URI of file:$uri")
-            Timber.w(e, "Failed to paste media")
-            showThemedToast(context, context.getString(R.string.multimedia_editor_something_wrong), false)
-            null
-        }
-
     @CheckResult
     fun registerMediaForWebView(mediaPath: String?): Boolean {
         if (mediaPath == null) {
@@ -205,33 +241,4 @@ class MediaRegistration(
             false
         }
     }
-
-    companion object {
-        private const val MEDIA_MAX_SIZE = 5 * 1000 * 1000
-        private const val COLOR_GREY = 0
-        private const val COLOR_TRUE = 2
-        private const val COLOR_INDEX = 3
-        private const val COLOR_GREY_ALPHA = 4
-        private const val COLOR_TRUE_ALPHA = 6
-
-        /**
-         * given an inputStream of a file,
-         * returns true if found that it has transparency (in its header)
-         * code: https://stackoverflow.com/a/31311718/14148406
-         */
-        private fun doesInputStreamContainTransparency(inputStream: InputStream): Boolean {
-            try {
-                // skip: png signature,header chunk declaration,width,height,bitDepth :
-                inputStream.skip((12 + 4 + 4 + 4 + 1).toLong())
-                when (inputStream.read()) {
-                    COLOR_GREY_ALPHA, COLOR_TRUE_ALPHA -> return true
-                    COLOR_INDEX, COLOR_GREY, COLOR_TRUE -> return false
-                }
-                return true
-            } catch (e: Exception) {
-                Timber.w(e, "Failed to check transparency of inputStream")
-            }
-            return false
-        }
-    }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt b/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt
index 41ff2bdf50b9..6c2197727447 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt
@@ -235,7 +235,6 @@ class NoteEditor :
     private var reloadRequired = false
 
     private var fieldsLayoutContainer: LinearLayout? = null
-    private var mediaRegistration: MediaRegistration? = null
     private var tagsDialogFactory: TagsDialogFactory? = null
     private var tagsButton: AppCompatButton? = null
     private var cardsButton: AppCompatButton? = null
@@ -397,12 +396,14 @@ class NoteEditor :
             }
 
             for (uri in clip.items().map { it.uri }) {
-                try {
-                    onPaste(view as EditText, uri, description)
-                } catch (e: Exception) {
-                    Timber.w(e)
-                    CrashReportService.sendExceptionReport(e, "NoteEditor::onReceiveContent")
-                    return@OnReceiveContentListener remaining
+                lifecycleScope.launch {
+                    try {
+                        val pasteAsPng = shouldPasteAsPng()
+                        onPaste(view as EditText, uri, description, pasteAsPng)
+                    } catch (e: Exception) {
+                        Timber.w(e)
+                        CrashReportService.sendExceptionReport(e, "NoteEditor::onReceiveContent")
+                    }
                 }
             }
 
@@ -489,7 +490,6 @@ class NoteEditor :
     // ----------------------------------------------------------------------------
     override fun onCreate(savedInstanceState: Bundle?) {
         tagsDialogFactory = TagsDialogFactory(this).attachToFragmentManager<TagsDialogFactory>(parentFragmentManager)
-        mediaRegistration = MediaRegistration(requireContext())
         super.onCreate(savedInstanceState)
         fieldState.setInstanceState(savedInstanceState)
         val intent = requireActivity().intent
@@ -1688,6 +1688,9 @@ class NoteEditor :
         return note
     }
 
+    /** Determines whether pasted images should be handled as PNG format. **/
+    private suspend fun shouldPasteAsPng() = withCol { config.getBool(ConfigKey.Bool.PASTE_IMAGES_AS_PNG) }
+
     val currentFields: Fields
         get() = editorNote!!.notetype.flds
 
@@ -1734,12 +1737,16 @@ class NoteEditor :
             val editLineView = editLines[i]
             customViewIds.add(editLineView.id)
             val newEditText = editLineView.editText
-            newEditText.setPasteListener { editText: EditText?, uri: Uri?, description: ClipDescription? ->
-                onPaste(
-                    editText!!,
-                    uri!!,
-                    description!!,
-                )
+            lifecycleScope.launch {
+                val pasteAsPng = shouldPasteAsPng()
+                newEditText.setPasteListener { editText: EditText?, uri: Uri?, description: ClipDescription? ->
+                    onPaste(
+                        editText!!,
+                        uri!!,
+                        description!!,
+                        pasteAsPng,
+                    )
+                }
             }
             editLineView.configureView(
                 requireActivity(),
@@ -2013,8 +2020,17 @@ class NoteEditor :
         editText: EditText,
         uri: Uri,
         description: ClipDescription,
+        pasteAsPng: Boolean,
     ): Boolean {
-        val mediaTag = mediaRegistration!!.onPaste(uri, description) ?: return false
+        val mediaTag =
+            MediaRegistration.onPaste(
+                requireContext(),
+                uri,
+                description,
+                pasteAsPng,
+                showError = { type -> showSnackbar(type.toHumanReadableString(requireContext())) },
+            ) ?: return false
+
         insertStringInField(editText, mediaTag)
         return true
     }
diff --git a/AnkiDroid/src/main/res/values/10-preferences.xml b/AnkiDroid/src/main/res/values/10-preferences.xml
index 6631a7677d09..f6c7c43240ef 100644
--- a/AnkiDroid/src/main/res/values/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values/10-preferences.xml
@@ -44,6 +44,7 @@
     <string name="pref_cat_advanced" maxLength="41">Advanced</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
 
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
@@ -182,7 +183,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values/preferences.xml b/AnkiDroid/src/main/res/values/preferences.xml
index b1a14583377b..a2342235b220 100644
--- a/AnkiDroid/src/main/res/values/preferences.xml
+++ b/AnkiDroid/src/main/res/values/preferences.xml
@@ -6,7 +6,6 @@
     <string name="deck_for_new_cards_key">useCurrent</string>
     <string name="pref_language_key">language</string>
     <string name="analytics_opt_in_key">analytics_opt_in</string>
-    <string name="paste_png_key">pastePNG</string>
     <string name="error_reporting_mode_key">reportErrorMode</string>
     <!-- Reviewing -->
     <string name="pref_reviewing_screen_key">reviewingScreen</string>
@@ -28,6 +27,8 @@
     <string name="username_key">username</string>
     <!-- Backup -->
     <string name="pref_backup_limits_screen_key">backupLimitsScreen</string>
+    <!-- Editing -->
+    <string name="paste_png_key">pastePNG</string>
     <!-- Appearance -->
     <string name="pref_appearance_screen_key">appearance_preference_group</string>
     <string name="app_theme_key">appTheme</string>
diff --git a/AnkiDroid/src/main/res/xml/preferences_general.xml b/AnkiDroid/src/main/res/xml/preferences_general.xml
index 1196b96c0739..111fe6f6d0dc 100644
--- a/AnkiDroid/src/main/res/xml/preferences_general.xml
+++ b/AnkiDroid/src/main/res/xml/preferences_general.xml
@@ -44,12 +44,13 @@
             android:key="@string/analytics_opt_in_key"
             android:summary="@string/analytics_summ"
             android:title="@string/analytics_title" />
+    <PreferenceCategory android:title="@string/pref_cat_editing">
         <SwitchPreferenceCompat
             android:defaultValue="true"
             android:title="@string/paste_as_png"
-            android:summary="@string/paste_as_png_summary"
             android:maxLength="41"
             android:key="@string/paste_png_key"/>
+    </PreferenceCategory>
         <PreferenceCategory android:title="@string/pref_cat_studying">
             <ListPreference
                 android:entries="@array/add_to_cur_labels"

From cb40087417aa36f01b1abd0b46da092c723e86e3 Mon Sep 17 00:00:00 2001
From: AnkiDroid Translations <ankidroid@ankidroid.org>
Date: Wed, 2 Apr 2025 17:24:40 +0000
Subject: [PATCH 166/200] Updated strings from Crowdin

---
 AnkiDroid/src/main/res/values-af/01-core.xml  |  2 --
 .../src/main/res/values-af/02-strings.xml     |  3 +-
 .../src/main/res/values-af/03-dialogs.xml     |  1 +
 .../src/main/res/values-af/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-am/01-core.xml  |  2 --
 .../src/main/res/values-am/02-strings.xml     |  3 +-
 .../src/main/res/values-am/03-dialogs.xml     |  1 +
 .../src/main/res/values-am/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-ar/01-core.xml  |  2 --
 .../src/main/res/values-ar/02-strings.xml     |  3 +-
 .../src/main/res/values-ar/03-dialogs.xml     |  1 +
 .../src/main/res/values-ar/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-az/01-core.xml  |  2 --
 .../src/main/res/values-az/02-strings.xml     |  3 +-
 .../src/main/res/values-az/03-dialogs.xml     |  1 +
 .../src/main/res/values-az/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-be/01-core.xml  |  2 --
 .../src/main/res/values-be/02-strings.xml     |  3 +-
 .../src/main/res/values-be/03-dialogs.xml     |  1 +
 .../src/main/res/values-be/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-bg/01-core.xml  |  2 --
 .../src/main/res/values-bg/02-strings.xml     |  3 +-
 .../src/main/res/values-bg/03-dialogs.xml     |  1 +
 .../src/main/res/values-bg/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-bn/01-core.xml  |  2 --
 .../src/main/res/values-bn/02-strings.xml     |  3 +-
 .../src/main/res/values-bn/03-dialogs.xml     |  1 +
 .../src/main/res/values-bn/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-ca/01-core.xml  |  2 --
 .../src/main/res/values-ca/02-strings.xml     |  3 +-
 .../src/main/res/values-ca/03-dialogs.xml     |  1 +
 .../src/main/res/values-ca/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-ckb/01-core.xml |  2 --
 .../src/main/res/values-ckb/02-strings.xml    |  3 +-
 .../src/main/res/values-ckb/03-dialogs.xml    |  1 +
 .../main/res/values-ckb/10-preferences.xml    |  2 +-
 AnkiDroid/src/main/res/values-cs/01-core.xml  |  2 --
 .../src/main/res/values-cs/02-strings.xml     | 33 ++++++++++---------
 .../src/main/res/values-cs/03-dialogs.xml     |  5 +--
 .../src/main/res/values-cs/07-cardbrowser.xml |  2 +-
 .../src/main/res/values-cs/08-widget.xml      |  4 +--
 .../src/main/res/values-cs/10-preferences.xml |  9 ++---
 .../main/res/values-cs/17-model-manager.xml   |  4 +--
 AnkiDroid/src/main/res/values-da/01-core.xml  |  2 --
 .../src/main/res/values-da/02-strings.xml     |  3 +-
 .../src/main/res/values-da/03-dialogs.xml     |  1 +
 .../src/main/res/values-da/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-de/01-core.xml  |  2 --
 .../src/main/res/values-de/02-strings.xml     |  3 +-
 .../src/main/res/values-de/03-dialogs.xml     |  1 +
 .../src/main/res/values-de/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-el/01-core.xml  |  2 --
 .../src/main/res/values-el/02-strings.xml     |  3 +-
 .../src/main/res/values-el/03-dialogs.xml     |  1 +
 .../src/main/res/values-el/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-eo/01-core.xml  |  2 --
 .../src/main/res/values-eo/02-strings.xml     |  3 +-
 .../src/main/res/values-eo/03-dialogs.xml     |  1 +
 .../src/main/res/values-eo/10-preferences.xml |  2 +-
 .../src/main/res/values-es-rAR/01-core.xml    |  2 --
 .../src/main/res/values-es-rAR/02-strings.xml |  3 +-
 .../src/main/res/values-es-rAR/03-dialogs.xml |  1 +
 .../main/res/values-es-rAR/10-preferences.xml |  2 +-
 .../src/main/res/values-es-rES/01-core.xml    |  2 --
 .../src/main/res/values-es-rES/02-strings.xml |  3 +-
 .../src/main/res/values-es-rES/03-dialogs.xml |  1 +
 .../main/res/values-es-rES/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-et/01-core.xml  |  2 --
 .../src/main/res/values-et/02-strings.xml     |  3 +-
 .../src/main/res/values-et/03-dialogs.xml     |  1 +
 .../src/main/res/values-et/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-eu/01-core.xml  |  2 --
 .../src/main/res/values-eu/02-strings.xml     |  3 +-
 .../src/main/res/values-eu/03-dialogs.xml     |  1 +
 .../src/main/res/values-eu/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-fa/01-core.xml  |  2 --
 .../src/main/res/values-fa/02-strings.xml     |  3 +-
 .../src/main/res/values-fa/03-dialogs.xml     |  1 +
 .../src/main/res/values-fa/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-fi/01-core.xml  |  2 --
 .../src/main/res/values-fi/02-strings.xml     |  3 +-
 .../src/main/res/values-fi/03-dialogs.xml     |  1 +
 .../src/main/res/values-fi/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-fil/01-core.xml |  2 --
 .../src/main/res/values-fil/02-strings.xml    |  3 +-
 .../src/main/res/values-fil/03-dialogs.xml    |  1 +
 .../main/res/values-fil/10-preferences.xml    |  2 +-
 AnkiDroid/src/main/res/values-fr/01-core.xml  |  2 --
 .../src/main/res/values-fr/02-strings.xml     |  3 +-
 .../src/main/res/values-fr/03-dialogs.xml     |  1 +
 .../src/main/res/values-fr/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-fy/01-core.xml  |  2 --
 .../src/main/res/values-fy/02-strings.xml     |  3 +-
 .../src/main/res/values-fy/03-dialogs.xml     |  1 +
 .../src/main/res/values-fy/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-ga/01-core.xml  |  2 --
 .../src/main/res/values-ga/02-strings.xml     |  3 +-
 .../src/main/res/values-ga/03-dialogs.xml     |  1 +
 .../src/main/res/values-ga/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-gl/01-core.xml  |  2 --
 .../src/main/res/values-gl/02-strings.xml     |  3 +-
 .../src/main/res/values-gl/03-dialogs.xml     |  1 +
 .../src/main/res/values-gl/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-got/01-core.xml |  2 --
 .../src/main/res/values-got/02-strings.xml    |  3 +-
 .../src/main/res/values-got/03-dialogs.xml    |  1 +
 .../main/res/values-got/10-preferences.xml    |  2 +-
 AnkiDroid/src/main/res/values-gu/01-core.xml  |  2 --
 .../src/main/res/values-gu/02-strings.xml     |  3 +-
 .../src/main/res/values-gu/03-dialogs.xml     |  1 +
 .../src/main/res/values-gu/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-heb/01-core.xml |  2 --
 .../src/main/res/values-heb/02-strings.xml    |  3 +-
 .../src/main/res/values-heb/03-dialogs.xml    |  1 +
 .../main/res/values-heb/10-preferences.xml    |  2 +-
 AnkiDroid/src/main/res/values-hi/01-core.xml  |  2 --
 .../src/main/res/values-hi/02-strings.xml     |  3 +-
 .../src/main/res/values-hi/03-dialogs.xml     |  1 +
 .../src/main/res/values-hi/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-hr/01-core.xml  |  2 --
 .../src/main/res/values-hr/02-strings.xml     |  3 +-
 .../src/main/res/values-hr/03-dialogs.xml     |  1 +
 .../src/main/res/values-hr/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-hu/01-core.xml  |  2 --
 .../src/main/res/values-hu/02-strings.xml     |  3 +-
 .../src/main/res/values-hu/03-dialogs.xml     |  1 +
 .../src/main/res/values-hu/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-hy/01-core.xml  |  2 --
 .../src/main/res/values-hy/02-strings.xml     |  3 +-
 .../src/main/res/values-hy/03-dialogs.xml     |  1 +
 .../src/main/res/values-hy/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-ind/01-core.xml |  2 --
 .../src/main/res/values-ind/02-strings.xml    |  3 +-
 .../src/main/res/values-ind/03-dialogs.xml    |  1 +
 .../main/res/values-ind/10-preferences.xml    |  2 +-
 AnkiDroid/src/main/res/values-is/01-core.xml  |  2 --
 .../src/main/res/values-is/02-strings.xml     |  3 +-
 .../src/main/res/values-is/03-dialogs.xml     |  1 +
 .../src/main/res/values-is/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-it/01-core.xml  |  2 --
 .../src/main/res/values-it/02-strings.xml     |  3 +-
 .../src/main/res/values-it/03-dialogs.xml     |  1 +
 .../src/main/res/values-it/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-iw/01-core.xml  |  2 --
 .../src/main/res/values-iw/02-strings.xml     |  3 +-
 .../src/main/res/values-iw/03-dialogs.xml     |  1 +
 .../src/main/res/values-iw/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-ja/01-core.xml  |  2 --
 .../src/main/res/values-ja/02-strings.xml     |  3 +-
 .../src/main/res/values-ja/03-dialogs.xml     |  1 +
 .../src/main/res/values-ja/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-jv/01-core.xml  |  2 --
 .../src/main/res/values-jv/02-strings.xml     |  3 +-
 .../src/main/res/values-jv/03-dialogs.xml     |  1 +
 .../src/main/res/values-jv/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-ka/01-core.xml  |  2 --
 .../src/main/res/values-ka/02-strings.xml     |  3 +-
 .../src/main/res/values-ka/03-dialogs.xml     |  1 +
 .../src/main/res/values-ka/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-kk/01-core.xml  |  2 --
 .../src/main/res/values-kk/02-strings.xml     |  3 +-
 .../src/main/res/values-kk/03-dialogs.xml     |  1 +
 .../src/main/res/values-kk/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-km/01-core.xml  |  2 --
 .../src/main/res/values-km/02-strings.xml     |  3 +-
 .../src/main/res/values-km/03-dialogs.xml     |  1 +
 .../src/main/res/values-km/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-kn/01-core.xml  |  2 --
 .../src/main/res/values-kn/02-strings.xml     |  3 +-
 .../src/main/res/values-kn/03-dialogs.xml     |  1 +
 .../src/main/res/values-kn/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-ko/01-core.xml  |  2 --
 .../src/main/res/values-ko/02-strings.xml     |  3 +-
 .../src/main/res/values-ko/03-dialogs.xml     |  1 +
 .../src/main/res/values-ko/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-ku/01-core.xml  |  2 --
 .../src/main/res/values-ku/02-strings.xml     |  3 +-
 .../src/main/res/values-ku/03-dialogs.xml     |  1 +
 .../src/main/res/values-ku/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-ky/01-core.xml  |  2 --
 .../src/main/res/values-ky/02-strings.xml     |  3 +-
 .../src/main/res/values-ky/03-dialogs.xml     |  1 +
 .../src/main/res/values-ky/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-lt/01-core.xml  |  2 --
 .../src/main/res/values-lt/02-strings.xml     |  3 +-
 .../src/main/res/values-lt/03-dialogs.xml     |  1 +
 .../src/main/res/values-lt/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-lv/01-core.xml  |  2 --
 .../src/main/res/values-lv/02-strings.xml     |  3 +-
 .../src/main/res/values-lv/03-dialogs.xml     |  1 +
 .../src/main/res/values-lv/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-mk/01-core.xml  |  2 --
 .../src/main/res/values-mk/02-strings.xml     |  3 +-
 .../src/main/res/values-mk/03-dialogs.xml     |  1 +
 .../src/main/res/values-mk/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-ml/01-core.xml  |  2 --
 .../src/main/res/values-ml/02-strings.xml     |  3 +-
 .../src/main/res/values-ml/03-dialogs.xml     |  1 +
 .../src/main/res/values-ml/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-mn/01-core.xml  |  2 --
 .../src/main/res/values-mn/02-strings.xml     |  3 +-
 .../src/main/res/values-mn/03-dialogs.xml     |  1 +
 .../src/main/res/values-mn/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-mr/01-core.xml  |  2 --
 .../src/main/res/values-mr/02-strings.xml     |  3 +-
 .../src/main/res/values-mr/03-dialogs.xml     |  1 +
 .../src/main/res/values-mr/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-ms/01-core.xml  |  2 --
 .../src/main/res/values-ms/02-strings.xml     |  3 +-
 .../src/main/res/values-ms/03-dialogs.xml     |  1 +
 .../src/main/res/values-ms/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-my/01-core.xml  |  2 --
 .../src/main/res/values-my/02-strings.xml     |  3 +-
 .../src/main/res/values-my/03-dialogs.xml     |  1 +
 .../src/main/res/values-my/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-nl/01-core.xml  |  2 --
 .../src/main/res/values-nl/02-strings.xml     |  3 +-
 .../src/main/res/values-nl/03-dialogs.xml     |  1 +
 .../src/main/res/values-nl/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-nn/01-core.xml  |  2 --
 .../src/main/res/values-nn/02-strings.xml     |  3 +-
 .../src/main/res/values-nn/03-dialogs.xml     |  1 +
 .../src/main/res/values-nn/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-no/01-core.xml  |  2 --
 .../src/main/res/values-no/02-strings.xml     |  3 +-
 .../src/main/res/values-no/03-dialogs.xml     |  1 +
 .../src/main/res/values-no/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-or/01-core.xml  |  2 --
 .../src/main/res/values-or/02-strings.xml     |  3 +-
 .../src/main/res/values-or/03-dialogs.xml     |  1 +
 .../src/main/res/values-or/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-pa/01-core.xml  |  2 --
 .../src/main/res/values-pa/02-strings.xml     |  3 +-
 .../src/main/res/values-pa/03-dialogs.xml     |  1 +
 .../src/main/res/values-pa/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-pl/01-core.xml  |  2 --
 .../src/main/res/values-pl/02-strings.xml     |  3 +-
 .../src/main/res/values-pl/03-dialogs.xml     |  1 +
 .../src/main/res/values-pl/10-preferences.xml |  2 +-
 .../src/main/res/values-pt-rBR/01-core.xml    |  2 --
 .../src/main/res/values-pt-rBR/02-strings.xml |  3 +-
 .../src/main/res/values-pt-rBR/03-dialogs.xml |  1 +
 .../main/res/values-pt-rBR/10-preferences.xml |  2 +-
 .../src/main/res/values-pt-rPT/01-core.xml    |  2 --
 .../src/main/res/values-pt-rPT/02-strings.xml |  3 +-
 .../src/main/res/values-pt-rPT/03-dialogs.xml |  1 +
 .../main/res/values-pt-rPT/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-ro/01-core.xml  |  2 --
 .../src/main/res/values-ro/02-strings.xml     |  3 +-
 .../src/main/res/values-ro/03-dialogs.xml     |  1 +
 .../src/main/res/values-ro/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-ru/01-core.xml  |  2 --
 .../src/main/res/values-ru/02-strings.xml     |  3 +-
 .../src/main/res/values-ru/03-dialogs.xml     |  1 +
 .../src/main/res/values-ru/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-sat/01-core.xml |  2 --
 .../src/main/res/values-sat/02-strings.xml    |  3 +-
 .../src/main/res/values-sat/03-dialogs.xml    |  1 +
 .../main/res/values-sat/10-preferences.xml    |  2 +-
 AnkiDroid/src/main/res/values-sc/01-core.xml  |  2 --
 .../src/main/res/values-sc/02-strings.xml     |  3 +-
 .../src/main/res/values-sc/03-dialogs.xml     |  1 +
 .../src/main/res/values-sc/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-sk/01-core.xml  |  2 --
 .../src/main/res/values-sk/02-strings.xml     |  3 +-
 .../src/main/res/values-sk/03-dialogs.xml     |  1 +
 .../src/main/res/values-sk/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-sl/01-core.xml  |  2 --
 .../src/main/res/values-sl/02-strings.xml     |  3 +-
 .../src/main/res/values-sl/03-dialogs.xml     |  1 +
 .../src/main/res/values-sl/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-sq/01-core.xml  |  2 --
 .../src/main/res/values-sq/02-strings.xml     |  3 +-
 .../src/main/res/values-sq/03-dialogs.xml     |  1 +
 .../src/main/res/values-sq/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-sr/01-core.xml  |  2 --
 .../src/main/res/values-sr/02-strings.xml     |  3 +-
 .../src/main/res/values-sr/03-dialogs.xml     |  1 +
 .../src/main/res/values-sr/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-ss/01-core.xml  |  2 --
 .../src/main/res/values-ss/02-strings.xml     |  3 +-
 .../src/main/res/values-ss/03-dialogs.xml     |  1 +
 .../src/main/res/values-ss/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-sv/01-core.xml  |  2 --
 .../src/main/res/values-sv/02-strings.xml     |  3 +-
 .../src/main/res/values-sv/03-dialogs.xml     |  1 +
 .../src/main/res/values-sv/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-sw/01-core.xml  |  2 --
 .../src/main/res/values-sw/02-strings.xml     |  3 +-
 .../src/main/res/values-sw/03-dialogs.xml     |  1 +
 .../src/main/res/values-sw/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-ta/01-core.xml  |  2 --
 .../src/main/res/values-ta/02-strings.xml     |  3 +-
 .../src/main/res/values-ta/03-dialogs.xml     |  1 +
 .../src/main/res/values-ta/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-te/01-core.xml  |  2 --
 .../src/main/res/values-te/02-strings.xml     |  3 +-
 .../src/main/res/values-te/03-dialogs.xml     |  1 +
 .../src/main/res/values-te/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-tg/01-core.xml  |  2 --
 .../src/main/res/values-tg/02-strings.xml     |  3 +-
 .../src/main/res/values-tg/03-dialogs.xml     |  1 +
 .../src/main/res/values-tg/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-tgl/01-core.xml |  2 --
 .../src/main/res/values-tgl/02-strings.xml    |  3 +-
 .../src/main/res/values-tgl/03-dialogs.xml    |  1 +
 .../main/res/values-tgl/10-preferences.xml    |  2 +-
 AnkiDroid/src/main/res/values-th/01-core.xml  |  2 --
 .../src/main/res/values-th/02-strings.xml     |  3 +-
 .../src/main/res/values-th/03-dialogs.xml     |  1 +
 .../src/main/res/values-th/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-ti/01-core.xml  |  2 --
 .../src/main/res/values-ti/02-strings.xml     |  3 +-
 .../src/main/res/values-ti/03-dialogs.xml     |  1 +
 .../src/main/res/values-ti/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-tn/01-core.xml  |  2 --
 .../src/main/res/values-tn/02-strings.xml     |  3 +-
 .../src/main/res/values-tn/03-dialogs.xml     |  1 +
 .../src/main/res/values-tn/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-tr/01-core.xml  |  2 --
 .../src/main/res/values-tr/02-strings.xml     |  3 +-
 .../src/main/res/values-tr/03-dialogs.xml     |  1 +
 .../src/main/res/values-tr/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-ts/01-core.xml  |  2 --
 .../src/main/res/values-ts/02-strings.xml     |  3 +-
 .../src/main/res/values-ts/03-dialogs.xml     |  1 +
 .../src/main/res/values-ts/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-tt/01-core.xml  |  2 --
 .../src/main/res/values-tt/02-strings.xml     |  3 +-
 .../src/main/res/values-tt/03-dialogs.xml     |  1 +
 .../src/main/res/values-tt/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-ug/01-core.xml  |  2 --
 .../src/main/res/values-ug/02-strings.xml     |  3 +-
 .../src/main/res/values-ug/03-dialogs.xml     |  1 +
 .../src/main/res/values-ug/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-uk/01-core.xml  |  2 --
 .../src/main/res/values-uk/02-strings.xml     |  3 +-
 .../src/main/res/values-uk/03-dialogs.xml     |  1 +
 .../src/main/res/values-uk/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-ur/01-core.xml  |  2 --
 .../src/main/res/values-ur/02-strings.xml     |  3 +-
 .../src/main/res/values-ur/03-dialogs.xml     |  1 +
 .../src/main/res/values-ur/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-uz/01-core.xml  |  2 --
 .../src/main/res/values-uz/02-strings.xml     |  3 +-
 .../src/main/res/values-uz/03-dialogs.xml     |  1 +
 .../src/main/res/values-uz/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-ve/01-core.xml  |  2 --
 .../src/main/res/values-ve/02-strings.xml     |  3 +-
 .../src/main/res/values-ve/03-dialogs.xml     |  1 +
 .../src/main/res/values-ve/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-vi/01-core.xml  |  2 --
 .../src/main/res/values-vi/02-strings.xml     |  3 +-
 .../src/main/res/values-vi/03-dialogs.xml     |  1 +
 .../src/main/res/values-vi/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-wo/01-core.xml  |  2 --
 .../src/main/res/values-wo/02-strings.xml     |  3 +-
 .../src/main/res/values-wo/03-dialogs.xml     |  1 +
 .../src/main/res/values-wo/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-xh/01-core.xml  |  2 --
 .../src/main/res/values-xh/02-strings.xml     |  3 +-
 .../src/main/res/values-xh/03-dialogs.xml     |  1 +
 .../src/main/res/values-xh/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-yue/01-core.xml |  2 --
 .../src/main/res/values-yue/02-strings.xml    |  3 +-
 .../src/main/res/values-yue/03-dialogs.xml    |  1 +
 .../main/res/values-yue/10-preferences.xml    |  2 +-
 .../src/main/res/values-zh-rCN/01-core.xml    |  2 --
 .../src/main/res/values-zh-rCN/02-strings.xml |  3 +-
 .../src/main/res/values-zh-rCN/03-dialogs.xml |  1 +
 .../main/res/values-zh-rCN/10-preferences.xml |  2 +-
 .../src/main/res/values-zh-rTW/01-core.xml    |  2 --
 .../src/main/res/values-zh-rTW/02-strings.xml |  3 +-
 .../src/main/res/values-zh-rTW/03-dialogs.xml |  1 +
 .../main/res/values-zh-rTW/10-preferences.xml |  2 +-
 AnkiDroid/src/main/res/values-zu/01-core.xml  |  2 --
 .../src/main/res/values-zu/02-strings.xml     |  3 +-
 .../src/main/res/values-zu/03-dialogs.xml     |  1 +
 .../src/main/res/values-zu/10-preferences.xml |  2 +-
 379 files changed, 402 insertions(+), 401 deletions(-)

diff --git a/AnkiDroid/src/main/res/values-af/01-core.xml b/AnkiDroid/src/main/res/values-af/01-core.xml
index 1af12dc5d287..8b6b9915c3a5 100644
--- a/AnkiDroid/src/main/res/values-af/01-core.xml
+++ b/AnkiDroid/src/main/res/values-af/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Maak leeg</string>
     <string name="create_subdeck">Skep subpak</string>
     <string name="empty_filtered_deck">Besig om die gefilterde pak leeg te maak&#8230;</string>
-    <string name="custom_study_deck_name">Pasmaak studie sessie</string>
-    <string name="custom_study_deck_exists">Hernoem die bestaande pasmaak kaartpak eers</string>
     <string name="search_deck" comment="Deck search for selecting it">Pak Soek</string>
     <string name="empty_deck">Hierdie pak is leeg</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Pak Soek</string>
diff --git a/AnkiDroid/src/main/res/values-af/02-strings.xml b/AnkiDroid/src/main/res/values-af/02-strings.xml
index 5d9855d9c89d..ed329ea90e1f 100644
--- a/AnkiDroid/src/main/res/values-af/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-af/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">Stelsel webaansig kon nie kaart verbeeld nie \'%1$s\'.\n%2$s</string>
     <string name="filter_by_flags" maxLength="41">Etikette</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Beperk tot spesifieke etikette</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d begrawe</item>
         <item quantity="other">+%d begrawe</item>
diff --git a/AnkiDroid/src/main/res/values-af/03-dialogs.xml b/AnkiDroid/src/main/res/values-af/03-dialogs.xml
index f9f291e75bba..a787dc61a662 100644
--- a/AnkiDroid/src/main/res/values-af/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-af/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Hersien kaarte wat in die laaste x dae vergeet is</string>
     <string name="custom_study_ahead">Hersien vooruit met x dae:</string>
     <string name="custom_study_preview">Voorskou nuwe kaarte wat in die laaste x dae bygevoeg is:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Stoor is vol</string>
     <string name="storage_almost_full_title">Stoor is amper vol</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">Geen stoorplek</string>
diff --git a/AnkiDroid/src/main/res/values-af/10-preferences.xml b/AnkiDroid/src/main/res/values-af/10-preferences.xml
index 3b028afe2e39..485f332f3219 100644
--- a/AnkiDroid/src/main/res/values-af/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-af/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Advanced</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
     <string name="use_input_tag" maxLength="41">Type answer into the card</string>
@@ -204,7 +205,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-am/01-core.xml b/AnkiDroid/src/main/res/values-am/01-core.xml
index 7f033118ad93..7c413160270b 100644
--- a/AnkiDroid/src/main/res/values-am/01-core.xml
+++ b/AnkiDroid/src/main/res/values-am/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Empty</string>
     <string name="create_subdeck">Create subdeck</string>
     <string name="empty_filtered_deck">Emptying filtered deck&#8230;</string>
-    <string name="custom_study_deck_name">Custom study session</string>
-    <string name="custom_study_deck_exists">Rename the existing custom study deck first</string>
     <string name="search_deck" comment="Deck search for selecting it">Deck Search</string>
     <string name="empty_deck">This deck is empty</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Deck Search</string>
diff --git a/AnkiDroid/src/main/res/values-am/02-strings.xml b/AnkiDroid/src/main/res/values-am/02-strings.xml
index 509505f66399..5e4fab69ad3c 100644
--- a/AnkiDroid/src/main/res/values-am/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-am/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flags</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limit to particular tags</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="other">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-am/03-dialogs.xml b/AnkiDroid/src/main/res/values-am/03-dialogs.xml
index 362d3e7fe7fb..0d38bd3fe44e 100644
--- a/AnkiDroid/src/main/res/values-am/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-am/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead">Review ahead by x days:</string>
     <string name="custom_study_preview">Preview new cards added in the last x days:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Storage full</string>
     <string name="storage_almost_full_title">Storage almost full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-am/10-preferences.xml b/AnkiDroid/src/main/res/values-am/10-preferences.xml
index dbbf55c6e869..4f678e027e22 100644
--- a/AnkiDroid/src/main/res/values-am/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-am/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Advanced</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
     <string name="use_input_tag" maxLength="41">Type answer into the card</string>
@@ -204,7 +205,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-ar/01-core.xml b/AnkiDroid/src/main/res/values-ar/01-core.xml
index ad2453e54618..960f3ae8de59 100644
--- a/AnkiDroid/src/main/res/values-ar/01-core.xml
+++ b/AnkiDroid/src/main/res/values-ar/01-core.xml
@@ -135,8 +135,6 @@
     <string name="empty_cram_label" maxLength="28">إفراغ</string>
     <string name="create_subdeck">إنشاء رزمة فرعية</string>
     <string name="empty_filtered_deck">جار إفراغ الرزمة المفلترة&#8230;</string>
-    <string name="custom_study_deck_name">جلسة دراسة مخصصة</string>
-    <string name="custom_study_deck_exists">أولا أعد تسمية \"رزمة الدراسة المخصصة\" الحالية</string>
     <string name="search_deck" comment="Deck search for selecting it">البحث عن رزمة</string>
     <string name="empty_deck">هذه الرزمة فارغة</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">بحث عن رزمة</string>
diff --git a/AnkiDroid/src/main/res/values-ar/02-strings.xml b/AnkiDroid/src/main/res/values-ar/02-strings.xml
index 0166442ed229..2a9530aeca9f 100644
--- a/AnkiDroid/src/main/res/values-ar/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ar/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">فشل عارض ويب النظام في عرض البطاقة %1$s.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">أعلام</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">اقتصر على وسوم معينة</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="zero">+%d buried</item>
         <item quantity="one">+ %d مدفونة</item>
diff --git a/AnkiDroid/src/main/res/values-ar/03-dialogs.xml b/AnkiDroid/src/main/res/values-ar/03-dialogs.xml
index db0c9f74eeaf..680f28cb0152 100644
--- a/AnkiDroid/src/main/res/values-ar/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ar/03-dialogs.xml
@@ -81,6 +81,7 @@
     <string name="custom_study_forgotten">راجع البطاقات المنسية في آخر س يوم:</string>
     <string name="custom_study_ahead">راجع مبكرًا بـ س يوم:</string>
     <string name="custom_study_preview">عاين البطاقات الجديدة المضافة في آخر س يوم:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">ذاكرة التخزين ممتلئة</string>
     <string name="storage_almost_full_title">بطاقة الـSD ممتلئة تقريبًا</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">لا توجد مساحة</string>
diff --git a/AnkiDroid/src/main/res/values-ar/10-preferences.xml b/AnkiDroid/src/main/res/values-ar/10-preferences.xml
index 837a265cc0eb..6f50f09209eb 100644
--- a/AnkiDroid/src/main/res/values-ar/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ar/10-preferences.xml
@@ -72,6 +72,7 @@
     <string name="pref_cat_advanced" maxLength="41">خيارات متقدمة</string>
     <string name="pref_cat_workarounds" maxLength="41">حلول</string>
     <string name="pref_cat_plugins" maxLength="41">الإضافات</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">عرض الخط</string>
     <string name="use_input_tag" maxLength="41">إدخال الجواب في البطاقة</string>
@@ -211,7 +212,6 @@
     <string name="accessibility" maxLength="41">إمكانية الوصول</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">لصق صور الحافظة كـ PNG</string>
-    <string name="paste_as_png_summary">بشكل افتراضي يلصق أنكي الصور في الحافظة بصيغة JPG لتوفير مساحة القرص. تستطيع استخدام هذا الخيار للصق الصور بصيعة PNG بدلًا من ذلك.</string>
     <string name="exit_via_double_tap_back" maxLength="41">اضغط رجوع مرتين للعودة أو الخروج</string>
     <string name="exit_via_double_tap_back_summ">لتجنب مغادرة شاشة المراجعة أو التطبيق بدون قصد</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-az/01-core.xml b/AnkiDroid/src/main/res/values-az/01-core.xml
index 08ecf9137271..83a589f1edac 100644
--- a/AnkiDroid/src/main/res/values-az/01-core.xml
+++ b/AnkiDroid/src/main/res/values-az/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Boş</string>
     <string name="create_subdeck">Alt dəstə yarat</string>
     <string name="empty_filtered_deck">filtrlənmiş dəstənin boşaldılması</string>
-    <string name="custom_study_deck_name">Şəxsi öyrənmə sessiyası</string>
-    <string name="custom_study_deck_exists">Əvvəlcə mövcud fərdi tədqiqat dəstəsinin adını dəyişin</string>
     <string name="search_deck" comment="Deck search for selecting it">Dəstə axtar</string>
     <string name="empty_deck">Bu dəstə boşdur</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Dəstə axtar</string>
diff --git a/AnkiDroid/src/main/res/values-az/02-strings.xml b/AnkiDroid/src/main/res/values-az/02-strings.xml
index 5f98aed11090..ed46a5b9997a 100644
--- a/AnkiDroid/src/main/res/values-az/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-az/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flags</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limit to particular tags</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="other">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-az/03-dialogs.xml b/AnkiDroid/src/main/res/values-az/03-dialogs.xml
index c506be277fa0..5a16a721f395 100644
--- a/AnkiDroid/src/main/res/values-az/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-az/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Son x günlərdə unudulmuş kartları nəzərdən keçirin:</string>
     <string name="custom_study_ahead">Ön x günləri nəzərdən keçirin:</string>
     <string name="custom_study_preview">Son x günlərdə əlavə edilmiş yeni kartların Ön görünüşü:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Storage full</string>
     <string name="storage_almost_full_title">Storage almost full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-az/10-preferences.xml b/AnkiDroid/src/main/res/values-az/10-preferences.xml
index 4cf6b6d03b09..c242fb1aab4e 100644
--- a/AnkiDroid/src/main/res/values-az/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-az/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Qabaqcıl</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
     <string name="use_input_tag" maxLength="41">Cavabı karta yaz</string>
@@ -204,7 +205,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-be/01-core.xml b/AnkiDroid/src/main/res/values-be/01-core.xml
index 3fa51e674842..7b7510fd52e1 100644
--- a/AnkiDroid/src/main/res/values-be/01-core.xml
+++ b/AnkiDroid/src/main/res/values-be/01-core.xml
@@ -129,8 +129,6 @@
     <string name="empty_cram_label" maxLength="28">Ачысціць</string>
     <string name="create_subdeck">Стварыць падкалоду</string>
     <string name="empty_filtered_deck">Ачыстка фільтраванай калоды&#8230;</string>
-    <string name="custom_study_deck_name">Сеанс індывідуальнага навучання</string>
-    <string name="custom_study_deck_exists">Спачатку дайце новую назву калодзе індывідуальнага навучання</string>
     <string name="search_deck" comment="Deck search for selecting it">Пошук калоды</string>
     <string name="empty_deck">Гэта калода пустая</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Пошук калоды</string>
diff --git a/AnkiDroid/src/main/res/values-be/02-strings.xml b/AnkiDroid/src/main/res/values-be/02-strings.xml
index 4da515bb0161..827127840cb0 100644
--- a/AnkiDroid/src/main/res/values-be/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-be/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">Сістэмнаму WebView не атрымалася апрацаваць картку \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Сцягі</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Абмежаваць вызначанымі меткамі</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d адкладзеная</item>
         <item quantity="few">+%d адкладзеныя</item>
diff --git a/AnkiDroid/src/main/res/values-be/03-dialogs.xml b/AnkiDroid/src/main/res/values-be/03-dialogs.xml
index 9fc3d3464979..76250f290e10 100644
--- a/AnkiDroid/src/main/res/values-be/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-be/03-dialogs.xml
@@ -77,6 +77,7 @@
     <string name="custom_study_forgotten">Паўтарыць забытыя карткі за апошнія некалькі дзён:</string>
     <string name="custom_study_ahead">Вывучыць на некалькі дзён наперад:</string>
     <string name="custom_study_preview">Прагледзець новыя карткі, якія дадзены за апошнія некалькі дзён:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Сховішча запоўнена</string>
     <string name="storage_almost_full_title">Сховішча амаль запоўнена</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">Памяць запоўненая</string>
diff --git a/AnkiDroid/src/main/res/values-be/10-preferences.xml b/AnkiDroid/src/main/res/values-be/10-preferences.xml
index 2681f93340bf..96cbbc9a55e1 100644
--- a/AnkiDroid/src/main/res/values-be/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-be/10-preferences.xml
@@ -70,6 +70,7 @@
     <string name="pref_cat_advanced" maxLength="41">Дадаткова</string>
     <string name="pref_cat_workarounds" maxLength="41">Абходныя шляхі</string>
     <string name="pref_cat_plugins" maxLength="41">Плагiны</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Шырыня штрыха</string>
     <string name="use_input_tag" maxLength="41">Уводзіць адказ на картцы</string>
@@ -208,7 +209,6 @@
     <string name="accessibility" maxLength="41">Спецыяльныя магчымасці</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Устаўляць з буфера абмену відарысы як PNG</string>
-    <string name="paste_as_png_summary">Стандартна, праграма ўстаўляе відарысы ў буфер абмену як файлы JPG для эканоміі дыскавай прасторы. Вы можаце скарыстацца гэтым параметрам для ўстаўкі відарысаў PNG замест JPG.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Націсніце \"Назад\" двойчы для выхаду</string>
     <string name="exit_via_double_tap_back_summ">Для прадухілення нечаканага выхаду з праграмы</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-bg/01-core.xml b/AnkiDroid/src/main/res/values-bg/01-core.xml
index 16aaebd6a31f..6fafc6e85e3e 100644
--- a/AnkiDroid/src/main/res/values-bg/01-core.xml
+++ b/AnkiDroid/src/main/res/values-bg/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Празно</string>
     <string name="create_subdeck">Създай подтесте</string>
     <string name="empty_filtered_deck">Изпразване на филтрирано тесте&#8230;</string>
-    <string name="custom_study_deck_name">Допълнително време за учене</string>
-    <string name="custom_study_deck_exists">Първо преименувайте съществуващото тесте за учене</string>
     <string name="search_deck" comment="Deck search for selecting it">Потърси тесте</string>
     <string name="empty_deck">Това тесте е празно</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Потърси тесте</string>
diff --git a/AnkiDroid/src/main/res/values-bg/02-strings.xml b/AnkiDroid/src/main/res/values-bg/02-strings.xml
index d51d70a778dc..90e8e44831c2 100644
--- a/AnkiDroid/src/main/res/values-bg/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-bg/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">На системното WebView не се получи да покаже картата \'%1$s\'.\n%2$s</string>
     <string name="filter_by_flags" maxLength="41">Флагове</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Ограничаване до определени тагове</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="other">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-bg/03-dialogs.xml b/AnkiDroid/src/main/res/values-bg/03-dialogs.xml
index 36ec757aa9e0..a37db7cae78d 100644
--- a/AnkiDroid/src/main/res/values-bg/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-bg/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Повтаряне на забравени карти през последните x дни:</string>
     <string name="custom_study_ahead">Преглед за следващите x дни:</string>
     <string name="custom_study_preview">Преглед на нови карти, добавени през последните x дни:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Пълно хранилище</string>
     <string name="storage_almost_full_title">Почти пълно хранилище</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">Няма място</string>
diff --git a/AnkiDroid/src/main/res/values-bg/10-preferences.xml b/AnkiDroid/src/main/res/values-bg/10-preferences.xml
index 0c0073676b60..41681d067287 100644
--- a/AnkiDroid/src/main/res/values-bg/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-bg/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Разширени</string>
     <string name="pref_cat_workarounds" maxLength="41">Заобикаляне на проблеми</string>
     <string name="pref_cat_plugins" maxLength="41">Приставки</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Ширина на щриха</string>
     <string name="use_input_tag" maxLength="41">Пиши отговорът в картата</string>
@@ -203,7 +204,6 @@
     <string name="accessibility" maxLength="41">Достъпност</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-bn/01-core.xml b/AnkiDroid/src/main/res/values-bn/01-core.xml
index b33c4c900be4..584ca56a4366 100644
--- a/AnkiDroid/src/main/res/values-bn/01-core.xml
+++ b/AnkiDroid/src/main/res/values-bn/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">খালি</string>
     <string name="create_subdeck">সাব ডেক বানাও</string>
     <string name="empty_filtered_deck">খালি করা হচ্ছে ফিল্টারড ডেক</string>
-    <string name="custom_study_deck_name">নিজস্ব গবেষণা অধিবেশন</string>
-    <string name="custom_study_deck_exists">বর্তমান স্বনির্ধারিত গবেষণা ডেক প্রথম পুনঃনামকরণ করুন</string>
     <string name="search_deck" comment="Deck search for selecting it">ডেক অনুসন্ধান</string>
     <string name="empty_deck">এই ডেক ফাঁকা।</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">ডেক অনুসন্ধান</string>
diff --git a/AnkiDroid/src/main/res/values-bn/02-strings.xml b/AnkiDroid/src/main/res/values-bn/02-strings.xml
index 09eb6153db05..b48a4c597971 100644
--- a/AnkiDroid/src/main/res/values-bn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-bn/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">সিস্টেম ওয়েব-ভিউ \'%1$s\'.\n %2$s কার্ড রেন্ডার করতে ব্যর্থ হয়েছে</string>
     <string name="filter_by_flags" maxLength="41">নিশান</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">নির্দিষ্ট ট্যাগে সীমিতকরণ</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d সমাহিত করা হয়েছে</item>
         <item quantity="other">+%d সমাহিত করা হয়েছে</item>
diff --git a/AnkiDroid/src/main/res/values-bn/03-dialogs.xml b/AnkiDroid/src/main/res/values-bn/03-dialogs.xml
index abfb8630c1e4..bdcb293ee406 100644
--- a/AnkiDroid/src/main/res/values-bn/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-bn/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">গত x দিনে ভুলে যাওয়া কার্ডগুলি পর্যালোচনা করুন:</string>
     <string name="custom_study_ahead">x দিন আগে পর্যালোচনা করুন:</string>
     <string name="custom_study_preview">গত x দিনে যোগ করা নতুন কার্ডের পূর্বরূপ দেখুন:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">স্টোরেজ পূর্ণ</string>
     <string name="storage_almost_full_title">স্টোরেজ প্রায় পূর্ণ</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-bn/10-preferences.xml b/AnkiDroid/src/main/res/values-bn/10-preferences.xml
index ac281c2d774e..a9536c1cd3e2 100644
--- a/AnkiDroid/src/main/res/values-bn/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-bn/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">উন্নত</string>
     <string name="pref_cat_workarounds" maxLength="41">অন্য উপায়</string>
     <string name="pref_cat_plugins" maxLength="41">প্লাগ ইন</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">স্ট্রোকের প্রস্থ</string>
     <string name="use_input_tag" maxLength="41">কার্ডে উত্তর টাইপ করুন</string>
@@ -204,7 +205,6 @@
     <string name="accessibility" maxLength="41">অ্যাক্সেসযোগ্যতা</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">PNG হিসাবে ক্লিপবোর্ড ছবি আটকান</string>
-    <string name="paste_as_png_summary">ডিফল্টরূপে আঙ্কি ডিস্কের স্থান বাঁচাতে JPG ফাইল হিসেবে ক্লিপবোর্ডে ছবি পেস্ট করে। আপনি পরিবর্তে একটি PNG চিত্র হিসাবে পেস্ট করতে এই বিকল্পটি ব্যবহার করতে পারেন৷</string>
     <string name="exit_via_double_tap_back" maxLength="41">ফিরে যেতে/প্রস্থান করতে দুবার ব্যাক টিপুন</string>
     <string name="exit_via_double_tap_back_summ">ভুলবশত রিভিউয়ার বা অ্যাপ ছেড়ে যাওয়া এড়াতে</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-ca/01-core.xml b/AnkiDroid/src/main/res/values-ca/01-core.xml
index 100ea46e35e0..14ed9d7ac1e4 100644
--- a/AnkiDroid/src/main/res/values-ca/01-core.xml
+++ b/AnkiDroid/src/main/res/values-ca/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Buit</string>
     <string name="create_subdeck">Crea un paquet</string>
     <string name="empty_filtered_deck">S\'està buidant el paquet filtrat</string>
-    <string name="custom_study_deck_name">Sessió d\'estudi a mida</string>
-    <string name="custom_study_deck_exists">Si us plau, primer canvieu de nom el paquet d\'estudi a mida</string>
     <string name="search_deck" comment="Deck search for selecting it">Cerca un paquet</string>
     <string name="empty_deck">Aquest paquet és buit</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Cerca un paquet</string>
diff --git a/AnkiDroid/src/main/res/values-ca/02-strings.xml b/AnkiDroid/src/main/res/values-ca/02-strings.xml
index 4ce9ff33b4e4..f05def6ae8de 100644
--- a/AnkiDroid/src/main/res/values-ca/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ca/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">El sistema WebView ha fallat al renderitzar la carta \'%1$s.\n%2$s</string>
     <string name="filter_by_flags" maxLength="41">Bandera</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limita a determinades etiquetes</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d enterrada</item>
         <item quantity="other">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-ca/03-dialogs.xml b/AnkiDroid/src/main/res/values-ca/03-dialogs.xml
index 0d09084af019..7724b17db895 100644
--- a/AnkiDroid/src/main/res/values-ca/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ca/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Revisa les fitxes oblidades en els darrers x dies:</string>
     <string name="custom_study_ahead">Revisió de x dies endavant:</string>
     <string name="custom_study_preview">Mostra les fitxes noves afegides en els últims x dies:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">No queda espai al disc</string>
     <string name="storage_almost_full_title">El disc està gairebé ple</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">Sense espai</string>
diff --git a/AnkiDroid/src/main/res/values-ca/10-preferences.xml b/AnkiDroid/src/main/res/values-ca/10-preferences.xml
index b7aff2d6dcc7..7a6493e9d11b 100644
--- a/AnkiDroid/src/main/res/values-ca/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ca/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Avançat</string>
     <string name="pref_cat_workarounds" maxLength="41">Solucions</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Amplada del traç</string>
     <string name="use_input_tag" maxLength="41">Tipus de resposta a la targeta</string>
@@ -203,7 +204,6 @@
     <string name="accessibility" maxLength="41">Accessibilitat</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Enganxa imatges del porta-retalls com PNG</string>
-    <string name="paste_as_png_summary">Per defecte, Anki enganxa les imatges al porta-retalls com a fitxers JPG per estalviar espai al disc. Podeu utilitzar aquesta opció per enganxar com a imatges PNG.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Enrera dos vegades per enrera o sortir</string>
     <string name="exit_via_double_tap_back_summ">Per evitar abandonar accidentalment el revisor o l\'aplicació</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-ckb/01-core.xml b/AnkiDroid/src/main/res/values-ckb/01-core.xml
index 768a895eeb64..4fc39e8483ab 100644
--- a/AnkiDroid/src/main/res/values-ckb/01-core.xml
+++ b/AnkiDroid/src/main/res/values-ckb/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">بەتاڵ</string>
     <string name="create_subdeck">Create subdeck</string>
     <string name="empty_filtered_deck">Emptying filtered deck&#8230;</string>
-    <string name="custom_study_deck_name">Custom study session</string>
-    <string name="custom_study_deck_exists">Rename the existing custom study deck first</string>
     <string name="search_deck" comment="Deck search for selecting it">Deck Search</string>
     <string name="empty_deck">This deck is empty</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Deck Search</string>
diff --git a/AnkiDroid/src/main/res/values-ckb/02-strings.xml b/AnkiDroid/src/main/res/values-ckb/02-strings.xml
index 52da1ad95684..d88b97498732 100644
--- a/AnkiDroid/src/main/res/values-ckb/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ckb/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flags</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limit to particular tags</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="other">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-ckb/03-dialogs.xml b/AnkiDroid/src/main/res/values-ckb/03-dialogs.xml
index bc39ef10c3ad..c21bd4374f41 100644
--- a/AnkiDroid/src/main/res/values-ckb/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ckb/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead">Review ahead by x days:</string>
     <string name="custom_study_preview">Preview new cards added in the last x days:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Storage full</string>
     <string name="storage_almost_full_title">Storage almost full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-ckb/10-preferences.xml b/AnkiDroid/src/main/res/values-ckb/10-preferences.xml
index 5f33bc5fee24..2067dfab39b5 100644
--- a/AnkiDroid/src/main/res/values-ckb/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ckb/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Pêşketî</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
     <string name="use_input_tag" maxLength="41">Type answer into the card</string>
@@ -204,7 +205,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-cs/01-core.xml b/AnkiDroid/src/main/res/values-cs/01-core.xml
index 1218cd742beb..d0ddeed9d272 100644
--- a/AnkiDroid/src/main/res/values-cs/01-core.xml
+++ b/AnkiDroid/src/main/res/values-cs/01-core.xml
@@ -129,8 +129,6 @@
     <string name="empty_cram_label" maxLength="28">Vyprázdnit</string>
     <string name="create_subdeck">Vytvořit podřízený balíček</string>
     <string name="empty_filtered_deck">Vyprazdňuje se filtrovaný balíček&#8230;</string>
-    <string name="custom_study_deck_name">Dodatečné procvičování</string>
-    <string name="custom_study_deck_exists">Nejdříve přejmenujte stávající balíček vlastního studia</string>
     <string name="search_deck" comment="Deck search for selecting it">Hledat balíček</string>
     <string name="empty_deck">Tento balíček je prázdný</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Hledat balíček</string>
diff --git a/AnkiDroid/src/main/res/values-cs/02-strings.xml b/AnkiDroid/src/main/res/values-cs/02-strings.xml
index 5c7ea0c330da..e82e05cc283a 100644
--- a/AnkiDroid/src/main/res/values-cs/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-cs/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">Systémovému WebView se nepodařilo vykreslit kartu „%1$s“.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Příznaky</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Omezit podle štítků</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d přeskočená</item>
         <item quantity="few">+%d přeskočené</item>
@@ -241,7 +242,7 @@
     <string name="note_editor_image_too_large">Obrázek je příliš velký, vložte ho prosím ručně</string>
     <string name="note_editor_video_too_large">Video je příliš velké, vložte ho prosím ručně</string>
     <string name="note_editor_audio_too_large">Zvukový soubor je příliš velký, vložte ho prosím ručně</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Probíhá zálohování Androidu. Zkuste to prosím znovu</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">Prosím použijte iManager, abyste povolili přidávání zástupců AnkiDroid</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Vaše domovská obrazovka neumožňuje AnkiDroidu přidávat zástupce</string>
     <string name="create_shortcut_error">Chyba při přidávání zástupce: %s</string>
@@ -257,7 +258,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Stáhnout balíček</string>
-    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Otevřít v prohlížeči</string>
     <string name="try_again">Zkusit znovu</string>
     <string name="cancel_download">Zrušit stahování</string>
     <string name="cancel_download_question_title">Zrušit stahování?</string>
@@ -316,14 +317,14 @@
     <string name="browser_options_dialog_heading">Možnosti prohlížeče</string>
     <string name="audio_saved">Nahrávka uložena</string>
     <string name="deleting_selected_notes">Mažou se vybrané poznámky</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Klepněte na mikrofon pro poslech</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Hlas by měl být před použitím nainstalován</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Přesto použít</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Chyba převodu textu na řeč (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Instalovat</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Nepodařilo se otevřít nastavení převodu textu na řeč</string>
     <string name="shared_decks_login_required">Prosím přihlaste se, abyste mohli stáhnout více balíčků</string>
     <string name="deck_description_field_hint">Popisek</string>
     <string name="failed_to_copy">Kopírování se nezdařilo</string>
@@ -345,17 +346,17 @@
     <string name="voice_not_supported">Hlas není podporován. Zkuste jiný nebo nainstalujte hlasový modul.</string>
     <!--Keyboard shortcuts dialog-->
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Výběr balíčků</string>
-    <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
+    <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Odstranit balíček bez potvrzení</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Editor Paznámek</string>
-    <string name="select_deck" comment="Description of the shortcut that opens the deck selection dialog">Select deck</string>
-    <string name="select_note_type" comment="Description of the shortcut that shows the note selection spinner">Select note type</string>
-    <string name="tag_editor" comment="Description of the shortcut that opens the tags dialog">Tag editor</string>
+    <string name="select_deck" comment="Description of the shortcut that opens the deck selection dialog">Vybrat balíček</string>
+    <string name="select_note_type" comment="Description of the shortcut that shows the note selection spinner">Vybrat typ poznámky</string>
+    <string name="tag_editor" comment="Description of the shortcut that opens the tags dialog">Editor štítků</string>
     <string name="card_template_editor_group" comment="Label for the group of shortcuts related to the card template editor">Card Template Editor</string>
-    <string name="edit_front_template" comment="Description of the shortcut that shows the question side of the card template">Edit front template</string>
-    <string name="edit_back_template" comment="Description of the shortcut that shows the answer side of the card template">Edit back template</string>
+    <string name="edit_front_template" comment="Description of the shortcut that shows the question side of the card template">Upravit šablonu přední strany</string>
+    <string name="edit_back_template" comment="Description of the shortcut that shows the answer side of the card template">Upravit šablonu zadní strany</string>
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Upravit formátování</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
-    <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
+    <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Upravit vzhled prohlížeče</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">Akce uživatele %s není v tomto typu poznámky nastavena. Nakonfigurujte ji prosím</string>
-    <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
+    <string name="directory_inaccessible_info">Další informace o tom, jak obnovit přístup zde %s nebo přejděte do nastavení a aktualizujte složku s kolekcí.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-cs/03-dialogs.xml b/AnkiDroid/src/main/res/values-cs/03-dialogs.xml
index 570f49c5da8a..7b1e6235e1c8 100644
--- a/AnkiDroid/src/main/res/values-cs/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-cs/03-dialogs.xml
@@ -77,6 +77,7 @@
     <string name="custom_study_forgotten">Opakovat zapomenuté karty z posledních x dnů:</string>
     <string name="custom_study_ahead">Opakovat dopředu o x dnů:</string>
     <string name="custom_study_preview">Zkoušení nových karet přidaných v posledních x dnech:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Úložiště je plné</string>
     <string name="storage_almost_full_title">Úložiště téměř plné</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">Není místo</string>
@@ -108,8 +109,8 @@
     <string name="check_media_title">Zkontrolovat multimédia?</string>
     <string name="check_media_warning">Toto může trvat dlouhou dobu u velké sbírky multimédií</string>
     <string name="check_media_message">Kontrolují se multimédia&#8230;</string>
-    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
-    <string name="check_media_tags_added">Tags added</string>
+    <string name="check_media_adding_missing_tag">Přidávání štítků&#8230;</string>
+    <string name="check_media_tags_added">Štítky přidány</string>
     <string name="delete_media_message">Odstraňují se multimédia&#8230;</string>
     <string name="delete_media_result_title">Výsledek odstraňování</string>
     <plurals name="delete_media_result_message">
diff --git a/AnkiDroid/src/main/res/values-cs/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-cs/07-cardbrowser.xml
index 869cd289dd17..afbb3b815d9d 100644
--- a/AnkiDroid/src/main/res/values-cs/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-cs/07-cardbrowser.xml
@@ -121,7 +121,7 @@
         <item quantity="other">%d karet odstraněno</item>
     </plurals>
     <!--Keyboard shortcuts dialog-->
-    <string name="edit_tags_dialog" comment="Description of the shortcut that opens the edit tags dialog">Edit tags dialog</string>
+    <string name="edit_tags_dialog" comment="Description of the shortcut that opens the edit tags dialog">Dialog úprav štítků</string>
     <string name="show_order_dialog" comment="Description of the shortcut that shows the order dialog">Show order dialog</string>
     <!-- Manage columns dialog -->
     <string name="browse_manage_columns_main_heading">Sloupce</string>
diff --git a/AnkiDroid/src/main/res/values-cs/08-widget.xml b/AnkiDroid/src/main/res/values-cs/08-widget.xml
index 78b6ccb4d535..07579668aaf6 100644
--- a/AnkiDroid/src/main/res/values-cs/08-widget.xml
+++ b/AnkiDroid/src/main/res/values-cs/08-widget.xml
@@ -80,6 +80,6 @@
         <item quantity="many">Můžete vybrat až %d balíčku.</item>
         <item quantity="other">Můžete vybrat až %d balíčků.</item>
     </plurals>
-    <string name="empty_widget_state" comment="To denote the widget is empty">Missing deck. Tap to reconfigure.</string>
-    <string name="empty_collection_state_in_widget" comment="To denote the collection is empty">Collection is empty, use app to add decks then reconfigure</string>
+    <string name="empty_widget_state" comment="To denote the widget is empty">Chybějící balíček. Klepněte pro nastavení</string>
+    <string name="empty_collection_state_in_widget" comment="To denote the collection is empty">Kolekce je prázdná, přidejte balíčky pomocí aplikace a poté znovu konfugurujte</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-cs/10-preferences.xml b/AnkiDroid/src/main/res/values-cs/10-preferences.xml
index dad229ecc8ef..b02c8043fab6 100644
--- a/AnkiDroid/src/main/res/values-cs/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-cs/10-preferences.xml
@@ -70,6 +70,7 @@
     <string name="pref_cat_advanced" maxLength="41">Pokročilé</string>
     <string name="pref_cat_workarounds" maxLength="41">Možná zástupná řešení</string>
     <string name="pref_cat_plugins" maxLength="41">Pluginy</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Šířka tahu</string>
     <string name="use_input_tag" maxLength="41">Napište odpověď do karty</string>
@@ -99,7 +100,7 @@
     <string name="gestures_summ">Přiřazení gest akcím, jako je odpovídání a úprava karet</string>
     <string name="gestures_corner_touch" maxLength="41">Devítibodový dotyk</string>
     <string name="gestures_corner_touch_summary">Povolí dotyková gesta v rozích obrazovky</string>
-    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Zobrazit klávesové zkratky</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Navigační menu v režimu celé obrazovky</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Otevřít navigační menu, když se táhne doprava kdekoliv na obrazovce</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Žádné</string>
@@ -207,7 +208,6 @@
     <string name="accessibility" maxLength="41">Usnadnění přístupu</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Vkládat obrázky ze schránky jako PNG</string>
-    <string name="paste_as_png_summary">Ve výchozím nastavení Anki vkládá obrázky ve schránce jako JPG soubory, aby se šetřilo místo na disku. Můžete použít tuto volbu, aby se místo toho vkládaly PNG obrázky</string>
     <string name="exit_via_double_tap_back" maxLength="41">Pro návrat/ukončit stisknout zpět dvakrát</string>
     <string name="exit_via_double_tap_back_summ">Vyhnout se nechtěnému opuštění opakování nebo ukončení aplikace</string>
     <!-- Allow all files in media imports -->
@@ -300,7 +300,8 @@
     <string name="pref_cat_dev_options" maxLength="41">Možnosti pro vývojáře</string>
     <string name="dev_options_enabled_pref" maxLength="41">Povolit možnosti pro vývojáře</string>
     <string name="disable_dev_options">Zakázat možnosti pro vývojáře</string>
-    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
+    <string name="dev_options_warning">Buďte si prosím jisti před povolením nástrojů pro vývojáře. Tyto nástroje jsou nebezpečné a mohou poškodit aplikaci nebo vaši kolekci.\n\nVšimněte si, že tyto nástroje nejsou vhodné pro většinu uživatelů, a nejsou proto přeloženy, jsou tudíž v angličtině.
+    </string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
@@ -374,5 +375,5 @@
     <string name="reviewer_frame_style_card" maxLength="41" comment="Style name of the \'Card\' card frame of the Reviewer">Karta</string>
     <string name="reviewer_frame_style_box" maxLength="41" comment="Style name of the \'Box\' card frame of the Reviewer">Box</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="open_settings" comment="Description of the shortcut that opens the app settings">Open settings</string>
+    <string name="open_settings" comment="Description of the shortcut that opens the app settings">Otevřít nastavení</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-cs/17-model-manager.xml b/AnkiDroid/src/main/res/values-cs/17-model-manager.xml
index d2ab662ce0d7..b0e4c7e4f5b2 100644
--- a/AnkiDroid/src/main/res/values-cs/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-cs/17-model-manager.xml
@@ -68,9 +68,9 @@
     <string name="model_delete_warning">Opravdu si přejete odstranit tento typ poznámky?</string>
     <string name="field_delete_warning">Opravdu si přejete odstranit toto pole?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s</string>
+    <string name="model_browser_add_add">Přidat: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s</string>
+    <string name="model_browser_add_clone">Kopírovat: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Zadejte šablonu, kterou bude prohlížeč karet používat k zobrazení vašich karet. Použijte tuto možnost, abyste zobrazili stručnější odpovědi.\n\nŠablona líce\n„Hlavní město země {{Country}} je:“\nmůže být zestručněna v prohlížeči karet na\n„Hlavní město: {{Country}}“</string>
     <string name="card_template_browser_appearance_question_format">Formát otázky</string>
diff --git a/AnkiDroid/src/main/res/values-da/01-core.xml b/AnkiDroid/src/main/res/values-da/01-core.xml
index 1563487eb1d2..e6c587230fd7 100644
--- a/AnkiDroid/src/main/res/values-da/01-core.xml
+++ b/AnkiDroid/src/main/res/values-da/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Tøm</string>
     <string name="create_subdeck">Opret understak</string>
     <string name="empty_filtered_deck">Tømmer filtreret stak&#8230;</string>
-    <string name="custom_study_deck_name">Tilpasset studiesession</string>
-    <string name="custom_study_deck_exists">Omdøb den eksisterende tilpassede stak først</string>
     <string name="search_deck" comment="Deck search for selecting it">Staksøgning</string>
     <string name="empty_deck">Denne stak er tom</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Staksøgning</string>
diff --git a/AnkiDroid/src/main/res/values-da/02-strings.xml b/AnkiDroid/src/main/res/values-da/02-strings.xml
index 6475ae4cf783..c135d8e2eb93 100644
--- a/AnkiDroid/src/main/res/values-da/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-da/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flags</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Begræns til bestemte tags</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="other">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-da/03-dialogs.xml b/AnkiDroid/src/main/res/values-da/03-dialogs.xml
index 444fb91466b1..c24443f75498 100644
--- a/AnkiDroid/src/main/res/values-da/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-da/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead">Review ahead by x days:</string>
     <string name="custom_study_preview">Preview new cards added in the last x days:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Lagerplads opbrugt</string>
     <string name="storage_almost_full_title">Lagerplads næsten fuld</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-da/10-preferences.xml b/AnkiDroid/src/main/res/values-da/10-preferences.xml
index 7ab27922efbc..b881c76aacc7 100644
--- a/AnkiDroid/src/main/res/values-da/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-da/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Advanced</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
     <string name="use_input_tag" maxLength="41">Type answer into the card</string>
@@ -204,7 +205,6 @@
     <string name="accessibility" maxLength="41">Tilgængelighed</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-de/01-core.xml b/AnkiDroid/src/main/res/values-de/01-core.xml
index 9b079bacf0a6..5018cf966b46 100644
--- a/AnkiDroid/src/main/res/values-de/01-core.xml
+++ b/AnkiDroid/src/main/res/values-de/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Leeren</string>
     <string name="create_subdeck">Unterstapel erstellen</string>
     <string name="empty_filtered_deck">Gefilterter Stapel wird geleert &#8230;</string>
-    <string name="custom_study_deck_name">Benutzerdefinierte Sitzung</string>
-    <string name="custom_study_deck_exists">Bitte benennen Sie zunächst den existierenden Stapel »Benutzerdefinierte Sitzung« um</string>
     <string name="search_deck" comment="Deck search for selecting it">Stapelsuche</string>
     <string name="empty_deck">Dieser Stapel ist leer</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Stapelsuche</string>
diff --git a/AnkiDroid/src/main/res/values-de/02-strings.xml b/AnkiDroid/src/main/res/values-de/02-strings.xml
index 07ccdb0d2fff..0e3c0be30fdd 100644
--- a/AnkiDroid/src/main/res/values-de/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-de/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System-WebView konnte die Karte »%1$s« nicht rendern.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flaggen</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Auf bestimmte Schlagwörter beschränken</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d aufgeschoben</item>
         <item quantity="other">+%d vergraben</item>
diff --git a/AnkiDroid/src/main/res/values-de/03-dialogs.xml b/AnkiDroid/src/main/res/values-de/03-dialogs.xml
index 73c7a7e1eab4..4b74d41029c6 100644
--- a/AnkiDroid/src/main/res/values-de/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-de/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Karten wiederholen, die in den letzten x Tagen vergessen wurden:</string>
     <string name="custom_study_ahead">x Tage im Voraus lernen:</string>
     <string name="custom_study_preview">Vorschau auf neue Karten, die in den letzten x Tagen hinzugefügt wurden:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Speicher voll</string>
     <string name="storage_almost_full_title">Speicher fast voll</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">Kein Speicherplatz</string>
diff --git a/AnkiDroid/src/main/res/values-de/10-preferences.xml b/AnkiDroid/src/main/res/values-de/10-preferences.xml
index eab456240d31..28ab439abd97 100644
--- a/AnkiDroid/src/main/res/values-de/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-de/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Erweitert</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plug-Ins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Pinselbreite</string>
     <string name="use_input_tag" maxLength="41">Antwort in Karte eintippen</string>
@@ -203,7 +204,6 @@
     <string name="accessibility" maxLength="41">Bedienungshilfen</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Zwischenablage-Bilder als PNG einfügen</string>
-    <string name="paste_as_png_summary">Standardmäßig fügt Anki Bilder in der Zwischenablage als JPG-Dateien ein, um Speicherplatz zu sparen. Sie können diese Einstellung verwenden, um stattdessen PNG-Bilder einzufügen.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Zweimal Zurück drücken, um zurückzugehen</string>
     <string name="exit_via_double_tap_back_summ">Um zu vermeiden, dass Sie den Rezensenten oder die App versehentlich verlassen</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-el/01-core.xml b/AnkiDroid/src/main/res/values-el/01-core.xml
index feb50acc25d5..a74bb54b8abf 100644
--- a/AnkiDroid/src/main/res/values-el/01-core.xml
+++ b/AnkiDroid/src/main/res/values-el/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Άδειασμα</string>
     <string name="create_subdeck">Δημιουργία υποτράπουλας</string>
     <string name="empty_filtered_deck">Άδειασμα φιλτραρισμένης τράπουλας&#8230;</string>
-    <string name="custom_study_deck_name">Προσαρμοσμένη μελέτη λειτουργίας</string>
-    <string name="custom_study_deck_exists">Παρακαλούμε μετονομάστε την υπάρχουσα τράπουλα Προσαρμοσμένης Μελέτης πρώτα.</string>
     <string name="search_deck" comment="Deck search for selecting it">Αναζήτηση</string>
     <string name="empty_deck">Αυτή η τράπουλα είναι κενή</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Αναζήτηση</string>
diff --git a/AnkiDroid/src/main/res/values-el/02-strings.xml b/AnkiDroid/src/main/res/values-el/02-strings.xml
index 7cc8c8017b6a..d168209a8220 100644
--- a/AnkiDroid/src/main/res/values-el/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-el/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">Το σύστημα WebView απέτυχε να αποδώσει την κάρτα \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Σημαίες</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Περιορισμός σε συγκεκριμένες ετικέτες</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="other">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-el/03-dialogs.xml b/AnkiDroid/src/main/res/values-el/03-dialogs.xml
index 229892ab9630..fff555e44ba1 100644
--- a/AnkiDroid/src/main/res/values-el/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-el/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Επανάληψη ξεχασμένων καρτών στις τελευταίες x μέρες:</string>
     <string name="custom_study_ahead">Επανάληψη μπροστά κατά x μέρες:</string>
     <string name="custom_study_preview">Προεπισκόπηση νέων καρτών του προστέθηκαν στις τελευταίες x μέρες:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Γεμάτος χώρος αποθήκευσης</string>
     <string name="storage_almost_full_title">Χώρος αποθήκευσης σχεδόν πλήρης</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">Χωρίς αποθηκευτικό χώρο</string>
diff --git a/AnkiDroid/src/main/res/values-el/10-preferences.xml b/AnkiDroid/src/main/res/values-el/10-preferences.xml
index 7d488a099e74..7288be07ad12 100644
--- a/AnkiDroid/src/main/res/values-el/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-el/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Σύνθετα</string>
     <string name="pref_cat_workarounds" maxLength="41">Λύσεις</string>
     <string name="pref_cat_plugins" maxLength="41">Αρθρώματα</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
     <string name="use_input_tag" maxLength="41">Πληκτρολογήστε την απάντηση στην κάρτα</string>
@@ -204,7 +205,6 @@
     <string name="accessibility" maxLength="41">Προσβασιμότητα</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Επικόλληση εικόνων προχείρου ως PNG</string>
-    <string name="paste_as_png_summary">Από προεπιλογή Anki επικολλά εικόνες στο πρόχειρο ως αρχεία JPG για να αποθηκεύσετε χώρο στο δίσκο. Μπορείτε να χρησιμοποιήσετε αυτήν την επιλογή για να επικολλήσετε ως εικόνες PNG.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Πατήστε πίσω δύο φορές για επιστροφή/έξοδο</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-eo/01-core.xml b/AnkiDroid/src/main/res/values-eo/01-core.xml
index 0c53a08499cd..281cb8374d28 100644
--- a/AnkiDroid/src/main/res/values-eo/01-core.xml
+++ b/AnkiDroid/src/main/res/values-eo/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Malplenigi</string>
     <string name="create_subdeck">Krei subkartaron</string>
     <string name="empty_filtered_deck">Malplenigado de filtrita kartaro&#8230;</string>
-    <string name="custom_study_deck_name">Propra lernado</string>
-    <string name="custom_study_deck_exists">Unue ŝanĝu nomon de kartaro por propra lernado</string>
     <string name="search_deck" comment="Deck search for selecting it">Serĉi kartaron</string>
     <string name="empty_deck">Tiu ĉi kartaro estas malplena</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Serĉi kartaron</string>
diff --git a/AnkiDroid/src/main/res/values-eo/02-strings.xml b/AnkiDroid/src/main/res/values-eo/02-strings.xml
index 740d881ae8ce..74b13a6efcf9 100644
--- a/AnkiDroid/src/main/res/values-eo/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-eo/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">La operciuma komponanto WebView malsukcesis bildigi la karton “%1$s”.\n%2$s</string>
     <string name="filter_by_flags" maxLength="41">Flagoj</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limigi al specialaj etikedoj</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d kaŝita (por tago)</item>
         <item quantity="other">+%d kaŝitaj (por tago)</item>
diff --git a/AnkiDroid/src/main/res/values-eo/03-dialogs.xml b/AnkiDroid/src/main/res/values-eo/03-dialogs.xml
index 6d5f264ae7b7..51d8ddc18a87 100644
--- a/AnkiDroid/src/main/res/values-eo/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-eo/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Ripeti kartojn forgesitajn dum tiom da antaŭaj tagoj:</string>
     <string name="custom_study_ahead">Anticipe ripeti kartojn je tiom da tagoj:</string>
     <string name="custom_study_preview">Antaŭrigardi novajn kartojn aldonitajn dum tiom da antaŭaj tagoj:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Konservejo plena</string>
     <string name="storage_almost_full_title">Konservejo preskaŭ plena</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">Mankas spaco</string>
diff --git a/AnkiDroid/src/main/res/values-eo/10-preferences.xml b/AnkiDroid/src/main/res/values-eo/10-preferences.xml
index 7c1fdd94fe18..43e86a4adc77 100644
--- a/AnkiDroid/src/main/res/values-eo/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-eo/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Altnivelaj</string>
     <string name="pref_cat_workarounds" maxLength="41">Provizoraĵoj</string>
     <string name="pref_cat_plugins" maxLength="41">Kromaĵoj</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Larĝo de streko</string>
     <string name="use_input_tag" maxLength="41">Enigi respondon al karto</string>
@@ -203,7 +204,6 @@
     <string name="accessibility" maxLength="41">Alirebleco</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Alglui bildojn kiel PNG</string>
-    <string name="paste_as_png_summary">Implicite la aplikaĵo Anki algluas bildojn el la tondujo kiel dosierojn JPG por konservi spacon. Vi povas uzi tiun ĉi agordon por alglui ilin kiel PNG.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Duoble premi por reiri/eliri</string>
     <string name="exit_via_double_tap_back_summ">Por eviti neatenditan eliron el la aplikaĵo</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-es-rAR/01-core.xml b/AnkiDroid/src/main/res/values-es-rAR/01-core.xml
index 1c38340f8293..0863493144c8 100644
--- a/AnkiDroid/src/main/res/values-es-rAR/01-core.xml
+++ b/AnkiDroid/src/main/res/values-es-rAR/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Vaciar</string>
     <string name="create_subdeck">Crear submazo</string>
     <string name="empty_filtered_deck">Vaciando mazo filtrado</string>
-    <string name="custom_study_deck_name">Sesión de estudio personalizado</string>
-    <string name="custom_study_deck_exists">Renombre primero el mazo de estudio personalizado existente</string>
     <string name="search_deck" comment="Deck search for selecting it">Buscar mazo</string>
     <string name="empty_deck">Este mazo está vacío</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Búsqueda de Mazo</string>
diff --git a/AnkiDroid/src/main/res/values-es-rAR/02-strings.xml b/AnkiDroid/src/main/res/values-es-rAR/02-strings.xml
index 22ce73cb805f..12424cb39be6 100644
--- a/AnkiDroid/src/main/res/values-es-rAR/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-es-rAR/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">WebView del sistema no pudo procesar la tarjeta \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Banderas</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limitar a etiquetas particulares</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d enterrada</item>
         <item quantity="other">+%d enterradas</item>
diff --git a/AnkiDroid/src/main/res/values-es-rAR/03-dialogs.xml b/AnkiDroid/src/main/res/values-es-rAR/03-dialogs.xml
index e3c87cb1651c..62d24f4e4739 100644
--- a/AnkiDroid/src/main/res/values-es-rAR/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-es-rAR/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Repasar tarjetas olvidadas en los últimos x días:</string>
     <string name="custom_study_ahead">Revisar anticipadamente en x días:</string>
     <string name="custom_study_preview">Previsualizar nuevas tarjetas añadidas en los últimos x días:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Almacenamiento lleno</string>
     <string name="storage_almost_full_title">Almacenamiento casi lleno</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">Sin spacio</string>
diff --git a/AnkiDroid/src/main/res/values-es-rAR/10-preferences.xml b/AnkiDroid/src/main/res/values-es-rAR/10-preferences.xml
index 2a37f89dcfb8..6bbcad2a7640 100644
--- a/AnkiDroid/src/main/res/values-es-rAR/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-es-rAR/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Avanzado</string>
     <string name="pref_cat_workarounds" maxLength="41">Soluciones</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Ancho del trazo</string>
     <string name="use_input_tag" maxLength="41">Tipear la respuesta en la tarjeta</string>
@@ -203,7 +204,6 @@
     <string name="accessibility" maxLength="41">Accesibilidad</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Pegar imágenes del portapapeles como PNG</string>
-    <string name="paste_as_png_summary">Por defecto Anki pega imágenes en el portapapeles como archivos JPG para ahorrar espacio en disco. Puede utilizar esta opción para pegar como imágenes PNG en su lugar.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Presione dos veces para regresar o salir</string>
     <string name="exit_via_double_tap_back_summ">Para evitar dejar accidentalmente el revisor o la aplicación</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-es-rES/01-core.xml b/AnkiDroid/src/main/res/values-es-rES/01-core.xml
index e861c541f71b..f5dd3901e29f 100644
--- a/AnkiDroid/src/main/res/values-es-rES/01-core.xml
+++ b/AnkiDroid/src/main/res/values-es-rES/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Vaciar</string>
     <string name="create_subdeck">Crear submazo</string>
     <string name="empty_filtered_deck">Vaciando mazo filtrado&#8230;</string>
-    <string name="custom_study_deck_name">Sesión de estudio personalizado</string>
-    <string name="custom_study_deck_exists">Renombra el mazo de estudio personalizado primero</string>
     <string name="search_deck" comment="Deck search for selecting it">Buscar Mazos</string>
     <string name="empty_deck">Este mazo está vacío</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Búsqueda de Mazo</string>
diff --git a/AnkiDroid/src/main/res/values-es-rES/02-strings.xml b/AnkiDroid/src/main/res/values-es-rES/02-strings.xml
index 9ee1842880b0..49b477c02c1e 100644
--- a/AnkiDroid/src/main/res/values-es-rES/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-es-rES/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">WebView del sistema no pudo procesar la tarjeta \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Banderas</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limitar a etiquetas concretas</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d enterrada</item>
         <item quantity="other">+%d enterradas</item>
diff --git a/AnkiDroid/src/main/res/values-es-rES/03-dialogs.xml b/AnkiDroid/src/main/res/values-es-rES/03-dialogs.xml
index 7ae7970d465e..eebae194b3ca 100644
--- a/AnkiDroid/src/main/res/values-es-rES/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-es-rES/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Revisar tarjetas olvidadas en los últimos x días:</string>
     <string name="custom_study_ahead">Revisar con x días de adelanto:</string>
     <string name="custom_study_preview">Previsualizar nuevas tarjetas añadidas en los últimos x días:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Almacenamiento lleno</string>
     <string name="storage_almost_full_title">Almacenamiento casi lleno</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">Sin spacio</string>
diff --git a/AnkiDroid/src/main/res/values-es-rES/10-preferences.xml b/AnkiDroid/src/main/res/values-es-rES/10-preferences.xml
index 7b806a7716b6..2a9209961af0 100644
--- a/AnkiDroid/src/main/res/values-es-rES/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-es-rES/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Avanzado</string>
     <string name="pref_cat_workarounds" maxLength="41">Soluciones</string>
     <string name="pref_cat_plugins" maxLength="41">Complementos</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Ancho del trazo</string>
     <string name="use_input_tag" maxLength="41">Escribir respuesta en la tarjeta</string>
@@ -203,7 +204,6 @@
     <string name="accessibility" maxLength="41">Accesibilidad</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Pegar imágenes del portapapeles como PNG</string>
-    <string name="paste_as_png_summary">Por defecto Anki pega imágenes en el portapapeles como archivos JPG para ahorrar espacio en disco. Puede utilizar esta opción para pegar como imágenes PNG en su lugar.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Presione dos veces para regresar o salir</string>
     <string name="exit_via_double_tap_back_summ">Para evitar dejar accidentalmente el revisor o la aplicación</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-et/01-core.xml b/AnkiDroid/src/main/res/values-et/01-core.xml
index d7f8f91a9333..1c0877003ccc 100644
--- a/AnkiDroid/src/main/res/values-et/01-core.xml
+++ b/AnkiDroid/src/main/res/values-et/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Tühi</string>
     <string name="create_subdeck">Loo alakaardipakk</string>
     <string name="empty_filtered_deck">Tühjendan filtritud kaardipakki&#8230;</string>
-    <string name="custom_study_deck_name">Kohandatud õppesessioon</string>
-    <string name="custom_study_deck_exists">Esmalt nimeta ümber juba olemasolev täiendava õppe kaardipakk</string>
     <string name="search_deck" comment="Deck search for selecting it">Otsi kaardipakki</string>
     <string name="empty_deck">See kaardipakk on tühi</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Otsi kaardipakki</string>
diff --git a/AnkiDroid/src/main/res/values-et/02-strings.xml b/AnkiDroid/src/main/res/values-et/02-strings.xml
index 8b6bc87b548b..4377b6fd1917 100644
--- a/AnkiDroid/src/main/res/values-et/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-et/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flags</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limit to particular tags</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="other">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-et/03-dialogs.xml b/AnkiDroid/src/main/res/values-et/03-dialogs.xml
index 6e2ecf53d09b..f5a03de89b6b 100644
--- a/AnkiDroid/src/main/res/values-et/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-et/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead">Review ahead by x days:</string>
     <string name="custom_study_preview">Preview new cards added in the last x days:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Storage full</string>
     <string name="storage_almost_full_title">Storage almost full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-et/10-preferences.xml b/AnkiDroid/src/main/res/values-et/10-preferences.xml
index 46df56dac63c..52bb1431fbdb 100644
--- a/AnkiDroid/src/main/res/values-et/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-et/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Advanced</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Joone laius</string>
     <string name="use_input_tag" maxLength="41">Kirjuta vastus kaarti</string>
@@ -204,7 +205,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-eu/01-core.xml b/AnkiDroid/src/main/res/values-eu/01-core.xml
index 0456163ecaee..08e59b7ae73e 100644
--- a/AnkiDroid/src/main/res/values-eu/01-core.xml
+++ b/AnkiDroid/src/main/res/values-eu/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Hustu</string>
     <string name="create_subdeck">Create subdeck</string>
     <string name="empty_filtered_deck">Emptying filtered deck&#8230;</string>
-    <string name="custom_study_deck_name">Ikasketa saio pertsonalizatua</string>
-    <string name="custom_study_deck_exists">Aldatu izena dagoen ikasketa sortari aurretik</string>
     <string name="search_deck" comment="Deck search for selecting it">Deck Search</string>
     <string name="empty_deck">Sorta hau hutsik dago</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Deck Search</string>
diff --git a/AnkiDroid/src/main/res/values-eu/02-strings.xml b/AnkiDroid/src/main/res/values-eu/02-strings.xml
index a7cd8b76e0fa..66f27c5e6b60 100644
--- a/AnkiDroid/src/main/res/values-eu/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-eu/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flags</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limit to particular tags</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="other">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-eu/03-dialogs.xml b/AnkiDroid/src/main/res/values-eu/03-dialogs.xml
index 19f87ed1dc76..1b25065c8c2a 100644
--- a/AnkiDroid/src/main/res/values-eu/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-eu/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Azkenengo x egunetan ahaztu diren kartak errepasatu:</string>
     <string name="custom_study_ahead">X egun lehenago errepasatu:</string>
     <string name="custom_study_preview">Preview new cards added in the last x days:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Storage full</string>
     <string name="storage_almost_full_title">Storage almost full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-eu/10-preferences.xml b/AnkiDroid/src/main/res/values-eu/10-preferences.xml
index 69b104cf2604..b4efe843f8e6 100644
--- a/AnkiDroid/src/main/res/values-eu/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-eu/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Aurreratua</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
     <string name="use_input_tag" maxLength="41">Type answer into the card</string>
@@ -204,7 +205,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-fa/01-core.xml b/AnkiDroid/src/main/res/values-fa/01-core.xml
index 23521d588c04..f7858b85af83 100644
--- a/AnkiDroid/src/main/res/values-fa/01-core.xml
+++ b/AnkiDroid/src/main/res/values-fa/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">تخلیه</string>
     <string name="create_subdeck">ایجاد زیردسته</string>
     <string name="empty_filtered_deck">درحال تخلیه دسته‌ی کارت فیلتر شده&#8230;</string>
-    <string name="custom_study_deck_name">جلسه مطالعه سفارشی</string>
-    <string name="custom_study_deck_exists">لطفا ابتدا دسته مطالعه سفارشی موجود را مجددا نام گذاری کنید.</string>
     <string name="search_deck" comment="Deck search for selecting it">جستجوی دسته‌ها</string>
     <string name="empty_deck">این دسته خالی است</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">جستجوی دسته‌ها</string>
diff --git a/AnkiDroid/src/main/res/values-fa/02-strings.xml b/AnkiDroid/src/main/res/values-fa/02-strings.xml
index 688d579fa4c9..65e8458d9a6f 100644
--- a/AnkiDroid/src/main/res/values-fa/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fa/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">سیستم در تنظیم ظاهر کارت %1$s با خطا مواجه شد.\n%2$s</string>
     <string name="filter_by_flags" maxLength="41">پرچم ها</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">محدود کردن به برچسب هايی خاص</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d دفن شده</item>
         <item quantity="other">+%d دفن شده</item>
diff --git a/AnkiDroid/src/main/res/values-fa/03-dialogs.xml b/AnkiDroid/src/main/res/values-fa/03-dialogs.xml
index 1041d87c1589..cd0de0dc8cd3 100644
--- a/AnkiDroid/src/main/res/values-fa/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-fa/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">مرور کارت های فراموش شده در x روز گذشته:</string>
     <string name="custom_study_ahead">مرور پیش از موعد تا x روز:</string>
     <string name="custom_study_preview">پیش نمایش کارت های جدید اضافه شده در  x روز گذشته:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">حافظه</string>
     <string name="storage_almost_full_title">اوکی</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">جای خالی وجود ندارد</string>
diff --git a/AnkiDroid/src/main/res/values-fa/10-preferences.xml b/AnkiDroid/src/main/res/values-fa/10-preferences.xml
index f40c87670dcd..d8bd28377d5a 100644
--- a/AnkiDroid/src/main/res/values-fa/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-fa/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">پیشرفته</string>
     <string name="pref_cat_workarounds" maxLength="41">راه‌حل‌ها</string>
     <string name="pref_cat_plugins" maxLength="41">افزونه‌ها</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">کلفتی خط</string>
     <string name="use_input_tag" maxLength="41">پاسخ را در کارت بنویسید</string>
@@ -203,7 +204,6 @@
     <string name="accessibility" maxLength="41">قابلیت دسترسی</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">عکس های کلیپبورد را به عنوان PNG پِیست کن</string>
-    <string name="paste_as_png_summary">طبق پیش فرض Anki عکس های روی کلیپ بورد را به صورت فایل های JPG پیست میکند تا مقداری حجم ذخیره کند. شما میتوانید از این گزینه استفاده کنید تا عکس ها را به صورت PNG پیست کنید.</string>
     <string name="exit_via_double_tap_back" maxLength="41">دوبار عقب را بزنید که به عقب/خروج بروید</string>
     <string name="exit_via_double_tap_back_summ">تا از اشتباهی بیرون رفتن از مرورگر یا برنامه جلوگیری کنید</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-fi/01-core.xml b/AnkiDroid/src/main/res/values-fi/01-core.xml
index 8b337539ad00..719ddf308fe0 100644
--- a/AnkiDroid/src/main/res/values-fi/01-core.xml
+++ b/AnkiDroid/src/main/res/values-fi/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Tyhjä</string>
     <string name="create_subdeck">Luo johdannais pakka</string>
     <string name="empty_filtered_deck">Tyhjennetään suodatettu pakka&#8230;</string>
-    <string name="custom_study_deck_name">Mukautettu istunto</string>
-    <string name="custom_study_deck_exists">Nimeä olemassa oleva mukautettu pakka ensin</string>
     <string name="search_deck" comment="Deck search for selecting it">Hae pakkaa</string>
     <string name="empty_deck">Tämä pakka on tyhjä</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Hae pakkaa</string>
diff --git a/AnkiDroid/src/main/res/values-fi/02-strings.xml b/AnkiDroid/src/main/res/values-fi/02-strings.xml
index c85a86f3b9bf..3f3b13287a2c 100644
--- a/AnkiDroid/src/main/res/values-fi/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fi/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">Järjestelmän WebView ei pystynyt näyttämään korttia \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Liput</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Rajoitu tiettyhin tunnisteisiin</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d haudattu</item>
         <item quantity="other">+%d haudattu</item>
diff --git a/AnkiDroid/src/main/res/values-fi/03-dialogs.xml b/AnkiDroid/src/main/res/values-fi/03-dialogs.xml
index 387134d2a255..acfb59e078a7 100644
--- a/AnkiDroid/src/main/res/values-fi/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-fi/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Kortteja unohdettu edellisenä x päivänä:</string>
     <string name="custom_study_ahead">Kertaa etukäteen x päivää:</string>
     <string name="custom_study_preview">Esikatsele viimeisinä x päivänä lisättyjä kortteja:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Tallennustila on täynnä</string>
     <string name="storage_almost_full_title">Tallennustila on melkein täynnä</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">Ei tilaa</string>
diff --git a/AnkiDroid/src/main/res/values-fi/10-preferences.xml b/AnkiDroid/src/main/res/values-fi/10-preferences.xml
index ec1fdbe04062..2d5c1148119c 100644
--- a/AnkiDroid/src/main/res/values-fi/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-fi/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Lisäasetukset</string>
     <string name="pref_cat_workarounds" maxLength="41">Korjaukset</string>
     <string name="pref_cat_plugins" maxLength="41">Lisäosat</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Viivan leveys</string>
     <string name="use_input_tag" maxLength="41">Kirjoita vastaus korttiin</string>
@@ -203,7 +204,6 @@
     <string name="accessibility" maxLength="41">Esteettömyys</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Liitä leikepöydän kuvat PNG:nä</string>
-    <string name="paste_as_png_summary">Oletusarvoisesti Anki liittää kuvat leikepöydältä JPG-tiedostoina levytilan säästämiseksi. Tämän vaihtoehdon avulla voit sen sijaan käyttää PNG-kuvia.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Takaisin/poistu painamalla \"takaisin\" kahdesti</string>
     <string name="exit_via_double_tap_back_summ">Vältä poistumasta vahingossa kertausnäkymästä tai sovelluksesta</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-fil/01-core.xml b/AnkiDroid/src/main/res/values-fil/01-core.xml
index 37bd66890774..ae498950f2f6 100644
--- a/AnkiDroid/src/main/res/values-fil/01-core.xml
+++ b/AnkiDroid/src/main/res/values-fil/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Walang laman</string>
     <string name="create_subdeck">Gumawa ng subdeck</string>
     <string name="empty_filtered_deck">Inaalisan ng laman ang nasala na deck&#8230;</string>
-    <string name="custom_study_deck_name">I-custom ang study session</string>
-    <string name="custom_study_deck_exists">Baguhin muna ang pangalan ng umiiral na pasadyang deck sa pag-aaral</string>
     <string name="search_deck" comment="Deck search for selecting it">Maghanap ng Deck</string>
     <string name="empty_deck">Ang deck na ito ay walang laman</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Maghanap ng Deck</string>
diff --git a/AnkiDroid/src/main/res/values-fil/02-strings.xml b/AnkiDroid/src/main/res/values-fil/02-strings.xml
index a8d479266693..956c72614436 100644
--- a/AnkiDroid/src/main/res/values-fil/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fil/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">Bigo ang Pansistemang Webview sa pag-render sa card na \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Mga Watawat</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limitahan ang partikular na mga tag</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="other">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-fil/03-dialogs.xml b/AnkiDroid/src/main/res/values-fil/03-dialogs.xml
index 4a68645a5a6e..26883c4a3dc4 100644
--- a/AnkiDroid/src/main/res/values-fil/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-fil/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Ang mga review kard na nakalimutan sa huling x araw:</string>
     <string name="custom_study_ahead">Suriin nang maaga ng x araw:</string>
     <string name="custom_study_preview">I-preview ang mga bagong kjard na naidagdag sa mga huling x araw:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Puno na ang storage</string>
     <string name="storage_almost_full_title">Malapit nang mapuno ang storage</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">Walang espasyo</string>
diff --git a/AnkiDroid/src/main/res/values-fil/10-preferences.xml b/AnkiDroid/src/main/res/values-fil/10-preferences.xml
index 2a3f5b7ea994..fe0a82a80cff 100644
--- a/AnkiDroid/src/main/res/values-fil/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-fil/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Advanced</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Lapad ng stroke</string>
     <string name="use_input_tag" maxLength="41">I-type ang sagot sa card</string>
@@ -204,7 +205,6 @@
     <string name="accessibility" maxLength="41">Aksesibilidad</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">I-paste ang larawan sa clipboard na PNG</string>
-    <string name="paste_as_png_summary">PIne-paste ng ng Anki ang mga larawan sa clipboard bilang JPG na file ng default upang magtipid sa disk spacee. Maaari mong gamiting ang opsyon na ito upang i-paste ang mga larawan bilang PNG.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Pindutin ang balik kalawa para bumalik/umalis</string>
     <string name="exit_via_double_tap_back_summ">Upang maiwasan ang hindi sinasadyang pag-alis sa reviewer o sa mismong app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-fr/01-core.xml b/AnkiDroid/src/main/res/values-fr/01-core.xml
index b148e9458e50..bf2a89627d18 100644
--- a/AnkiDroid/src/main/res/values-fr/01-core.xml
+++ b/AnkiDroid/src/main/res/values-fr/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Vide</string>
     <string name="create_subdeck">Créer un sous-paquet</string>
     <string name="empty_filtered_deck">Vidage du paquet filtré&#8230;</string>
-    <string name="custom_study_deck_name">Session d\'étude personnalisée</string>
-    <string name="custom_study_deck_exists">Merci de renommer d\'abord le paquet d\'étude personnalisée.</string>
     <string name="search_deck" comment="Deck search for selecting it">Recherche de paquet</string>
     <string name="empty_deck">Ce paquet est vide</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Chercher un deck</string>
diff --git a/AnkiDroid/src/main/res/values-fr/02-strings.xml b/AnkiDroid/src/main/res/values-fr/02-strings.xml
index e7bd59bf4f2b..73f901dc20a8 100644
--- a/AnkiDroid/src/main/res/values-fr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fr/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">Le système WebView n\'a pas réussi à afficher la carte « %1$s ».\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Marqueurs</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limiter à certaines étiquettes</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d enterrée</item>
         <item quantity="other">+%d enterrées</item>
diff --git a/AnkiDroid/src/main/res/values-fr/03-dialogs.xml b/AnkiDroid/src/main/res/values-fr/03-dialogs.xml
index 6dcdac32f6a8..07aafb267982 100644
--- a/AnkiDroid/src/main/res/values-fr/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-fr/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Revoir les cartes oubliées dans les x derniers jours :</string>
     <string name="custom_study_ahead">Réviser à l\'avance de x jours :</string>
     <string name="custom_study_preview">Afficher les nouvelles cartes ajoutées dans les x derniers jours :</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Stockage plein</string>
     <string name="storage_almost_full_title">Il n\'y a presque plus d\'espace libre</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">Aucun espace</string>
diff --git a/AnkiDroid/src/main/res/values-fr/10-preferences.xml b/AnkiDroid/src/main/res/values-fr/10-preferences.xml
index 5240f94151b6..8a8587609e99 100644
--- a/AnkiDroid/src/main/res/values-fr/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-fr/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Avancé</string>
     <string name="pref_cat_workarounds" maxLength="41">Solution</string>
     <string name="pref_cat_plugins" maxLength="41">Extensions</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Largeur des traits</string>
     <string name="use_input_tag" maxLength="41">Saisir la réponse dans la carte</string>
@@ -203,7 +204,6 @@
     <string name="accessibility" maxLength="41">Accessibilité</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Coller les images du pressepapiers en PNG</string>
-    <string name="paste_as_png_summary">Par default Anki colle les images dans le presse-papier au format JPG (format léger). Vous pouvez changer cette option pour coller les images au format PNG.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Appuis double sur retour pour quitter</string>
     <string name="exit_via_double_tap_back_summ">Pour éviter de quitter involontairement l\'application</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-fy/01-core.xml b/AnkiDroid/src/main/res/values-fy/01-core.xml
index 5ad0a008e70f..a18f01575171 100644
--- a/AnkiDroid/src/main/res/values-fy/01-core.xml
+++ b/AnkiDroid/src/main/res/values-fy/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Leech</string>
     <string name="create_subdeck">Create subdeck</string>
     <string name="empty_filtered_deck">Emptying filtered deck&#8230;</string>
-    <string name="custom_study_deck_name">Oanpaste stúdzjesessy</string>
-    <string name="custom_study_deck_exists">Hernoem de besteande stúdzjeset earst</string>
     <string name="search_deck" comment="Deck search for selecting it">Deck Search</string>
     <string name="empty_deck">This deck is empty</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Deck Search</string>
diff --git a/AnkiDroid/src/main/res/values-fy/02-strings.xml b/AnkiDroid/src/main/res/values-fy/02-strings.xml
index 315d7866298b..63a5bd869e45 100644
--- a/AnkiDroid/src/main/res/values-fy/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fy/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flags</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limit to particular tags</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="other">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-fy/03-dialogs.xml b/AnkiDroid/src/main/res/values-fy/03-dialogs.xml
index ab66c7a6ddec..72c8ee8cac3f 100644
--- a/AnkiDroid/src/main/res/values-fy/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-fy/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead">Review ahead by x days:</string>
     <string name="custom_study_preview">Preview new cards added in the last x days:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Storage full</string>
     <string name="storage_almost_full_title">Storage almost full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-fy/10-preferences.xml b/AnkiDroid/src/main/res/values-fy/10-preferences.xml
index d28940d9f0d1..e926f4d98799 100644
--- a/AnkiDroid/src/main/res/values-fy/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-fy/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Advanced</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
     <string name="use_input_tag" maxLength="41">Type answer into the card</string>
@@ -204,7 +205,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-ga/01-core.xml b/AnkiDroid/src/main/res/values-ga/01-core.xml
index 604d5d4449c9..61b03bf8356d 100644
--- a/AnkiDroid/src/main/res/values-ga/01-core.xml
+++ b/AnkiDroid/src/main/res/values-ga/01-core.xml
@@ -132,8 +132,6 @@
     <string name="empty_cram_label" maxLength="28">Folamh</string>
     <string name="create_subdeck">Create subdeck</string>
     <string name="empty_filtered_deck">Emptying filtered deck&#8230;</string>
-    <string name="custom_study_deck_name">Staidéar ar leith</string>
-    <string name="custom_study_deck_exists">Rename the existing custom study deck first</string>
     <string name="search_deck" comment="Deck search for selecting it">Deck Search</string>
     <string name="empty_deck">This deck is empty</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Deck Search</string>
diff --git a/AnkiDroid/src/main/res/values-ga/02-strings.xml b/AnkiDroid/src/main/res/values-ga/02-strings.xml
index 07ee1b8d7617..598d1cd160f3 100644
--- a/AnkiDroid/src/main/res/values-ga/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ga/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flags</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limit to particular tags</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="two">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-ga/03-dialogs.xml b/AnkiDroid/src/main/res/values-ga/03-dialogs.xml
index 9694519bc763..62d98ac9e484 100644
--- a/AnkiDroid/src/main/res/values-ga/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ga/03-dialogs.xml
@@ -79,6 +79,7 @@
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead">Review ahead by x days:</string>
     <string name="custom_study_preview">Preview new cards added in the last x days:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Storage full</string>
     <string name="storage_almost_full_title">Storage almost full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-ga/10-preferences.xml b/AnkiDroid/src/main/res/values-ga/10-preferences.xml
index 799acaa9298f..6a5de7af8e09 100644
--- a/AnkiDroid/src/main/res/values-ga/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ga/10-preferences.xml
@@ -71,6 +71,7 @@
     <string name="pref_cat_advanced" maxLength="41">Advanced</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
     <string name="use_input_tag" maxLength="41">Type answer into the card</string>
@@ -210,7 +211,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-gl/01-core.xml b/AnkiDroid/src/main/res/values-gl/01-core.xml
index 6c2de2a0517c..6f6372aaac66 100644
--- a/AnkiDroid/src/main/res/values-gl/01-core.xml
+++ b/AnkiDroid/src/main/res/values-gl/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Baleirar</string>
     <string name="create_subdeck">crear submazo</string>
     <string name="empty_filtered_deck">baleirar mazo filtrado</string>
-    <string name="custom_study_deck_name">Sesión de estudo personalizado</string>
-    <string name="custom_study_deck_exists">Por favor, renomee a baralla de estudo personalizado existente primeiro.</string>
     <string name="search_deck" comment="Deck search for selecting it">Deck Search</string>
     <string name="empty_deck">Esta baralla está baleira</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Deck Search</string>
diff --git a/AnkiDroid/src/main/res/values-gl/02-strings.xml b/AnkiDroid/src/main/res/values-gl/02-strings.xml
index 35f3bff39616..dc6a642372fb 100644
--- a/AnkiDroid/src/main/res/values-gl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-gl/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flags</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limitar a certas etiquetas</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="other">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-gl/03-dialogs.xml b/AnkiDroid/src/main/res/values-gl/03-dialogs.xml
index 8df48282aca6..e595e28999e9 100644
--- a/AnkiDroid/src/main/res/values-gl/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-gl/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Revisar os cartóns esquecidos nos últimos x días:</string>
     <string name="custom_study_ahead">Revisar con x días de adianto:</string>
     <string name="custom_study_preview">Vista previa dos novos cartóns engadidos nos últimos x días:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Storage full</string>
     <string name="storage_almost_full_title">Storage almost full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-gl/10-preferences.xml b/AnkiDroid/src/main/res/values-gl/10-preferences.xml
index 09688bc5a50b..dbe41161e2bf 100644
--- a/AnkiDroid/src/main/res/values-gl/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-gl/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Avanzado</string>
     <string name="pref_cat_workarounds" maxLength="41">Solucións</string>
     <string name="pref_cat_plugins" maxLength="41">Engadidos</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Largura do trazo</string>
     <string name="use_input_tag" maxLength="41">Escribir resposta no cartón</string>
@@ -204,7 +205,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-got/01-core.xml b/AnkiDroid/src/main/res/values-got/01-core.xml
index 17a05cc5d637..0dc7251a522d 100644
--- a/AnkiDroid/src/main/res/values-got/01-core.xml
+++ b/AnkiDroid/src/main/res/values-got/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Laus</string>
     <string name="create_subdeck">Create subdeck</string>
     <string name="empty_filtered_deck">Emptying filtered deck&#8230;</string>
-    <string name="custom_study_deck_name">Anþara laiseinasaisjo</string>
-    <string name="custom_study_deck_exists">Gif þata frumist niujata namo du wisandon laiseinawikon</string>
     <string name="search_deck" comment="Deck search for selecting it">Deck Search</string>
     <string name="empty_deck">This deck is empty</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Deck Search</string>
diff --git a/AnkiDroid/src/main/res/values-got/02-strings.xml b/AnkiDroid/src/main/res/values-got/02-strings.xml
index 7639768d9c55..1097c5bbcc89 100644
--- a/AnkiDroid/src/main/res/values-got/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-got/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flags</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limit to particular tags</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="other">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-got/03-dialogs.xml b/AnkiDroid/src/main/res/values-got/03-dialogs.xml
index 4eff304b033e..a0400e880818 100644
--- a/AnkiDroid/src/main/res/values-got/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-got/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead">Review ahead by x days:</string>
     <string name="custom_study_preview">Preview new cards added in the last x days:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Storage full</string>
     <string name="storage_almost_full_title">Storage almost full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-got/10-preferences.xml b/AnkiDroid/src/main/res/values-got/10-preferences.xml
index 685d62aa4d39..8d49177684a2 100644
--- a/AnkiDroid/src/main/res/values-got/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-got/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Advanced</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
     <string name="use_input_tag" maxLength="41">Type answer into the card</string>
@@ -204,7 +205,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-gu/01-core.xml b/AnkiDroid/src/main/res/values-gu/01-core.xml
index 5a5ae3bb6cd5..b10207b5a071 100644
--- a/AnkiDroid/src/main/res/values-gu/01-core.xml
+++ b/AnkiDroid/src/main/res/values-gu/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">ખાલી</string>
     <string name="create_subdeck">સબડેક બનાવો</string>
     <string name="empty_filtered_deck">ફિલ્ટર કરેલ ડેક ખાલી કરી રહ્યું છે&#8230;</string>
-    <string name="custom_study_deck_name">કસ્ટમ અભ્યાસ સત્ર</string>
-    <string name="custom_study_deck_exists">પહેલા હાલના કસ્ટમ સ્ટડી ડેકનું નામ બદલો</string>
     <string name="search_deck" comment="Deck search for selecting it">ડેક શોધ</string>
     <string name="empty_deck">આ ડેક ખાલી છે</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">ડેક શોધ</string>
diff --git a/AnkiDroid/src/main/res/values-gu/02-strings.xml b/AnkiDroid/src/main/res/values-gu/02-strings.xml
index ac29941ccb52..b31abf1d5177 100644
--- a/AnkiDroid/src/main/res/values-gu/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-gu/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">સિસ્ટમ WebView કાર્ડ \'%1$s\' રેન્ડર કરવામાં નિષ્ફળ થયું.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">ધ્વજ</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">ચોક્કસ ટૅગ્સ સુધી મર્યાદિત કરો</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d புதைக்கப்பட்டது</item>
         <item quantity="other">+%d புதைக்கப்பட்டது</item>
diff --git a/AnkiDroid/src/main/res/values-gu/03-dialogs.xml b/AnkiDroid/src/main/res/values-gu/03-dialogs.xml
index 85af9e8c779d..13c41214e0fc 100644
--- a/AnkiDroid/src/main/res/values-gu/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-gu/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">છેલ્લા x દિવસમાં ભૂલી ગયેલા કાર્ડની સમીક્ષા કરો:</string>
     <string name="custom_study_ahead">x દિવસ આગળ સમીક્ષા કરો:</string>
     <string name="custom_study_preview">છેલ્લા x દિવસમાં ઉમેરાયેલા નવા કાર્ડ્સનું પૂર્વાવલોકન કરો:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">સ્ટોરેજ ભરાઈ ગયું</string>
     <string name="storage_almost_full_title">સ્ટોરેજ લગભગ ભરાઈ ગયું છે</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">જગ્યા નથી</string>
diff --git a/AnkiDroid/src/main/res/values-gu/10-preferences.xml b/AnkiDroid/src/main/res/values-gu/10-preferences.xml
index 2b3b3d2c15b3..23ec71655ae8 100644
--- a/AnkiDroid/src/main/res/values-gu/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-gu/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">અદ્યતન</string>
     <string name="pref_cat_workarounds" maxLength="41">વર્કઅરાઉન્ડ</string>
     <string name="pref_cat_plugins" maxLength="41">પ્લગઈન્સ</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">સ્ટ્રોક પહોળાઈ</string>
     <string name="use_input_tag" maxLength="41">કાર્ડમાં જવાબ લખો</string>
@@ -203,7 +204,6 @@
     <string name="accessibility" maxLength="41">સુલભતા</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">ક્લિપબોર્ડ છબીઓને PNG તરીકે પેસ્ટ કરો</string>
-    <string name="paste_as_png_summary">ડિફૉલ્ટ રીતે અંકી ડિસ્ક સ્પેસ બચાવવા માટે JPG ફાઇલો તરીકે ક્લિપબોર્ડ પર છબીઓ પેસ્ટ કરે છે. તમે તેના બદલે PNG છબીઓ તરીકે પેસ્ટ કરવા માટે આ વિકલ્પનો ઉપયોગ કરી શકો છો.</string>
     <string name="exit_via_double_tap_back" maxLength="41">પાછા જવા/બહાર જવા માટે બે વાર પાછા દબાવો</string>
     <string name="exit_via_double_tap_back_summ">આકસ્મિક રીતે સમીક્ષક અથવા એપ્લિકેશન છોડવાનું ટાળવા માટે</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-heb/01-core.xml b/AnkiDroid/src/main/res/values-heb/01-core.xml
index 3548de8f25af..525fd9feae0a 100644
--- a/AnkiDroid/src/main/res/values-heb/01-core.xml
+++ b/AnkiDroid/src/main/res/values-heb/01-core.xml
@@ -130,8 +130,6 @@
     <string name="empty_cram_label" maxLength="28">ריקון</string>
     <string name="create_subdeck">צור חפיסת משנה</string>
     <string name="empty_filtered_deck">מרוקן חפיסה מסוננת&#8230;</string>
-    <string name="custom_study_deck_name">שיעור למידה מותאם</string>
-    <string name="custom_study_deck_exists">ראשית, ערוך שם חפיסה חדשה</string>
     <string name="search_deck" comment="Deck search for selecting it">חיפוש חפיסה</string>
     <string name="empty_deck">החפיסה ריקה</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">חיפוש חפיסה</string>
diff --git a/AnkiDroid/src/main/res/values-heb/02-strings.xml b/AnkiDroid/src/main/res/values-heb/02-strings.xml
index 28835f72990f..46f3de424f99 100644
--- a/AnkiDroid/src/main/res/values-heb/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-heb/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">מנוע התצוגה נכשל להציג את הכרטיס: %1$s. \n %2$s</string>
     <string name="filter_by_flags" maxLength="41">דגלים</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">הגבל לתיוג ספציפי</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d קבור</item>
         <item quantity="two">+%d קבורים</item>
diff --git a/AnkiDroid/src/main/res/values-heb/03-dialogs.xml b/AnkiDroid/src/main/res/values-heb/03-dialogs.xml
index 094ba4a0a3de..68d8f40a0487 100644
--- a/AnkiDroid/src/main/res/values-heb/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-heb/03-dialogs.xml
@@ -78,6 +78,7 @@
     <string name="custom_study_forgotten">חזרה על כרטיסים נשכחים בx ימים האחרונים</string>
     <string name="custom_study_ahead">עבור כמה ימים ברצונך לשנן מראש?</string>
     <string name="custom_study_preview">צפייה ראשונית בכרטיסים חדשים שנוספו בx ימים האחרונים:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">האיחסון מלא</string>
     <string name="storage_almost_full_title">שטח האחסון כמעט מלא</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">אין מקום</string>
diff --git a/AnkiDroid/src/main/res/values-heb/10-preferences.xml b/AnkiDroid/src/main/res/values-heb/10-preferences.xml
index cc635d53f95a..e91a4be581e5 100644
--- a/AnkiDroid/src/main/res/values-heb/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-heb/10-preferences.xml
@@ -70,6 +70,7 @@
     <string name="pref_cat_advanced" maxLength="41">מתקדם</string>
     <string name="pref_cat_workarounds" maxLength="41">מעקפים</string>
     <string name="pref_cat_plugins" maxLength="41">תוספים</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">עובי הקו</string>
     <string name="use_input_tag" maxLength="41">הקלד את התשובה אל הכרטיס</string>
@@ -208,7 +209,6 @@
     <string name="accessibility" maxLength="41">נגישות</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">הדבק תמונות לוח כ-PNG</string>
-    <string name="paste_as_png_summary">כברירת מחדל, Anki מדביק תמונות על הלוח כקובצי JPG כדי לחסוך בדיסק. אתה יכול להשתמש באפשרות זו כדי להדביק כתמונות PNG במקום זאת.</string>
     <string name="exit_via_double_tap_back" maxLength="41">לחץ אחורה פעמיים כדי לחזור אחורה/יציאה</string>
     <string name="exit_via_double_tap_back_summ">כדי להימנע מיציאה בטעות מהלימוד או מהאפליקציה</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-hi/01-core.xml b/AnkiDroid/src/main/res/values-hi/01-core.xml
index 53ea6267643e..fb15b7bed1c2 100644
--- a/AnkiDroid/src/main/res/values-hi/01-core.xml
+++ b/AnkiDroid/src/main/res/values-hi/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">खाली</string>
     <string name="create_subdeck">सबडेक बनाऐं</string>
     <string name="empty_filtered_deck">फ़िल्टर किए गए डेक को खाली करना &#8230;</string>
-    <string name="custom_study_deck_name">कस्टम अध्ययन सत्र</string>
-    <string name="custom_study_deck_exists">कृपया पहले मौजूदा कस्टम अध्ययन डेक का नाम बदलें।</string>
     <string name="search_deck" comment="Deck search for selecting it">डेक खोज</string>
     <string name="empty_deck">इस डेक खाली है</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">डेक खोज</string>
diff --git a/AnkiDroid/src/main/res/values-hi/02-strings.xml b/AnkiDroid/src/main/res/values-hi/02-strings.xml
index 057e5394147f..2bdd0cfc0c9e 100644
--- a/AnkiDroid/src/main/res/values-hi/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-hi/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">सिस्टम WebView कार्ड रेंडर करने में विफल रहा \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">झंडे</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">विशेष टैग करने के लिए सीमा</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d दफनाया गया</item>
         <item quantity="other">+%d दफनाया गया</item>
diff --git a/AnkiDroid/src/main/res/values-hi/03-dialogs.xml b/AnkiDroid/src/main/res/values-hi/03-dialogs.xml
index 13803d21f9cd..383eff538eae 100644
--- a/AnkiDroid/src/main/res/values-hi/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-hi/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">पिछले x दिनों में भूल गए कार्ड की समीक्षा करें:</string>
     <string name="custom_study_ahead">X दिनों से आगे की समीक्षा करें:</string>
     <string name="custom_study_preview">पिछले x दिनों में जोड़े गए नए कार्ड का पूर्वावलोकन करें:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">स्टोरेज भर गया</string>
     <string name="storage_almost_full_title">स्टोरेज लगभग पूर्ण</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">कोई जगह नहीं</string>
diff --git a/AnkiDroid/src/main/res/values-hi/10-preferences.xml b/AnkiDroid/src/main/res/values-hi/10-preferences.xml
index dbbd7206bca6..578694adec0f 100644
--- a/AnkiDroid/src/main/res/values-hi/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-hi/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">उन्नत</string>
     <string name="pref_cat_workarounds" maxLength="41">वैकल्पिक हल</string>
     <string name="pref_cat_plugins" maxLength="41">प्लगइन</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">अंकन की चौड़ाई</string>
     <string name="use_input_tag" maxLength="41">पत्ता में उत्तर दर्ज करें</string>
@@ -203,7 +204,6 @@
     <string name="accessibility" maxLength="41">सरल उपयोग</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">क्लिपबोर्ड इमेजेज को पीएनजी प्रारूप में चिपकाएँ</string>
-    <string name="paste_as_png_summary">डिफ़ॉल्ट रूप से एंड्रॉइड डिस्क स्थान को बचाने के लिए छवियों को JPG फ़ाइलों के रूप में क्लिपबोर्ड पर चिपकाता है। आप इसके बजाय पीएनजी छवियों के रूप में पेस्ट करने के लिए इस विकल्प का उपयोग कर सकते हैं।</string>
     <string name="exit_via_double_tap_back" maxLength="41">वापस जाने/बाहर निकलने के लिए दो बार बैक दबाएँ</string>
     <string name="exit_via_double_tap_back_summ">समीक्षक या ऐप को गलती से छोड़ने से बचने के लिए</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-hr/01-core.xml b/AnkiDroid/src/main/res/values-hr/01-core.xml
index 2c9e8f4b44f6..394a02f74bc7 100644
--- a/AnkiDroid/src/main/res/values-hr/01-core.xml
+++ b/AnkiDroid/src/main/res/values-hr/01-core.xml
@@ -126,8 +126,6 @@
     <string name="empty_cram_label" maxLength="28">Isprazni</string>
     <string name="create_subdeck">Stvori podšpil</string>
     <string name="empty_filtered_deck">Emptying filtered deck&#8230;</string>
-    <string name="custom_study_deck_name">Prilagođena sesija učenja</string>
-    <string name="custom_study_deck_exists">Prvo preimenujte postojeću prilagođenu skupinu za učenje</string>
     <string name="search_deck" comment="Deck search for selecting it">Pretraga špila</string>
     <string name="empty_deck">Ova skupina je prazna</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Deck Search</string>
diff --git a/AnkiDroid/src/main/res/values-hr/02-strings.xml b/AnkiDroid/src/main/res/values-hr/02-strings.xml
index 525bc25f38bd..4b37568612c6 100644
--- a/AnkiDroid/src/main/res/values-hr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-hr/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flags</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limit to particular tags</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="few">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-hr/03-dialogs.xml b/AnkiDroid/src/main/res/values-hr/03-dialogs.xml
index b244a086f48a..16402214909c 100644
--- a/AnkiDroid/src/main/res/values-hr/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-hr/03-dialogs.xml
@@ -75,6 +75,7 @@
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead">Review ahead by x days:</string>
     <string name="custom_study_preview">Preview new cards added in the last x days:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Storage full</string>
     <string name="storage_almost_full_title">Storage almost full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-hr/10-preferences.xml b/AnkiDroid/src/main/res/values-hr/10-preferences.xml
index 63ed0b1f23f5..083d2591e533 100644
--- a/AnkiDroid/src/main/res/values-hr/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-hr/10-preferences.xml
@@ -69,6 +69,7 @@
     <string name="pref_cat_advanced" maxLength="41">Advanced</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
     <string name="use_input_tag" maxLength="41">Type answer into the card</string>
@@ -206,7 +207,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-hu/01-core.xml b/AnkiDroid/src/main/res/values-hu/01-core.xml
index a756c82ed955..80a9246862d7 100644
--- a/AnkiDroid/src/main/res/values-hu/01-core.xml
+++ b/AnkiDroid/src/main/res/values-hu/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Kiürít</string>
     <string name="create_subdeck">Alcsoportok létrehozása</string>
     <string name="empty_filtered_deck">Szűrt pakli kiürítése</string>
-    <string name="custom_study_deck_name">Egyéni tanulás pakli</string>
-    <string name="custom_study_deck_exists">Kérlek, előbb nevezd át a meglévő, Egyéni tanulás paklit</string>
     <string name="search_deck" comment="Deck search for selecting it">Paklik keresése</string>
     <string name="empty_deck">Ez a pakli üres</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Paklik keresése</string>
diff --git a/AnkiDroid/src/main/res/values-hu/02-strings.xml b/AnkiDroid/src/main/res/values-hu/02-strings.xml
index d69c054d997c..2d9159ff71a0 100644
--- a/AnkiDroid/src/main/res/values-hu/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-hu/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">A WebView rendszer nem tudta megjeleníteni a \'%1$s\' kártyát.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Zászlók</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Szűkítés címkékre</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="other">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-hu/03-dialogs.xml b/AnkiDroid/src/main/res/values-hu/03-dialogs.xml
index be3fe0b40bfa..bec0be25acc6 100644
--- a/AnkiDroid/src/main/res/values-hu/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-hu/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Az elmúlt x napban elfelejtett kártyák ismétlése:</string>
     <string name="custom_study_ahead">Idő előtti, x nappal előre ismétlés:</string>
     <string name="custom_study_preview">Az elmúlt x nap új kártyáinak előre átnézése:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Tárhely megtelt</string>
     <string name="storage_almost_full_title">Tárhely majdnem megtelt</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">Nincs hely</string>
diff --git a/AnkiDroid/src/main/res/values-hu/10-preferences.xml b/AnkiDroid/src/main/res/values-hu/10-preferences.xml
index f711618aa325..8f3d3969497a 100644
--- a/AnkiDroid/src/main/res/values-hu/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-hu/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Haladó</string>
     <string name="pref_cat_workarounds" maxLength="41">Lehetséges megoldások</string>
     <string name="pref_cat_plugins" maxLength="41">Bővítmények</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Ceruza vastagsága</string>
     <string name="use_input_tag" maxLength="41">Válasz begépelése</string>
@@ -204,7 +205,6 @@
     <string name="accessibility" maxLength="41">Kisegítő lehetőségek</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Vágólap képeket PNG-ként illeszt be</string>
-    <string name="paste_as_png_summary">Anki alapértelmezetten a vágólap képeket JPG fájlként illeszti be, tárterület spórolás miatt. Ha PNG-t szeretnél, használd ezt a beállítást.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Kétszer Vissza gombra Vissza/Kilép</string>
     <string name="exit_via_double_tap_back_summ">Ahhoz, hogy véletlenül ne lépj ki az átnézeti módból</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-hy/01-core.xml b/AnkiDroid/src/main/res/values-hy/01-core.xml
index 8078ad3e0878..87349aab0a26 100644
--- a/AnkiDroid/src/main/res/values-hy/01-core.xml
+++ b/AnkiDroid/src/main/res/values-hy/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Դատարկ</string>
     <string name="create_subdeck">Ստեղծել ենթակապուկ</string>
     <string name="empty_filtered_deck">Զտված կապուկը դատարկվում է&#8230;</string>
-    <string name="custom_study_deck_name">Ուսուցման լրացուցիչ աշխատաշրջան</string>
-    <string name="custom_study_deck_exists">Սկզբում վերանվանել լրացուցիչ ուսուցման առկա կապուկը</string>
     <string name="search_deck" comment="Deck search for selecting it">Կապուկների որոնում</string>
     <string name="empty_deck">Այս կապուկը դատարկ է</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Կապուկների որոնում</string>
diff --git a/AnkiDroid/src/main/res/values-hy/02-strings.xml b/AnkiDroid/src/main/res/values-hy/02-strings.xml
index 0a69ffed1535..264a2307fcb9 100644
--- a/AnkiDroid/src/main/res/values-hy/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-hy/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">Համակարգի WebView-ը չկարողացավ ցուցադրել «%1$s» քարտը։\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Դրոշներ</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Սահմանափակել որոշակի պիտակներին</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d թաղված</item>
         <item quantity="other">+%d թաղված</item>
diff --git a/AnkiDroid/src/main/res/values-hy/03-dialogs.xml b/AnkiDroid/src/main/res/values-hy/03-dialogs.xml
index 6189287ce7fb..ab205a99d93e 100644
--- a/AnkiDroid/src/main/res/values-hy/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-hy/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Վերանայել վերջին X օրում մոռացված քարտերը`</string>
     <string name="custom_study_ahead">Review ahead by x days:</string>
     <string name="custom_study_preview">Preview new cards added in the last x days:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Storage full</string>
     <string name="storage_almost_full_title">Storage almost full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-hy/10-preferences.xml b/AnkiDroid/src/main/res/values-hy/10-preferences.xml
index 357a2b35af54..b8b750d93e9e 100644
--- a/AnkiDroid/src/main/res/values-hy/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-hy/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Ընդլայնված</string>
     <string name="pref_cat_workarounds" maxLength="41">Խնդիրների շրջանցում</string>
     <string name="pref_cat_plugins" maxLength="41">Հավելումներ</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Գծի հաստություն</string>
     <string name="use_input_tag" maxLength="41">Պատասխանը գրել քարտի վրա</string>
@@ -204,7 +205,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-ind/01-core.xml b/AnkiDroid/src/main/res/values-ind/01-core.xml
index cd2d01bdc6fe..b5d9b27eadd8 100644
--- a/AnkiDroid/src/main/res/values-ind/01-core.xml
+++ b/AnkiDroid/src/main/res/values-ind/01-core.xml
@@ -120,8 +120,6 @@
     <string name="empty_cram_label" maxLength="28">Kosong</string>
     <string name="create_subdeck">Buat subdek</string>
     <string name="empty_filtered_deck">Mengosongkan dek yang telah difilter</string>
-    <string name="custom_study_deck_name">Sesi belajar kustom</string>
-    <string name="custom_study_deck_exists">Ubah nama dek belajar kustom yang ada</string>
     <string name="search_deck" comment="Deck search for selecting it">Mencari Dek</string>
     <string name="empty_deck">Dek ini kosong</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Pencarian Dek</string>
diff --git a/AnkiDroid/src/main/res/values-ind/02-strings.xml b/AnkiDroid/src/main/res/values-ind/02-strings.xml
index dca3bd8144c5..2289fef947a6 100644
--- a/AnkiDroid/src/main/res/values-ind/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ind/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">Sistem WebView gagal merender kartu \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Bendera</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Batasi ke tag tertentu</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="other">+%d buried</item>
     </plurals>
diff --git a/AnkiDroid/src/main/res/values-ind/03-dialogs.xml b/AnkiDroid/src/main/res/values-ind/03-dialogs.xml
index b9ebd671bab5..f755ae2ed93f 100644
--- a/AnkiDroid/src/main/res/values-ind/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ind/03-dialogs.xml
@@ -71,6 +71,7 @@
     <string name="custom_study_forgotten">Ulas kartu yang terlupakan dalam x hari terakhir:</string>
     <string name="custom_study_ahead">Ulas duluan sampai x hari:</string>
     <string name="custom_study_preview">Pratinjau kartu yang baru ditambahkan dalam x hari terakhir:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Penyimpanan sudah penuh</string>
     <string name="storage_almost_full_title">Penyimpanan hampir penuh</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">Tidak ada ruang</string>
diff --git a/AnkiDroid/src/main/res/values-ind/10-preferences.xml b/AnkiDroid/src/main/res/values-ind/10-preferences.xml
index d6eb12ae42e3..63bf0274b0d8 100644
--- a/AnkiDroid/src/main/res/values-ind/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ind/10-preferences.xml
@@ -67,6 +67,7 @@
     <string name="pref_cat_advanced" maxLength="41">Tingkat lanjut</string>
     <string name="pref_cat_workarounds" maxLength="41">Solusi</string>
     <string name="pref_cat_plugins" maxLength="41">Pengaya</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Tebal garis</string>
     <string name="use_input_tag" maxLength="41">Ketik jawaban ke dalam kartu</string>
@@ -202,7 +203,6 @@
     <string name="accessibility" maxLength="41">Aksesibilitas</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Tempel gambar di papan klip sebagai PNG</string>
-    <string name="paste_as_png_summary">Anki menempel gambar papan klip berbentuk file JPG agar hemat penyimpanan. Gunakan opsi ini untuk menempel gambar sebagai file PNG.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Ketuk kembali dua kali utk kembali/keluar</string>
     <string name="exit_via_double_tap_back_summ">Untuk mencegah meninggalkan peninjau atau aplikasi secara tidak sengaja</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-is/01-core.xml b/AnkiDroid/src/main/res/values-is/01-core.xml
index 6aa9cfd4abe1..56287b708cf1 100644
--- a/AnkiDroid/src/main/res/values-is/01-core.xml
+++ b/AnkiDroid/src/main/res/values-is/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Empty</string>
     <string name="create_subdeck">Create subdeck</string>
     <string name="empty_filtered_deck">Emptying filtered deck&#8230;</string>
-    <string name="custom_study_deck_name">Custom study session</string>
-    <string name="custom_study_deck_exists">Rename the existing custom study deck first</string>
     <string name="search_deck" comment="Deck search for selecting it">Deck Search</string>
     <string name="empty_deck">This deck is empty</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Deck Search</string>
diff --git a/AnkiDroid/src/main/res/values-is/02-strings.xml b/AnkiDroid/src/main/res/values-is/02-strings.xml
index 509505f66399..5e4fab69ad3c 100644
--- a/AnkiDroid/src/main/res/values-is/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-is/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flags</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limit to particular tags</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="other">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-is/03-dialogs.xml b/AnkiDroid/src/main/res/values-is/03-dialogs.xml
index 9423b5e19d9f..7fc34f52b3c6 100644
--- a/AnkiDroid/src/main/res/values-is/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-is/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead">Review ahead by x days:</string>
     <string name="custom_study_preview">Preview new cards added in the last x days:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Storage full</string>
     <string name="storage_almost_full_title">Storage almost full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-is/10-preferences.xml b/AnkiDroid/src/main/res/values-is/10-preferences.xml
index 685d62aa4d39..8d49177684a2 100644
--- a/AnkiDroid/src/main/res/values-is/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-is/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Advanced</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
     <string name="use_input_tag" maxLength="41">Type answer into the card</string>
@@ -204,7 +205,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-it/01-core.xml b/AnkiDroid/src/main/res/values-it/01-core.xml
index cf1298e9d148..b98294040103 100644
--- a/AnkiDroid/src/main/res/values-it/01-core.xml
+++ b/AnkiDroid/src/main/res/values-it/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Svuota</string>
     <string name="create_subdeck">Crea sottomazzo</string>
     <string name="empty_filtered_deck">Svuotamento del mazzo filtrato in corso&#8230;</string>
-    <string name="custom_study_deck_name">Sessione di studio personalizzato</string>
-    <string name="custom_study_deck_exists">Rinominare prima il mazzo di studio personalizzato esistente.</string>
     <string name="search_deck" comment="Deck search for selecting it">Ricerca mazzo</string>
     <string name="empty_deck">Questo mazzo è vuoto</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Ricerca mazzo</string>
diff --git a/AnkiDroid/src/main/res/values-it/02-strings.xml b/AnkiDroid/src/main/res/values-it/02-strings.xml
index e8be82bf11ab..6614856d1daf 100644
--- a/AnkiDroid/src/main/res/values-it/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-it/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">La WebView sistema non è riuscita a rendere la carta «%1$s».\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Contrassegni</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limita ad etichette particolari</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+sepolto</item>
         <item quantity="other">+sepolto</item>
diff --git a/AnkiDroid/src/main/res/values-it/03-dialogs.xml b/AnkiDroid/src/main/res/values-it/03-dialogs.xml
index 5103f8c8c202..89ecf1925811 100644
--- a/AnkiDroid/src/main/res/values-it/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-it/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Ripeti carte dimenticate negli ultimi x giorni:</string>
     <string name="custom_study_ahead">Ripeti in anticipo di x giorni:</string>
     <string name="custom_study_preview">Anteprima carte nuove aggiunte negli ultimi x giorni:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Spazio di archiviazione pieno</string>
     <string name="storage_almost_full_title">Spazio di archiviazione quasi pieno</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">Nessuno spazio</string>
diff --git a/AnkiDroid/src/main/res/values-it/10-preferences.xml b/AnkiDroid/src/main/res/values-it/10-preferences.xml
index f9ea47cb4ef7..269b280100c7 100644
--- a/AnkiDroid/src/main/res/values-it/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-it/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Avanzate</string>
     <string name="pref_cat_workarounds" maxLength="41">Soluzioni alternative</string>
     <string name="pref_cat_plugins" maxLength="41">Plugin</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Spessore tratto</string>
     <string name="use_input_tag" maxLength="41">Digita la risposta nella carta</string>
@@ -203,7 +204,6 @@
     <string name="accessibility" maxLength="41">Accessibilità</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Incolla le immagini degli appunti in PNG</string>
-    <string name="paste_as_png_summary">Di default Anki incolla le immagini sugli appunti come file JPG per salvare lo spazio su disco. Puoi usare quest\'opzione per incollare invece come immagini PNG.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Premi 2 volte indietro per tornare/uscire</string>
     <string name="exit_via_double_tap_back_summ">Per evitare di lasciare accidentalmente il recensore o l\'app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-iw/01-core.xml b/AnkiDroid/src/main/res/values-iw/01-core.xml
index 3548de8f25af..525fd9feae0a 100644
--- a/AnkiDroid/src/main/res/values-iw/01-core.xml
+++ b/AnkiDroid/src/main/res/values-iw/01-core.xml
@@ -130,8 +130,6 @@
     <string name="empty_cram_label" maxLength="28">ריקון</string>
     <string name="create_subdeck">צור חפיסת משנה</string>
     <string name="empty_filtered_deck">מרוקן חפיסה מסוננת&#8230;</string>
-    <string name="custom_study_deck_name">שיעור למידה מותאם</string>
-    <string name="custom_study_deck_exists">ראשית, ערוך שם חפיסה חדשה</string>
     <string name="search_deck" comment="Deck search for selecting it">חיפוש חפיסה</string>
     <string name="empty_deck">החפיסה ריקה</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">חיפוש חפיסה</string>
diff --git a/AnkiDroid/src/main/res/values-iw/02-strings.xml b/AnkiDroid/src/main/res/values-iw/02-strings.xml
index 28835f72990f..46f3de424f99 100644
--- a/AnkiDroid/src/main/res/values-iw/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-iw/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">מנוע התצוגה נכשל להציג את הכרטיס: %1$s. \n %2$s</string>
     <string name="filter_by_flags" maxLength="41">דגלים</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">הגבל לתיוג ספציפי</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d קבור</item>
         <item quantity="two">+%d קבורים</item>
diff --git a/AnkiDroid/src/main/res/values-iw/03-dialogs.xml b/AnkiDroid/src/main/res/values-iw/03-dialogs.xml
index 094ba4a0a3de..68d8f40a0487 100644
--- a/AnkiDroid/src/main/res/values-iw/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-iw/03-dialogs.xml
@@ -78,6 +78,7 @@
     <string name="custom_study_forgotten">חזרה על כרטיסים נשכחים בx ימים האחרונים</string>
     <string name="custom_study_ahead">עבור כמה ימים ברצונך לשנן מראש?</string>
     <string name="custom_study_preview">צפייה ראשונית בכרטיסים חדשים שנוספו בx ימים האחרונים:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">האיחסון מלא</string>
     <string name="storage_almost_full_title">שטח האחסון כמעט מלא</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">אין מקום</string>
diff --git a/AnkiDroid/src/main/res/values-iw/10-preferences.xml b/AnkiDroid/src/main/res/values-iw/10-preferences.xml
index cc635d53f95a..e91a4be581e5 100644
--- a/AnkiDroid/src/main/res/values-iw/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-iw/10-preferences.xml
@@ -70,6 +70,7 @@
     <string name="pref_cat_advanced" maxLength="41">מתקדם</string>
     <string name="pref_cat_workarounds" maxLength="41">מעקפים</string>
     <string name="pref_cat_plugins" maxLength="41">תוספים</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">עובי הקו</string>
     <string name="use_input_tag" maxLength="41">הקלד את התשובה אל הכרטיס</string>
@@ -208,7 +209,6 @@
     <string name="accessibility" maxLength="41">נגישות</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">הדבק תמונות לוח כ-PNG</string>
-    <string name="paste_as_png_summary">כברירת מחדל, Anki מדביק תמונות על הלוח כקובצי JPG כדי לחסוך בדיסק. אתה יכול להשתמש באפשרות זו כדי להדביק כתמונות PNG במקום זאת.</string>
     <string name="exit_via_double_tap_back" maxLength="41">לחץ אחורה פעמיים כדי לחזור אחורה/יציאה</string>
     <string name="exit_via_double_tap_back_summ">כדי להימנע מיציאה בטעות מהלימוד או מהאפליקציה</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-ja/01-core.xml b/AnkiDroid/src/main/res/values-ja/01-core.xml
index 3c0d7eae908f..2c08c29ed9f1 100644
--- a/AnkiDroid/src/main/res/values-ja/01-core.xml
+++ b/AnkiDroid/src/main/res/values-ja/01-core.xml
@@ -120,8 +120,6 @@
     <string name="empty_cram_label" maxLength="28">空にする</string>
     <string name="create_subdeck">サブデッキを作成</string>
     <string name="empty_filtered_deck">フィルターデッキを空にしています&#8230;</string>
-    <string name="custom_study_deck_name">カスタム学習セッション</string>
-    <string name="custom_study_deck_exists">最初に、既存のカスタム学習デッキの名前を変更してください</string>
     <string name="search_deck" comment="Deck search for selecting it">デッキ検索</string>
     <string name="empty_deck">このデッキにはカードがありません</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">デッキを検索</string>
diff --git a/AnkiDroid/src/main/res/values-ja/02-strings.xml b/AnkiDroid/src/main/res/values-ja/02-strings.xml
index 14d7e1f7daa9..193ed691035e 100644
--- a/AnkiDroid/src/main/res/values-ja/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ja/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">AndroidシステムのWebViewがカード \'%1$s\' のレンダリングに失敗しました。\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">フラグ</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">タグで抽出して学習</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="other">+%d 今日は非表示</item>
     </plurals>
diff --git a/AnkiDroid/src/main/res/values-ja/03-dialogs.xml b/AnkiDroid/src/main/res/values-ja/03-dialogs.xml
index b567dfedda60..2c6821869ec7 100644
--- a/AnkiDroid/src/main/res/values-ja/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ja/03-dialogs.xml
@@ -71,6 +71,7 @@
     <string name="custom_study_forgotten">直近 x 日間で「やり直し」を選んだカードを再学習</string>
     <string name="custom_study_ahead">x 日先までの復習カードを予習</string>
     <string name="custom_study_preview">直近 x 日間で追加した習得未開始の新規カードを予習</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">ストレージの空き容量がありません</string>
     <string name="storage_almost_full_title">ストレージの空き容量が少なくなっています</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">空き容量不足</string>
diff --git a/AnkiDroid/src/main/res/values-ja/10-preferences.xml b/AnkiDroid/src/main/res/values-ja/10-preferences.xml
index 74fe1346d4ec..971cf0e7092e 100644
--- a/AnkiDroid/src/main/res/values-ja/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ja/10-preferences.xml
@@ -67,6 +67,7 @@
     <string name="pref_cat_advanced" maxLength="41">高度な設定</string>
     <string name="pref_cat_workarounds" maxLength="41">不具合回避策</string>
     <string name="pref_cat_plugins" maxLength="41">プラグイン</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">線の太さ</string>
     <string name="use_input_tag" maxLength="41">答えを入力する欄をカード内に表示</string>
@@ -201,7 +202,6 @@
     <string name="accessibility" maxLength="41">アクセシビリティ</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">クリップボード画像をPNG形式で貼り付け</string>
-    <string name="paste_as_png_summary">このオプションがオフ（デフォルト）の場合、クリップボードにある画像を貼り付ける際は、ディスク領域の節約のためにJPG形式の画像ファイルとして貼り付けます。このオプションをオンにすると、PNG形式の画像ファイルとして貼り付けます</string>
     <string name="exit_via_double_tap_back" maxLength="41">学習終了・アプリ終了には「戻る」操作２回</string>
     <string name="exit_via_double_tap_back_summ">学習画面とデッキリスト画面でそれぞれ、意図せず画面を閉じてしまう操作ミスを起こりにくくします</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-jv/01-core.xml b/AnkiDroid/src/main/res/values-jv/01-core.xml
index 9ef7be03d79f..5a76f984371a 100644
--- a/AnkiDroid/src/main/res/values-jv/01-core.xml
+++ b/AnkiDroid/src/main/res/values-jv/01-core.xml
@@ -120,8 +120,6 @@
     <string name="empty_cram_label" maxLength="28">Empty</string>
     <string name="create_subdeck">Create subdeck</string>
     <string name="empty_filtered_deck">Emptying filtered deck&#8230;</string>
-    <string name="custom_study_deck_name">Custom study session</string>
-    <string name="custom_study_deck_exists">Rename the existing custom study deck first</string>
     <string name="search_deck" comment="Deck search for selecting it">Deck Search</string>
     <string name="empty_deck">This deck is empty</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Deck Search</string>
diff --git a/AnkiDroid/src/main/res/values-jv/02-strings.xml b/AnkiDroid/src/main/res/values-jv/02-strings.xml
index 9ef39d948fe4..24259046bec8 100644
--- a/AnkiDroid/src/main/res/values-jv/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-jv/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flags</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Batasi tag tertentu</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="other">+%d buried</item>
     </plurals>
diff --git a/AnkiDroid/src/main/res/values-jv/03-dialogs.xml b/AnkiDroid/src/main/res/values-jv/03-dialogs.xml
index 874f16210ea4..0b791e72d8c2 100644
--- a/AnkiDroid/src/main/res/values-jv/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-jv/03-dialogs.xml
@@ -71,6 +71,7 @@
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead">Review ahead by x days:</string>
     <string name="custom_study_preview">Preview new cards added in the last x days:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Storage full</string>
     <string name="storage_almost_full_title">Storage almost full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-jv/10-preferences.xml b/AnkiDroid/src/main/res/values-jv/10-preferences.xml
index 6744950912bc..3f9dd4876545 100644
--- a/AnkiDroid/src/main/res/values-jv/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-jv/10-preferences.xml
@@ -67,6 +67,7 @@
     <string name="pref_cat_advanced" maxLength="41">Advanced</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
     <string name="use_input_tag" maxLength="41">Type answer into the card</string>
@@ -202,7 +203,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-ka/01-core.xml b/AnkiDroid/src/main/res/values-ka/01-core.xml
index 0f7efe802fde..a9c7cebe00fe 100644
--- a/AnkiDroid/src/main/res/values-ka/01-core.xml
+++ b/AnkiDroid/src/main/res/values-ka/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">ცარიელია</string>
     <string name="create_subdeck">ქვედასტის შექმნა</string>
     <string name="empty_filtered_deck">გაფილტრული დეკის დაცარიელება</string>
-    <string name="custom_study_deck_name">სწავლის ინდივიდუალური სესია</string>
-    <string name="custom_study_deck_exists">ჯერ ინდივიდუალური სასწავლო დასტის სახელი შეცვალეთ</string>
     <string name="search_deck" comment="Deck search for selecting it">დასტის ძებნა</string>
     <string name="empty_deck">ეს დასტა ცარიელია</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">დასტის ძიება</string>
diff --git a/AnkiDroid/src/main/res/values-ka/02-strings.xml b/AnkiDroid/src/main/res/values-ka/02-strings.xml
index b352b12049ac..afb671b172cb 100644
--- a/AnkiDroid/src/main/res/values-ka/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ka/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">WebView სისტემამ ვერ დაამუშავა ბარათი „%1$s“.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">დროშები</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">კონკრეტულ იარლიყებზე შეზღუდვა</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d დღეისათვის დამალულია</item>
         <item quantity="other">+%d დღეისათვის დამალულია</item>
diff --git a/AnkiDroid/src/main/res/values-ka/03-dialogs.xml b/AnkiDroid/src/main/res/values-ka/03-dialogs.xml
index b76b82c46dd0..2f0762d7ba0a 100644
--- a/AnkiDroid/src/main/res/values-ka/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ka/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">გასულ x დღეში დავიწყებული ბარათების გადახედვა:</string>
     <string name="custom_study_ahead">X დღით ადრე სწავლა:</string>
     <string name="custom_study_preview">ბოლო x დღეში დამატებული ბარათების წინასწარ ნახვა:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">მეხსიერება სავსეა</string>
     <string name="storage_almost_full_title">მეხსიერება თითქმის გავსებულია</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">მეხსიერების სივრცე არ არის</string>
diff --git a/AnkiDroid/src/main/res/values-ka/10-preferences.xml b/AnkiDroid/src/main/res/values-ka/10-preferences.xml
index add6dedb5427..e39095b68fe3 100644
--- a/AnkiDroid/src/main/res/values-ka/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ka/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">დამატებითი</string>
     <string name="pref_cat_workarounds" maxLength="41">გამოსავლები</string>
     <string name="pref_cat_plugins" maxLength="41">დანამატები</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">ხაზის სისქე</string>
     <string name="use_input_tag" maxLength="41">პასუხის აკრეფა ბარათში</string>
@@ -203,7 +204,6 @@
     <string name="accessibility" maxLength="41">მარტივი წვდომა</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">გაცვლითი ბუფერის სურათების PNG-ფაილებად ჩასმა</string>
-    <string name="paste_as_png_summary">Anki გაცვლის ბუფერიდან ჩასმულ სურათებს სტანდარტულად JPG-ფაილებად სვამს, რათა მეხსიერების სივრცე დაზოგოს. ამ პარამეტრის ჩართვით სურათები PNG ფორმატში ჩაისმევა.</string>
     <string name="exit_via_double_tap_back" maxLength="41">სწავლის რეჟიმიდან/აპლიკაციიდან გამოსასვლელად უკან წასასვლელ ღილაკზე ორჯერ დაჭერა</string>
     <string name="exit_via_double_tap_back_summ">ამცირებს იმის ალბათობას, რომ შემთხვევით გახვიდეთ</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-kk/01-core.xml b/AnkiDroid/src/main/res/values-kk/01-core.xml
index 181a9719ba94..598471317a8f 100644
--- a/AnkiDroid/src/main/res/values-kk/01-core.xml
+++ b/AnkiDroid/src/main/res/values-kk/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Босату</string>
     <string name="create_subdeck">Create subdeck</string>
     <string name="empty_filtered_deck">Emptying filtered deck&#8230;</string>
-    <string name="custom_study_deck_name">Custom study session</string>
-    <string name="custom_study_deck_exists">Rename the existing custom study deck first</string>
     <string name="search_deck" comment="Deck search for selecting it">Deck Search</string>
     <string name="empty_deck">This deck is empty</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Deck Search</string>
diff --git a/AnkiDroid/src/main/res/values-kk/02-strings.xml b/AnkiDroid/src/main/res/values-kk/02-strings.xml
index 509505f66399..5e4fab69ad3c 100644
--- a/AnkiDroid/src/main/res/values-kk/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-kk/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flags</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limit to particular tags</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="other">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-kk/03-dialogs.xml b/AnkiDroid/src/main/res/values-kk/03-dialogs.xml
index 2b93808c96e8..e884c6c3f964 100644
--- a/AnkiDroid/src/main/res/values-kk/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-kk/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead">Review ahead by x days:</string>
     <string name="custom_study_preview">Preview new cards added in the last x days:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Storage full</string>
     <string name="storage_almost_full_title">Storage almost full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-kk/10-preferences.xml b/AnkiDroid/src/main/res/values-kk/10-preferences.xml
index 685d62aa4d39..8d49177684a2 100644
--- a/AnkiDroid/src/main/res/values-kk/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-kk/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Advanced</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
     <string name="use_input_tag" maxLength="41">Type answer into the card</string>
@@ -204,7 +205,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-km/01-core.xml b/AnkiDroid/src/main/res/values-km/01-core.xml
index 3bb39dc6fb89..bcc2b0415df0 100644
--- a/AnkiDroid/src/main/res/values-km/01-core.xml
+++ b/AnkiDroid/src/main/res/values-km/01-core.xml
@@ -120,8 +120,6 @@
     <string name="empty_cram_label" maxLength="28">Empty</string>
     <string name="create_subdeck">Create subdeck</string>
     <string name="empty_filtered_deck">Emptying filtered deck&#8230;</string>
-    <string name="custom_study_deck_name">Custom study session</string>
-    <string name="custom_study_deck_exists">Rename the existing custom study deck first</string>
     <string name="search_deck" comment="Deck search for selecting it">Deck Search</string>
     <string name="empty_deck">This deck is empty</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Deck Search</string>
diff --git a/AnkiDroid/src/main/res/values-km/02-strings.xml b/AnkiDroid/src/main/res/values-km/02-strings.xml
index 7bfe15fa7656..0c0d139cc8c6 100644
--- a/AnkiDroid/src/main/res/values-km/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-km/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">ទង់</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limit to particular tags</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="other">+%d buried</item>
     </plurals>
diff --git a/AnkiDroid/src/main/res/values-km/03-dialogs.xml b/AnkiDroid/src/main/res/values-km/03-dialogs.xml
index e2775a72ae53..278df92746e6 100644
--- a/AnkiDroid/src/main/res/values-km/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-km/03-dialogs.xml
@@ -71,6 +71,7 @@
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead">Review ahead by x days:</string>
     <string name="custom_study_preview">Preview new cards added in the last x days:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Storage full</string>
     <string name="storage_almost_full_title">Storage almost full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-km/10-preferences.xml b/AnkiDroid/src/main/res/values-km/10-preferences.xml
index 6c1099c77fc7..ba0a05cc1d31 100644
--- a/AnkiDroid/src/main/res/values-km/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-km/10-preferences.xml
@@ -67,6 +67,7 @@
     <string name="pref_cat_advanced" maxLength="41">Advanced</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
     <string name="use_input_tag" maxLength="41">វាយចម្លើយចូលកាត</string>
@@ -202,7 +203,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-kn/01-core.xml b/AnkiDroid/src/main/res/values-kn/01-core.xml
index 064de6f39ef5..3b2614c5f5fb 100644
--- a/AnkiDroid/src/main/res/values-kn/01-core.xml
+++ b/AnkiDroid/src/main/res/values-kn/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">ಖಾಲಿ</string>
     <string name="create_subdeck">ಉಪ ಸಂಗ್ರಹವನ್ನು ರಚಿಸಿ</string>
     <string name="empty_filtered_deck">ಫಿಲ್ಟರ್ ಮಾಡಿದ ಡೆಕ್ ಅನ್ನು ಖಾಲಿ ಮಾಡಲಾಗುತ್ತಿದೆ&#8230;</string>
-    <string name="custom_study_deck_name">ಕಸ್ಟಮ್ ಅಧ್ಯಯನ ಅಧಿವೇಶನ</string>
-    <string name="custom_study_deck_exists">ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಕಸ್ಟಮ್ ಸ್ಟಡಿ ಡೆಕ್ ಅನ್ನು ಮೊದಲು ಮರುಹೆಸರಿಸಿ</string>
     <string name="search_deck" comment="Deck search for selecting it">ಡೆಕ್ ಹುಡುಕಾಟ</string>
     <string name="empty_deck">ಈ ಡೆಕ್ ಖಾಲಿಯಾಗಿದೆ</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">ಡೆಕ್ ಹುಡುಕಾಟ</string>
diff --git a/AnkiDroid/src/main/res/values-kn/02-strings.xml b/AnkiDroid/src/main/res/values-kn/02-strings.xml
index f7ade3157057..300368471ffa 100644
--- a/AnkiDroid/src/main/res/values-kn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-kn/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">\'%1$s\' ಕಾರ್ಡ್ ಅನ್ನು ನಿರೂಪಿಸಲು ಸಿಸ್ಟಮ್ ವೆಬ್‌ವೀಕ್ಷಣೆ ವಿಫಲವಾಗಿದೆ.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">ಧ್ವಜಗಳು</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">ನಿರ್ದಿಷ್ಟ ಟ್ಯಾಗ್‌ಗಳಿಗೆ ಮಿತಿಗೊಳಿಸಿ</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="other">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-kn/03-dialogs.xml b/AnkiDroid/src/main/res/values-kn/03-dialogs.xml
index 12615adff4a0..590a204b4838 100644
--- a/AnkiDroid/src/main/res/values-kn/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-kn/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">ಕಳೆದ x ದಿನಗಳಲ್ಲಿ ಮರೆತಿರುವ ರಿವ್ಯೂ ಕಾರ್ಡ್‌ಗಳು:</string>
     <string name="custom_study_ahead">x ದಿನಗಳ ಮೊದಲು ಪರಿಶೀಲಿಸಿ:</string>
     <string name="custom_study_preview">ಕಳೆದ x ದಿನಗಳಲ್ಲಿ ಸೇರಿಸಲಾದ ಹೊಸ ಕಾರ್ಡ್‌ಗಳ ಪೂರ್ವವೀಕ್ಷಣೆ:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">ಸಂಗ್ರಹಣೆ ತುಂಬಿದೆ</string>
     <string name="storage_almost_full_title">ಸಂಗ್ರಹಣೆಯು ಬಹುತೇಕ ಪೂರ್ಣವಾಗಿದೆ</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">ಜಾಗ ಇಲ್ಲ</string>
diff --git a/AnkiDroid/src/main/res/values-kn/10-preferences.xml b/AnkiDroid/src/main/res/values-kn/10-preferences.xml
index b2dfe8a0938d..9ae9ca5fae8b 100644
--- a/AnkiDroid/src/main/res/values-kn/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-kn/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">ಸುಧಾರಿತ</string>
     <string name="pref_cat_workarounds" maxLength="41">ಪರಿಹಾರೋಪಾಯಗಳು</string>
     <string name="pref_cat_plugins" maxLength="41">ಪ್ಲಗಿನ್‌ಗಳು</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">ಸ್ಟ್ರೋಕ್ ಅಗಲ</string>
     <string name="use_input_tag" maxLength="41">ಕಾರ್ಡ್‌ನಲ್ಲಿ ಉತ್ತರವನ್ನು ಟೈಪ್ ಮಾಡಿ</string>
@@ -203,7 +204,6 @@
     <string name="accessibility" maxLength="41">ಪ್ರವೇಶಿಸುವಿಕೆ</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">ಕ್ಲಿಪ್‌ಬೋರ್ಡ್ ಚಿತ್ರಗಳನ್ನು PNG ನಂತೆ ಅಂಟಿಸಿ</string>
-    <string name="paste_as_png_summary">ಕ್ಲಿಪ್‌ಬೋರ್ಡ್‌ನಲ್ಲಿ ಡಿಸ್ಕ್ ಜಾಗವನ್ನು ಉಳಿಸಲು ಡೀಫಾಲ್ಟ್ ಆಗಿ ಅಂಕಿ ಚಿತ್ರಗಳನ್ನು JPG ಫೈಲ್‌ಗಳಾಗಿ ಅಂಟಿಸುತ್ತಾನೆ. ಬದಲಿಗೆ PNG ಚಿತ್ರಗಳನ್ನು ಅಂಟಿಸಲು ನೀವು ಈ ಆಯ್ಕೆಯನ್ನು ಬಳಸಬಹುದು.</string>
     <string name="exit_via_double_tap_back" maxLength="41">ಹಿಂತಿರುಗಲು/ನಿರ್ಗಮಿಸಲು ಎರಡು ಬಾರಿ ಹಿಂದಕ್ಕೆ ಒತ್ತಿರಿ</string>
     <string name="exit_via_double_tap_back_summ">ವಿಮರ್ಶಕರು ಅಥವಾ ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ಆಕಸ್ಮಿಕವಾಗಿ ತೊರೆಯುವುದನ್ನು ತಪ್ಪಿಸಲು</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-ko/01-core.xml b/AnkiDroid/src/main/res/values-ko/01-core.xml
index 68d4877c4ebb..b2008dce4a77 100644
--- a/AnkiDroid/src/main/res/values-ko/01-core.xml
+++ b/AnkiDroid/src/main/res/values-ko/01-core.xml
@@ -120,8 +120,6 @@
     <string name="empty_cram_label" maxLength="28">비우기</string>
     <string name="create_subdeck">하위 뭉치 만들기</string>
     <string name="empty_filtered_deck">필터링된 덱을 비우는 중&#8230;</string>
-    <string name="custom_study_deck_name">맞춤 학습 세션</string>
-    <string name="custom_study_deck_exists">기존의 맞춤 학습 덱의 이름을 먼저 변경하세요.</string>
     <string name="search_deck" comment="Deck search for selecting it">덱 검색하기</string>
     <string name="empty_deck">이 덱은 비어있습니다</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">카드 덱 검색</string>
diff --git a/AnkiDroid/src/main/res/values-ko/02-strings.xml b/AnkiDroid/src/main/res/values-ko/02-strings.xml
index 6454036bfbc2..c9963f7b007f 100644
--- a/AnkiDroid/src/main/res/values-ko/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ko/02-strings.xml
@@ -83,7 +83,8 @@
 %2$s</string>
     <string name="filter_by_flags" maxLength="41">플래그</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">특정 태그로만 제한하기</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="other">+%d 숨겨짐</item>
     </plurals>
diff --git a/AnkiDroid/src/main/res/values-ko/03-dialogs.xml b/AnkiDroid/src/main/res/values-ko/03-dialogs.xml
index af9fe4e697b4..5f2a955bb124 100644
--- a/AnkiDroid/src/main/res/values-ko/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ko/03-dialogs.xml
@@ -71,6 +71,7 @@
     <string name="custom_study_forgotten">최근 x일 동안 잊혀진 복습 카드:</string>
     <string name="custom_study_ahead">x일 만큼 미리 복습하기:</string>
     <string name="custom_study_preview">최근 x일 내에 추가된 카드 미리 학습하기:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">저장 공간이 가득 찼습니다.</string>
     <string name="storage_almost_full_title">저장공간이 거의 가득 찼습니다.</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">빈 공간 없음</string>
diff --git a/AnkiDroid/src/main/res/values-ko/10-preferences.xml b/AnkiDroid/src/main/res/values-ko/10-preferences.xml
index 6d9a835d0448..7ee7e8b4657f 100644
--- a/AnkiDroid/src/main/res/values-ko/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ko/10-preferences.xml
@@ -67,6 +67,7 @@
     <string name="pref_cat_advanced" maxLength="41">고급 설정</string>
     <string name="pref_cat_workarounds" maxLength="41">차선책</string>
     <string name="pref_cat_plugins" maxLength="41">플러그인</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">획 두께</string>
     <string name="use_input_tag" maxLength="41">카드에 정답 입력</string>
@@ -201,7 +202,6 @@
     <string name="accessibility" maxLength="41">접근성</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">클립보드 이미지를 PNG로 붙여넣기</string>
-    <string name="paste_as_png_summary">기본적으로 Anki는 클립보드의 이미지를 JPG로 저장해 저장 공간을 절약합니다. 이 옵션을 사용해 대신 PNG 이미지를 사용할 수 있습니다.</string>
     <string name="exit_via_double_tap_back" maxLength="41">뒤로가기 버튼 두번 눌러 돌아가기/나가기</string>
     <string name="exit_via_double_tap_back_summ">실수로 인한 학습 종료와 앱 종료 방지</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-ku/01-core.xml b/AnkiDroid/src/main/res/values-ku/01-core.xml
index caeaab6f8eb9..28a017fd2053 100644
--- a/AnkiDroid/src/main/res/values-ku/01-core.xml
+++ b/AnkiDroid/src/main/res/values-ku/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Vala</string>
     <string name="create_subdeck">Create subdeck</string>
     <string name="empty_filtered_deck">Emptying filtered deck&#8230;</string>
-    <string name="custom_study_deck_name">Custom study session</string>
-    <string name="custom_study_deck_exists">Rename the existing custom study deck first</string>
     <string name="search_deck" comment="Deck search for selecting it">Deck Search</string>
     <string name="empty_deck">This deck is empty</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Deck Search</string>
diff --git a/AnkiDroid/src/main/res/values-ku/02-strings.xml b/AnkiDroid/src/main/res/values-ku/02-strings.xml
index de86f21d4bb3..5b388918c577 100644
--- a/AnkiDroid/src/main/res/values-ku/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ku/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flags</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limit to particular tags</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="other">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-ku/03-dialogs.xml b/AnkiDroid/src/main/res/values-ku/03-dialogs.xml
index bc39ef10c3ad..c21bd4374f41 100644
--- a/AnkiDroid/src/main/res/values-ku/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ku/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead">Review ahead by x days:</string>
     <string name="custom_study_preview">Preview new cards added in the last x days:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Storage full</string>
     <string name="storage_almost_full_title">Storage almost full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-ku/10-preferences.xml b/AnkiDroid/src/main/res/values-ku/10-preferences.xml
index 5f33bc5fee24..2067dfab39b5 100644
--- a/AnkiDroid/src/main/res/values-ku/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ku/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Pêşketî</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
     <string name="use_input_tag" maxLength="41">Type answer into the card</string>
@@ -204,7 +205,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-ky/01-core.xml b/AnkiDroid/src/main/res/values-ky/01-core.xml
index fb54dd656cd4..af7768c1875c 100644
--- a/AnkiDroid/src/main/res/values-ky/01-core.xml
+++ b/AnkiDroid/src/main/res/values-ky/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Empty</string>
     <string name="create_subdeck">Create subdeck</string>
     <string name="empty_filtered_deck">Emptying filtered deck&#8230;</string>
-    <string name="custom_study_deck_name">Custom study session</string>
-    <string name="custom_study_deck_exists">Rename the existing custom study deck first</string>
     <string name="search_deck" comment="Deck search for selecting it">Deck Search</string>
     <string name="empty_deck">This deck is empty</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Deck Search</string>
diff --git a/AnkiDroid/src/main/res/values-ky/02-strings.xml b/AnkiDroid/src/main/res/values-ky/02-strings.xml
index 509505f66399..5e4fab69ad3c 100644
--- a/AnkiDroid/src/main/res/values-ky/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ky/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flags</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limit to particular tags</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="other">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-ky/03-dialogs.xml b/AnkiDroid/src/main/res/values-ky/03-dialogs.xml
index b6183035d223..9b5f43a5bd68 100644
--- a/AnkiDroid/src/main/res/values-ky/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ky/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead">Review ahead by x days:</string>
     <string name="custom_study_preview">Preview new cards added in the last x days:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Storage full</string>
     <string name="storage_almost_full_title">Storage almost full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-ky/10-preferences.xml b/AnkiDroid/src/main/res/values-ky/10-preferences.xml
index 685d62aa4d39..8d49177684a2 100644
--- a/AnkiDroid/src/main/res/values-ky/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ky/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Advanced</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
     <string name="use_input_tag" maxLength="41">Type answer into the card</string>
@@ -204,7 +205,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-lt/01-core.xml b/AnkiDroid/src/main/res/values-lt/01-core.xml
index 96cb94e0bb46..1dcf0ddd6490 100644
--- a/AnkiDroid/src/main/res/values-lt/01-core.xml
+++ b/AnkiDroid/src/main/res/values-lt/01-core.xml
@@ -129,8 +129,6 @@
     <string name="empty_cram_label" maxLength="28">Išvalyti</string>
     <string name="create_subdeck">Kurkite vidinį rinkinį</string>
     <string name="empty_filtered_deck">Išvalomas filtruotas rinkinys&#8230;</string>
-    <string name="custom_study_deck_name">Individualus mokymosi seansas</string>
-    <string name="custom_study_deck_exists">Prašome pirmiausiai pervadinti esamą individualaus mokymosi rinkinį</string>
     <string name="search_deck" comment="Deck search for selecting it">Rinkinio paieška</string>
     <string name="empty_deck">Šis rinkinys yra tuščias</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Rinkinio paieška</string>
diff --git a/AnkiDroid/src/main/res/values-lt/02-strings.xml b/AnkiDroid/src/main/res/values-lt/02-strings.xml
index da4784fe9982..93772f8870a8 100644
--- a/AnkiDroid/src/main/res/values-lt/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-lt/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flags</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Apriboti iki tam tikrų žymių</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="few">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-lt/03-dialogs.xml b/AnkiDroid/src/main/res/values-lt/03-dialogs.xml
index f8d94b967094..5285e517813b 100644
--- a/AnkiDroid/src/main/res/values-lt/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-lt/03-dialogs.xml
@@ -77,6 +77,7 @@
     <string name="custom_study_forgotten">Peržiūrėti korteles, kurios buvo pamirštos per paskutines x dienų:</string>
     <string name="custom_study_ahead">Kartoti į priekį x dienų:</string>
     <string name="custom_study_preview">Peržiūrėti naujas korteles, pridėtas per paskutines x dienų:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Storage full</string>
     <string name="storage_almost_full_title">Storage almost full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-lt/10-preferences.xml b/AnkiDroid/src/main/res/values-lt/10-preferences.xml
index 72db714301fa..245bae8fa871 100644
--- a/AnkiDroid/src/main/res/values-lt/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-lt/10-preferences.xml
@@ -70,6 +70,7 @@
     <string name="pref_cat_advanced" maxLength="41">Sudėtingiau</string>
     <string name="pref_cat_workarounds" maxLength="41">Alternatyvūs būdai</string>
     <string name="pref_cat_plugins" maxLength="41">Papildiniai</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Linijos plotis</string>
     <string name="use_input_tag" maxLength="41">Įvesti atsakymą į kortelę</string>
@@ -208,7 +209,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-lv/01-core.xml b/AnkiDroid/src/main/res/values-lv/01-core.xml
index e2110eb015c8..b761c781a1e0 100644
--- a/AnkiDroid/src/main/res/values-lv/01-core.xml
+++ b/AnkiDroid/src/main/res/values-lv/01-core.xml
@@ -126,8 +126,6 @@
     <string name="empty_cram_label" maxLength="28">Tukšs</string>
     <string name="create_subdeck">Izveidot apakškavu</string>
     <string name="empty_filtered_deck">Iztukšo pielāgoto kavu</string>
-    <string name="custom_study_deck_name">Pielāgota mācība</string>
-    <string name="custom_study_deck_exists">Vispirms pārsauciet esošo pielāgoto kavu</string>
     <string name="search_deck" comment="Deck search for selecting it">Kavu pārlūks</string>
     <string name="empty_deck">Šī kava ir tukša</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Kavu meklētājs</string>
diff --git a/AnkiDroid/src/main/res/values-lv/02-strings.xml b/AnkiDroid/src/main/res/values-lv/02-strings.xml
index 77293a2f9eda..fa194d29c6c9 100644
--- a/AnkiDroid/src/main/res/values-lv/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-lv/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flags</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limit to particular tags</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="zero">+%d buried</item>
         <item quantity="one">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-lv/03-dialogs.xml b/AnkiDroid/src/main/res/values-lv/03-dialogs.xml
index aa6db4a7a1b6..76595a1c0f80 100644
--- a/AnkiDroid/src/main/res/values-lv/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-lv/03-dialogs.xml
@@ -75,6 +75,7 @@
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead">Review ahead by x days:</string>
     <string name="custom_study_preview">Preview new cards added in the last x days:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Storage full</string>
     <string name="storage_almost_full_title">Storage almost full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-lv/10-preferences.xml b/AnkiDroid/src/main/res/values-lv/10-preferences.xml
index 61a6ac3f7dba..745c5692839e 100644
--- a/AnkiDroid/src/main/res/values-lv/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-lv/10-preferences.xml
@@ -69,6 +69,7 @@
     <string name="pref_cat_advanced" maxLength="41">Advanced</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
     <string name="use_input_tag" maxLength="41">Type answer into the card</string>
@@ -206,7 +207,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-mk/01-core.xml b/AnkiDroid/src/main/res/values-mk/01-core.xml
index 14aa08dd58ce..e08a12d77354 100644
--- a/AnkiDroid/src/main/res/values-mk/01-core.xml
+++ b/AnkiDroid/src/main/res/values-mk/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Празно</string>
     <string name="create_subdeck">Направи подшпил</string>
     <string name="empty_filtered_deck">Emptying filtered deck&#8230;</string>
-    <string name="custom_study_deck_name">Прилагодена студиска сесија</string>
-    <string name="custom_study_deck_exists">Прво преименувајте ја постоечката прилагодена студија на deck</string>
     <string name="search_deck" comment="Deck search for selecting it">Deck Search</string>
     <string name="empty_deck">Овој deck е празен</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Deck Search</string>
diff --git a/AnkiDroid/src/main/res/values-mk/02-strings.xml b/AnkiDroid/src/main/res/values-mk/02-strings.xml
index 75b196cd586d..ba3c163628e9 100644
--- a/AnkiDroid/src/main/res/values-mk/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-mk/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flags</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Ограничи на одредени тагови</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="other">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-mk/03-dialogs.xml b/AnkiDroid/src/main/res/values-mk/03-dialogs.xml
index 19d6636e297f..a84b2b5b6a1e 100644
--- a/AnkiDroid/src/main/res/values-mk/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-mk/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Преглед на картички заборавени во последните x денови:</string>
     <string name="custom_study_ahead">Преглед напред за x денови:</string>
     <string name="custom_study_preview">Преглед на нови картички додадени во последните x дена:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Storage full</string>
     <string name="storage_almost_full_title">Storage almost full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-mk/10-preferences.xml b/AnkiDroid/src/main/res/values-mk/10-preferences.xml
index 2d27886b5c21..2fc8ed4d26ce 100644
--- a/AnkiDroid/src/main/res/values-mk/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-mk/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Напредно</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
     <string name="use_input_tag" maxLength="41">Пиши одговор на карта</string>
@@ -204,7 +205,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-ml/01-core.xml b/AnkiDroid/src/main/res/values-ml/01-core.xml
index d9e9cb1424ca..4a56e57a5fa6 100644
--- a/AnkiDroid/src/main/res/values-ml/01-core.xml
+++ b/AnkiDroid/src/main/res/values-ml/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">ശൂന്യമാണ്</string>
     <string name="create_subdeck">സബ്ഡെക്ക് സൃഷ്ടിക്കുക</string>
     <string name="empty_filtered_deck">ഫിൽട്ടർ ചെയ്ത ഡെക്ക് ശൂന്യമാക്കുന്നു&#8230;</string>
-    <string name="custom_study_deck_name">ഇഷ്‌ടാനുസൃത പഠന സെഷൻ</string>
-    <string name="custom_study_deck_exists">ആദ്യം നിലവിലുള്ള ഇഷ്‌ടാനുസൃത പഠന ഡെക്കിന്റെ പേരുമാറ്റുക</string>
     <string name="search_deck" comment="Deck search for selecting it">ഡെക്ക് തിരയൽ</string>
     <string name="empty_deck">ഈ ഡെക്ക് ശൂന്യമാണ്</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">ഡെക്ക് തിരയൽ</string>
diff --git a/AnkiDroid/src/main/res/values-ml/02-strings.xml b/AnkiDroid/src/main/res/values-ml/02-strings.xml
index 2e4323e58bac..7810138f2cf1 100644
--- a/AnkiDroid/src/main/res/values-ml/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ml/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">\'%1$s\' കാർഡ് റെൻഡർ ചെയ്യുന്നതിൽ സിസ്റ്റം വെബ്‌വ്യൂ പരാജയപ്പെട്ടു. \n%2$s</string>
     <string name="filter_by_flags" maxLength="41">പതാകകൾ</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">പ്രത്യേക ടാഗുകളിലേക്ക് പരിമിതപ്പെടുത്തുക</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d അടക്കം ചെയ്തു</item>
         <item quantity="other">+%d അടക്കം ചെയ്തു</item>
diff --git a/AnkiDroid/src/main/res/values-ml/03-dialogs.xml b/AnkiDroid/src/main/res/values-ml/03-dialogs.xml
index 000d9c2cd523..4fcc88692805 100644
--- a/AnkiDroid/src/main/res/values-ml/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ml/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">കഴിഞ്ഞ x ദിവസങ്ങളിൽ മറന്ന അവലോകന കാർഡുകൾ:</string>
     <string name="custom_study_ahead">X ദിവസത്തിനകം അവലോകനം ചെയ്യുക:</string>
     <string name="custom_study_preview">അവസാന x ദിവസങ്ങളിൽ ചേർത്ത പുതിയ കാർഡുകൾ പ്രിവ്യൂ ചെയ്യുക:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">സംഭരണം നിറഞ്ഞു</string>
     <string name="storage_almost_full_title">സംഭരണം ഏതാണ്ട് നിറഞ്ഞു</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">ഇടമില്ല</string>
diff --git a/AnkiDroid/src/main/res/values-ml/10-preferences.xml b/AnkiDroid/src/main/res/values-ml/10-preferences.xml
index f6d7abe1086a..816a474a9446 100644
--- a/AnkiDroid/src/main/res/values-ml/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ml/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">സംഗീർണതയുള്ളവ</string>
     <string name="pref_cat_workarounds" maxLength="41">പരിഹാരങ്ങൾ</string>
     <string name="pref_cat_plugins" maxLength="41">പ്ലഗിൻ</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">സ്ട്രോക്ക് വീതി</string>
     <string name="use_input_tag" maxLength="41">കാർഡിൽ ഉത്തരം ടൈപ്പുചെയ്യുക</string>
@@ -203,7 +204,6 @@
     <string name="accessibility" maxLength="41">പ്രവേശനക്ഷമത</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">ക്ലിപ്പ്ബോർഡ് ചിത്രങ്ങൾ PNG ആയി ഒട്ടിക്കുക</string>
-    <string name="paste_as_png_summary">ഡിഫോൾട്ടായി, ഡിസ്ക് സ്പേസ് ലാഭിക്കുന്നതിനായി Anki ചിത്രങ്ങൾ JPG ഫയലുകളായി ക്ലിപ്പ്ബോർഡിലേക്ക് ഒട്ടിക്കുന്നു. പകരം PNG ഇമേജുകളായി ഒട്ടിക്കാൻ നിങ്ങൾക്ക് ഈ ഓപ്ഷൻ ഉപയോഗിക്കാം.</string>
     <string name="exit_via_double_tap_back" maxLength="41">തിരികെ പോകാൻ / പുറത്തുകടക്കാൻ രണ്ട് തവണ പിന്നിലേക്ക് അമർത്തുക</string>
     <string name="exit_via_double_tap_back_summ">റിവ്യൂവറിൽ നിന്നോ ആപ്പിൽ നിന്നോ ആകസ്മികമായി ഉപേക്ഷിക്കുന്നത് ഒഴിവാക്കാൻ</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-mn/01-core.xml b/AnkiDroid/src/main/res/values-mn/01-core.xml
index ba496bd68a53..e2ccc8abe8d4 100644
--- a/AnkiDroid/src/main/res/values-mn/01-core.xml
+++ b/AnkiDroid/src/main/res/values-mn/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Хоослох</string>
     <string name="create_subdeck">Дэд багц үүсгэх</string>
     <string name="empty_filtered_deck">Хоосон багцыг ангилж байна&#8230;</string>
-    <string name="custom_study_deck_name">Тусгай суралцах горим</string>
-    <string name="custom_study_deck_exists">Аль хэдийн эхлүүлсэн \"Тусгай судлах хэсэг\"-ийнхээ нэрээ эхэлж өөрчилнө үү</string>
     <string name="search_deck" comment="Deck search for selecting it">Багц хайх</string>
     <string name="empty_deck">Энэ багц хоосон байна</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Интернетээс багц хайх</string>
diff --git a/AnkiDroid/src/main/res/values-mn/02-strings.xml b/AnkiDroid/src/main/res/values-mn/02-strings.xml
index cf7b4fdc08b6..dcfb698e5e64 100644
--- a/AnkiDroid/src/main/res/values-mn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-mn/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Дарцагнууд</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limit to particular tags</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="other">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-mn/03-dialogs.xml b/AnkiDroid/src/main/res/values-mn/03-dialogs.xml
index db01ccc584a3..c85228a8acd8 100644
--- a/AnkiDroid/src/main/res/values-mn/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-mn/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead">Review ahead by x days:</string>
     <string name="custom_study_preview">Preview new cards added in the last x days:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Storage full</string>
     <string name="storage_almost_full_title">Storage almost full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-mn/10-preferences.xml b/AnkiDroid/src/main/res/values-mn/10-preferences.xml
index c8775dba4933..edd69700a9df 100644
--- a/AnkiDroid/src/main/res/values-mn/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-mn/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Advanced</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
     <string name="use_input_tag" maxLength="41">Type answer into the card</string>
@@ -204,7 +205,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-mr/01-core.xml b/AnkiDroid/src/main/res/values-mr/01-core.xml
index a622e481b42f..80acb3dd71fe 100644
--- a/AnkiDroid/src/main/res/values-mr/01-core.xml
+++ b/AnkiDroid/src/main/res/values-mr/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">रिक्त</string>
     <string name="create_subdeck">सबडेक तयार करा</string>
     <string name="empty_filtered_deck">फिल्टर केलेले डेक रिक्त करत आहे&#8230;</string>
-    <string name="custom_study_deck_name">सानुकूल अभ्यास सत्र</string>
-    <string name="custom_study_deck_exists">आधी अस्तित्त्वात असलेल्या सानुकूल स्टडी डेकचे नाव बदला</string>
     <string name="search_deck" comment="Deck search for selecting it">डेक शोध</string>
     <string name="empty_deck">हा डेक रिक्त आहे</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">डेक शोध</string>
diff --git a/AnkiDroid/src/main/res/values-mr/02-strings.xml b/AnkiDroid/src/main/res/values-mr/02-strings.xml
index 15ddcf9b33b9..13f8d49654d3 100644
--- a/AnkiDroid/src/main/res/values-mr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-mr/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">सिस्टम \'वेबव्यू\' \'%1$s\' कार्ड प्रस्तुत करण्यात अयशस्वी. \ N%2$s</string>
     <string name="filter_by_flags" maxLength="41">ध्वज</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Viśiṣṭa ṭĕgasāṭhī maryādā</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="other">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-mr/03-dialogs.xml b/AnkiDroid/src/main/res/values-mr/03-dialogs.xml
index 06e882a0ab11..7864d03bfd86 100644
--- a/AnkiDroid/src/main/res/values-mr/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-mr/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">गेल्या x दिवसात विसरलेल्या कार्डांचे पुनरावलोकन करा:</string>
     <string name="custom_study_ahead">एक्स दिवसांपूर्वी पुनरावलोकन करा:</string>
     <string name="custom_study_preview">शेवटच्या x दिवसात जोडलेल्या नवीन कार्डांचे पूर्वावलोकन करा:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">स्टोरेज भरले आहे</string>
     <string name="storage_almost_full_title">स्टोरेज जवळजवळ भरले आहे</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">जागा नाही</string>
diff --git a/AnkiDroid/src/main/res/values-mr/10-preferences.xml b/AnkiDroid/src/main/res/values-mr/10-preferences.xml
index 07ac158f4790..7cb37be876d0 100644
--- a/AnkiDroid/src/main/res/values-mr/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-mr/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">आधुनिक</string>
     <string name="pref_cat_workarounds" maxLength="41">वर्कराउंड्स</string>
     <string name="pref_cat_plugins" maxLength="41">प्लगइन</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">स्ट्रोक रून्दी</string>
     <string name="use_input_tag" maxLength="41">कार्डमध्ये उत्तर टाइप करा</string>
@@ -203,7 +204,6 @@
     <string name="accessibility" maxLength="41">प्रवेशयोग्यता</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">क्लिपबोर्ड प्रतिमा PNG म्हणून पेस्ट करा</string>
-    <string name="paste_as_png_summary">डिफॉल्टनुसार अंकी डिस्क स्पेस वाचवण्यासाठी JPG फाइल्स म्हणून क्लिपबोर्डवर प्रतिमा पेस्ट करते. त्याऐवजी तुम्ही PNG इमेज म्हणून पेस्ट करण्यासाठी हा पर्याय वापरू शकता.</string>
     <string name="exit_via_double_tap_back" maxLength="41">परत जाण्यासाठी/बाहेर पडण्यासाठी दोनदा परत दाबा</string>
     <string name="exit_via_double_tap_back_summ">चुकून पुनरावलोकनकर्ता किंवा ॲप सोडणे टाळण्यासाठी</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-ms/01-core.xml b/AnkiDroid/src/main/res/values-ms/01-core.xml
index 73c55408d1ea..e2d20abe9f72 100644
--- a/AnkiDroid/src/main/res/values-ms/01-core.xml
+++ b/AnkiDroid/src/main/res/values-ms/01-core.xml
@@ -120,8 +120,6 @@
     <string name="empty_cram_label" maxLength="28">Kosongkan</string>
     <string name="create_subdeck">Cipta subdek</string>
     <string name="empty_filtered_deck">Mengosongkan dek ditapis&#8230;</string>
-    <string name="custom_study_deck_name">Sesi ulang kaji tersuai</string>
-    <string name="custom_study_deck_exists">Nama semula dek ulang kaji tersuai sedia ada dahulu</string>
     <string name="search_deck" comment="Deck search for selecting it">Carian Dek</string>
     <string name="empty_deck">Dek kosong</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Carian Dek</string>
diff --git a/AnkiDroid/src/main/res/values-ms/02-strings.xml b/AnkiDroid/src/main/res/values-ms/02-strings.xml
index 452b0d1ccba5..53aa804d2d8a 100644
--- a/AnkiDroid/src/main/res/values-ms/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ms/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">WebView Sistem gagal memapar kad \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Tanda</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Had kepada tag tertentu</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="other">+%d buried</item>
     </plurals>
diff --git a/AnkiDroid/src/main/res/values-ms/03-dialogs.xml b/AnkiDroid/src/main/res/values-ms/03-dialogs.xml
index 1ce937638f3b..2b1e444432c6 100644
--- a/AnkiDroid/src/main/res/values-ms/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ms/03-dialogs.xml
@@ -71,6 +71,7 @@
     <string name="custom_study_forgotten">Semak kad terlupa dalam x hari:</string>
     <string name="custom_study_ahead">Semak awal sebanyak x hari:</string>
     <string name="custom_study_preview">Pratonton kad baru ditambah dalam x hari lepas:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Storan penuh</string>
     <string name="storage_almost_full_title">Storan hampir penuh</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">Tiada ruang</string>
diff --git a/AnkiDroid/src/main/res/values-ms/10-preferences.xml b/AnkiDroid/src/main/res/values-ms/10-preferences.xml
index 52bf5127aec0..94358a0dd5ef 100644
--- a/AnkiDroid/src/main/res/values-ms/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ms/10-preferences.xml
@@ -67,6 +67,7 @@
     <string name="pref_cat_advanced" maxLength="41">Lanjutan</string>
     <string name="pref_cat_workarounds" maxLength="41">Penyelesaian sementara</string>
     <string name="pref_cat_plugins" maxLength="41">Plugin</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Lebar garisan</string>
     <string name="use_input_tag" maxLength="41">Taipkan jawapan ke dalam kad</string>
@@ -202,7 +203,6 @@
     <string name="accessibility" maxLength="41">Kebolehcapaian</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Tampal gambar papan keratan sebagai PNG</string>
-    <string name="paste_as_png_summary">Secara lalai Anki tampal gambar pada papan keratan sebagai fail JPG untuk jimat ruang cakera. Anda boleh guna tetapan ini untuk sebaliknya tampal gambar PNG.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Tekan kembali dua kali untuk kembali/keluar</string>
     <string name="exit_via_double_tap_back_summ">Elak keluar dari penyemak atau aplikasi tanpa sengaja</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-my/01-core.xml b/AnkiDroid/src/main/res/values-my/01-core.xml
index b86b52138bf7..cbaed1e55f19 100644
--- a/AnkiDroid/src/main/res/values-my/01-core.xml
+++ b/AnkiDroid/src/main/res/values-my/01-core.xml
@@ -125,8 +125,6 @@
 ဘာမှမရှိဘူး</string>
     <string name="create_subdeck">လုပ်ငန်းအသစ်ဖန်တီး</string>
     <string name="empty_filtered_deck">ထပ်ဆင့်လုပ်ငန်းကိုဖျက်ပစ်နေသည်</string>
-    <string name="custom_study_deck_name">Custom study session</string>
-    <string name="custom_study_deck_exists">Rename the existing custom study deck first</string>
     <string name="search_deck" comment="Deck search for selecting it">Deck Search</string>
     <string name="empty_deck">This deck is empty</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Deck Search</string>
diff --git a/AnkiDroid/src/main/res/values-my/02-strings.xml b/AnkiDroid/src/main/res/values-my/02-strings.xml
index f45046133624..fb9a40012630 100644
--- a/AnkiDroid/src/main/res/values-my/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-my/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flags</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limit to particular tags</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="other">+%d buried</item>
     </plurals>
diff --git a/AnkiDroid/src/main/res/values-my/03-dialogs.xml b/AnkiDroid/src/main/res/values-my/03-dialogs.xml
index 109b345ccd23..07cc81e1c132 100644
--- a/AnkiDroid/src/main/res/values-my/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-my/03-dialogs.xml
@@ -71,6 +71,7 @@
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead">Review ahead by x days:</string>
     <string name="custom_study_preview">Preview new cards added in the last x days:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Storage full</string>
     <string name="storage_almost_full_title">Storage almost full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-my/10-preferences.xml b/AnkiDroid/src/main/res/values-my/10-preferences.xml
index 6744950912bc..3f9dd4876545 100644
--- a/AnkiDroid/src/main/res/values-my/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-my/10-preferences.xml
@@ -67,6 +67,7 @@
     <string name="pref_cat_advanced" maxLength="41">Advanced</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
     <string name="use_input_tag" maxLength="41">Type answer into the card</string>
@@ -202,7 +203,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-nl/01-core.xml b/AnkiDroid/src/main/res/values-nl/01-core.xml
index 7b35f02e96bf..6c1de1bfc96b 100644
--- a/AnkiDroid/src/main/res/values-nl/01-core.xml
+++ b/AnkiDroid/src/main/res/values-nl/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Leeg</string>
     <string name="create_subdeck">Creëer subleerset</string>
     <string name="empty_filtered_deck">Gefilterde set wordt leeggemaakt&#8230;</string>
-    <string name="custom_study_deck_name">Aangepaste studiesessie</string>
-    <string name="custom_study_deck_exists">Gelieve eerst de bestaande aangepaste studieset te hernoemen.</string>
     <string name="search_deck" comment="Deck search for selecting it">Leerset zoeken</string>
     <string name="empty_deck">Deze leerset is leeg</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Set doorzoeken</string>
diff --git a/AnkiDroid/src/main/res/values-nl/02-strings.xml b/AnkiDroid/src/main/res/values-nl/02-strings.xml
index 40740f02073d..0e691094f539 100644
--- a/AnkiDroid/src/main/res/values-nl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-nl/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">Systeem WebView kon de kaart \'%1$s\' niet renderen.\n%2$s</string>
     <string name="filter_by_flags" maxLength="41">Vlaggen</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Beperken tot bepaalde tags</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="other">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-nl/03-dialogs.xml b/AnkiDroid/src/main/res/values-nl/03-dialogs.xml
index fbe78d79ffd4..5ccd8a590156 100644
--- a/AnkiDroid/src/main/res/values-nl/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-nl/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Herhaal kaarten vergeten in de laatste x dagen:</string>
     <string name="custom_study_ahead">Herhaal x dagen vooruit:</string>
     <string name="custom_study_preview">Voorbeschouw nieuwe kaarten toegevoegd in de laatste x dagen:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Opslag vol</string>
     <string name="storage_almost_full_title">Opslag is bijna vol</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">Geen ruimte</string>
diff --git a/AnkiDroid/src/main/res/values-nl/10-preferences.xml b/AnkiDroid/src/main/res/values-nl/10-preferences.xml
index aae9cb87a030..d63c91d5cfe3 100644
--- a/AnkiDroid/src/main/res/values-nl/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-nl/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Geavanceerd</string>
     <string name="pref_cat_workarounds" maxLength="41">Tijdelijke oplossingen</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Lijnbreedte</string>
     <string name="use_input_tag" maxLength="41">Typ het antwoord op de kaart</string>
@@ -203,7 +204,6 @@
     <string name="accessibility" maxLength="41">Toegankelijkheid</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Plak klembord afbeeldingen als PNG</string>
-    <string name="paste_as_png_summary">Anki plakt standaard afbeeldingen op het klembord als JPG-bestanden om schijfruimte te besparen. U kunt deze optie gebruiken om in plaats daarvan als PNG-afbeeldingen te plakken.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Druk twee keer op terug om terug te gaan</string>
     <string name="exit_via_double_tap_back_summ">Om te voorkomen dat je per ongeluk de reviewer of de app verlaat.</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-nn/01-core.xml b/AnkiDroid/src/main/res/values-nn/01-core.xml
index 18357308ffaf..4075f1eb8bac 100644
--- a/AnkiDroid/src/main/res/values-nn/01-core.xml
+++ b/AnkiDroid/src/main/res/values-nn/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Tøm</string>
     <string name="create_subdeck">Lag ein underkortleik</string>
     <string name="empty_filtered_deck">Den filtrerte kortstokken tømmes&#8230;</string>
-    <string name="custom_study_deck_name">Tilpasset studiesesjon</string>
-    <string name="custom_study_deck_exists">Gi den eksisterende tilpassede studiestokken nytt navn først</string>
     <string name="search_deck" comment="Deck search for selecting it">Finn kortstokk</string>
     <string name="empty_deck">Denne kortleiken er tom</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Finn kortstokk</string>
diff --git a/AnkiDroid/src/main/res/values-nn/02-strings.xml b/AnkiDroid/src/main/res/values-nn/02-strings.xml
index efba0894f6f3..71e4fa3cf337 100644
--- a/AnkiDroid/src/main/res/values-nn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-nn/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flagg</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limit to particular tags</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="other">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-nn/03-dialogs.xml b/AnkiDroid/src/main/res/values-nn/03-dialogs.xml
index b76a29fb9c73..4ab9a8bd9084 100644
--- a/AnkiDroid/src/main/res/values-nn/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-nn/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead">Review ahead by x days:</string>
     <string name="custom_study_preview">Preview new cards added in the last x days:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Lagring fullt</string>
     <string name="storage_almost_full_title">Lagring nesten full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-nn/10-preferences.xml b/AnkiDroid/src/main/res/values-nn/10-preferences.xml
index 1e9662eee910..75db7a8513e6 100644
--- a/AnkiDroid/src/main/res/values-nn/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-nn/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Avansert</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Utvidelser</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Strektykkelse</string>
     <string name="use_input_tag" maxLength="41">Skriv svaret i kortet</string>
@@ -204,7 +205,6 @@
     <string name="accessibility" maxLength="41">Tilgjengelighet</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-no/01-core.xml b/AnkiDroid/src/main/res/values-no/01-core.xml
index cf02877ca353..5bdcab70be7c 100644
--- a/AnkiDroid/src/main/res/values-no/01-core.xml
+++ b/AnkiDroid/src/main/res/values-no/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Tøm</string>
     <string name="create_subdeck">Lag kortstokk</string>
     <string name="empty_filtered_deck">Den filtrerte kortstokken tømmes&#8230;</string>
-    <string name="custom_study_deck_name">Tilpasset studiesesjon</string>
-    <string name="custom_study_deck_exists">Gi den eksisterende tilpassede studiestokken nytt navn først</string>
     <string name="search_deck" comment="Deck search for selecting it">Finn kortstokk</string>
     <string name="empty_deck">Denne kortstokken er tom</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Finn kortstokk</string>
diff --git a/AnkiDroid/src/main/res/values-no/02-strings.xml b/AnkiDroid/src/main/res/values-no/02-strings.xml
index 6d39e644a05e..b8e0cf2f800f 100644
--- a/AnkiDroid/src/main/res/values-no/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-no/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flags</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limit to particular tags</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="other">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-no/03-dialogs.xml b/AnkiDroid/src/main/res/values-no/03-dialogs.xml
index fdbf195d5646..2e67e01d2e26 100644
--- a/AnkiDroid/src/main/res/values-no/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-no/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead">Review ahead by x days:</string>
     <string name="custom_study_preview">Preview new cards added in the last x days:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Lagring fullt</string>
     <string name="storage_almost_full_title">Lagring nesten full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-no/10-preferences.xml b/AnkiDroid/src/main/res/values-no/10-preferences.xml
index f14ca5be4423..e2cffc310d35 100644
--- a/AnkiDroid/src/main/res/values-no/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-no/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Avansert</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Utvidelser</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Strektykkelse</string>
     <string name="use_input_tag" maxLength="41">Skriv svaret i kortet</string>
@@ -204,7 +205,6 @@
     <string name="accessibility" maxLength="41">Tilgjengelighet</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-or/01-core.xml b/AnkiDroid/src/main/res/values-or/01-core.xml
index 1fe8b5ec23ff..fb1d078af86c 100644
--- a/AnkiDroid/src/main/res/values-or/01-core.xml
+++ b/AnkiDroid/src/main/res/values-or/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">ଖାଲି</string>
     <string name="create_subdeck">ଉପତାସଖଣ୍ଡ ସୃଷ୍ଟି କରିବା</string>
     <string name="empty_filtered_deck">ଶୋଧିତ ତାସଖଣ୍ଡ ଖାଲି ହଉଛି&#8230;</string>
-    <string name="custom_study_deck_name">କଷ୍ଟମ୍ ଅଧ୍ୟୟନ ଅଧିବେଶନ</string>
-    <string name="custom_study_deck_exists">ପ୍ରଥମେ ଵିଦ୍ୟମାନ କଷ୍ଟମ୍ ଅଧ୍ୟୟନ ତାସଖଣ୍ଡ ର ନାମ ବଦଳାନ୍ତୁ</string>
     <string name="search_deck" comment="Deck search for selecting it">ତାସଖଣ୍ଡ ସନ୍ଧାନ</string>
     <string name="empty_deck">ତାସଖଣ୍ଡଟି ଖାଲି ଅଛି</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">ତାସଖଣ୍ଡ ସନ୍ଧାନ</string>
diff --git a/AnkiDroid/src/main/res/values-or/02-strings.xml b/AnkiDroid/src/main/res/values-or/02-strings.xml
index ecd2fd6cc6bd..1368632cd8ec 100644
--- a/AnkiDroid/src/main/res/values-or/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-or/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">ସିଷ୍ଟମ୍ WebView \'%1$s\' ପତ୍ର କୁ ପ୍ରସ୍ତୁତ କଲାନାହିଁ।\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">ପତାକା</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">ନିର୍ଦ୍ଧିଷ୍ଟ ଟ୍ୟାଗରେ ସୀମିତ ରଖ</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%dଟିଏ ସ୍ଥଗିତ କରାଗଲା</item>
         <item quantity="other">+%dଟି ସ୍ଥଗିତ କରାଗଲା</item>
diff --git a/AnkiDroid/src/main/res/values-or/03-dialogs.xml b/AnkiDroid/src/main/res/values-or/03-dialogs.xml
index 0092d52e97f4..aeec3f4c5c60 100644
--- a/AnkiDroid/src/main/res/values-or/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-or/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">ଗତ x ଦିନରେ ଭୁଲିଯାଇଥିବା ପତ୍ରର ସମୀକ୍ଷା କରନ୍ତୁ:</string>
     <string name="custom_study_ahead">x ଦିନ ପୂର୍ବରୁ ସମୀକ୍ଷା କରନ୍ତୁ:</string>
     <string name="custom_study_preview">ଗତ x ଦିନରେ ଯୋଡ଼ାଯାଇଥିବା ନୂଆ ପତ୍ରଗୁଡ଼ିକର ପୂର୍ଵାଵଲୋକନ କରିବା:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">ଷ୍ଟୋରେଜ୍ ଭର୍ତ୍ତି ହେଲାଣି</string>
     <string name="storage_almost_full_title">ଷ୍ଟୋରେଜ୍ ପ୍ରାୟ ଭର୍ତ୍ତି ହେବାକୁ ବସିଲାଣି</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">ଜାଗା ନାହିଁ</string>
diff --git a/AnkiDroid/src/main/res/values-or/10-preferences.xml b/AnkiDroid/src/main/res/values-or/10-preferences.xml
index 02f477755b8b..c1ace4a21e87 100644
--- a/AnkiDroid/src/main/res/values-or/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-or/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">ଵିକଶିତ</string>
     <string name="pref_cat_workarounds" maxLength="41">କାର୍ଯ୍ୟକ୍ଷେତ୍ର</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">ଷ୍ଟ୍ରୋକ ଓସାର</string>
     <string name="use_input_tag" maxLength="41">ପତ୍ରରେ ଉତ୍ତର ଟାଇପ୍ କରନ୍ତୁ</string>
@@ -203,7 +204,6 @@
     <string name="accessibility" maxLength="41">ଅଭିଗମ୍ୟତା</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">କ୍ଲିପବୋର୍ଡ ପ୍ରତିଛବିଗୁଡ଼ିକୁ PNG ଭାବରେ ଲେପନ</string>
-    <string name="paste_as_png_summary">ଡିଫଲ୍ଟ ଭାବରେ Anki ଡିସ୍କ ସ୍ପେସ୍ ସଞ୍ଚୟ କରିବାକୁ JPG ଫାଇଲ୍ ଭାବରେ କ୍ଲିପବୋର୍ଡରେ ପ୍ରତିଛବିଗୁଡ଼ିକୁ ପେଷ୍ଟ କରେ। ଏହା ପରିବର୍ତ୍ତେ PNG ପ୍ରତିଛବି ଭାବରେ ପେଷ୍ଟ କରିବାକୁ ଆପଣ ଏହି ବିକଳ୍ପକୁ ବ୍ୟବହାର କରିପାରିବେ।</string>
     <string name="exit_via_double_tap_back" maxLength="41">ଫେରିବା/ପ୍ରସ୍ଥାନ କରିବାକୁ ଦୁଇଥର ବ୍ୟାକ୍ ଦବାଅ</string>
     <string name="exit_via_double_tap_back_summ">ହଠାତ୍ ସମୀକ୍ଷକ କିମ୍ୱା ଆପ୍ ଛାଡ଼ିବା ଏଡ଼ାଇବାକୁ</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-pa/01-core.xml b/AnkiDroid/src/main/res/values-pa/01-core.xml
index 85bc7c295fd3..35e83fd2f1c8 100644
--- a/AnkiDroid/src/main/res/values-pa/01-core.xml
+++ b/AnkiDroid/src/main/res/values-pa/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">ਖਾਲੀ</string>
     <string name="create_subdeck">ਇੱਕ ਸਬਡੇਕ ਬਣਾਓ</string>
     <string name="empty_filtered_deck">ਫਿਲਟਰ ਕੀਤੇ ਡੈੱਕ ਨੂੰ ਖਾਲੀ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ&#8230;</string>
-    <string name="custom_study_deck_name">ਕਸਟਮ ਸਟੱਡੀ ਸੈਸ਼ਨ</string>
-    <string name="custom_study_deck_exists">ਪਹਿਲਾਂ ਮੌਜੂਦਾ ਕਸਟਮ ਸਟੱਡੀ ਡੇਕ ਦਾ ਨਾਮ ਬਦਲੋ</string>
     <string name="search_deck" comment="Deck search for selecting it">ਡੇਕ ਖੋਜ</string>
     <string name="empty_deck">ਇਹ ਡੇਕ ਖਾਲੀ ਹੈ</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">ਡੇਕ ਖੋਜ</string>
diff --git a/AnkiDroid/src/main/res/values-pa/02-strings.xml b/AnkiDroid/src/main/res/values-pa/02-strings.xml
index 92a0eab202b7..3072c87d5673 100644
--- a/AnkiDroid/src/main/res/values-pa/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-pa/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flags</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limit to particular tags</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d ਦਫ਼ਨਾਇਆ ਗਿਆ</item>
         <item quantity="other">+%d ਦਫ਼ਨਾਇਆ ਗਿਆ</item>
diff --git a/AnkiDroid/src/main/res/values-pa/03-dialogs.xml b/AnkiDroid/src/main/res/values-pa/03-dialogs.xml
index ad7666e26d89..77a828181baa 100644
--- a/AnkiDroid/src/main/res/values-pa/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-pa/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">ਅੱਜ ਦੀ ਸਮੀਖਿਆ ਸੀਮਾ ਵਧਾਓ/ਘਟਾਓ (“-3”)</string>
     <string name="custom_study_ahead">x ਦਿਨ ਅੱਗੇ ਦੀ ਸਮੀਖਿਆ ਕਰੋ:</string>
     <string name="custom_study_preview">ਪਿਛਲੇ x ਦਿਨਾਂ ਵਿੱਚ ਸ਼ਾਮਲ ਕੀਤੇ ਗਏ ਨਵੇਂ ਕਾਰਡਾਂ ਦੀ ਸੰਖੇਪ ਜਾਣਕਾਰੀ:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">ਸਟੋਰੇਜ ਭਰੀ ਹੋਈ ਹੈ</string>
     <string name="storage_almost_full_title">ਸਟੋਰੇਜ ਲਗਭਗ ਭਰੀ ਹੋਈ ਹੈ</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">ਕੋਈ ਥਾਂ ਨਹੀਂ</string>
diff --git a/AnkiDroid/src/main/res/values-pa/10-preferences.xml b/AnkiDroid/src/main/res/values-pa/10-preferences.xml
index 0871fcf08f0a..b68438511533 100644
--- a/AnkiDroid/src/main/res/values-pa/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-pa/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">ਉੱਨਤ</string>
     <string name="pref_cat_workarounds" maxLength="41">ਕੰਮਕਾਜ</string>
     <string name="pref_cat_plugins" maxLength="41">ਪਲੱਗਇਨ</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">ਸਟ੍ਰੋਕ ਚੌੜਾਈ</string>
     <string name="use_input_tag" maxLength="41">ਕਾਰਡ ਵਿੱਚ ਜਵਾਬ ਟਾਈਪ ਕਰੋ</string>
@@ -204,7 +205,6 @@
     <string name="accessibility" maxLength="41">ਪਹੁੰਚਯੋਗਤਾ</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">ਕਲਿੱਪਬੋਰਡ ਚਿੱਤਰਾਂ ਨੂੰ PNG ਵਜੋਂ ਪੇਸਟ ਕਰੋ</string>
-    <string name="paste_as_png_summary">ਡਿਫੌਲਟ ਰੂਪ ਵਿੱਚ ਅੰਕੀ ਡਿਸਕ ਸਪੇਸ ਬਚਾਉਣ ਲਈ ਕਲਿੱਪਬੋਰਡ ਉੱਤੇ ਚਿੱਤਰਾਂ ਨੂੰ JPG ਫਾਈਲਾਂ ਦੇ ਰੂਪ ਵਿੱਚ ਪੇਸਟ ਕਰਦਾ ਹੈ। ਤੁਸੀਂ ਇਸ ਦੀ ਬਜਾਏ PNG ਚਿੱਤਰਾਂ ਵਜੋਂ ਪੇਸਟ ਕਰਨ ਲਈ ਇਸ ਵਿਕਲਪ ਦੀ ਵਰਤੋਂ ਕਰ ਸਕਦੇ ਹੋ।</string>
     <string name="exit_via_double_tap_back" maxLength="41">ਵਾਪਸ ਜਾਣ/ਬਾਹਰ ਜਾਣ ਲਈ ਦੋ ਵਾਰ ਵਾਪਸ ਦਬਾਓ</string>
     <string name="exit_via_double_tap_back_summ">ਗਲਤੀ ਨਾਲ ਸਮੀਖਿਅਕ ਜਾਂ ਐਪ ਨੂੰ ਛੱਡਣ ਤੋਂ ਬਚਣ ਲਈ</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-pl/01-core.xml b/AnkiDroid/src/main/res/values-pl/01-core.xml
index dd64f49a51ad..2ff093814a2c 100644
--- a/AnkiDroid/src/main/res/values-pl/01-core.xml
+++ b/AnkiDroid/src/main/res/values-pl/01-core.xml
@@ -129,8 +129,6 @@
     <string name="empty_cram_label" maxLength="28">Wyczyść</string>
     <string name="create_subdeck">Utwórz sub-talie</string>
     <string name="empty_filtered_deck">Opróżnienie filtrowanej talii&#8230;</string>
-    <string name="custom_study_deck_name">Sesja nauki niestandardowej</string>
-    <string name="custom_study_deck_exists">Najpierw zmień nazwę istniejącej talii nauki niestandardowej.</string>
     <string name="search_deck" comment="Deck search for selecting it">Przeszukaj talię</string>
     <string name="empty_deck">Ta talia jest pusta</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Wyszukiwanie talii</string>
diff --git a/AnkiDroid/src/main/res/values-pl/02-strings.xml b/AnkiDroid/src/main/res/values-pl/02-strings.xml
index 574a4863b6fb..d59b4068bf2b 100644
--- a/AnkiDroid/src/main/res/values-pl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-pl/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView nie potrafił wyrenderować karty \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flagi</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Ogranicz do poszczególnych tagów</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d zakopana</item>
         <item quantity="few">+%d zakopane</item>
diff --git a/AnkiDroid/src/main/res/values-pl/03-dialogs.xml b/AnkiDroid/src/main/res/values-pl/03-dialogs.xml
index 52e77114e368..811e759a9f3b 100644
--- a/AnkiDroid/src/main/res/values-pl/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-pl/03-dialogs.xml
@@ -77,6 +77,7 @@
     <string name="custom_study_forgotten">Przejrzyj zapomniane karty z ostatnich x dni:</string>
     <string name="custom_study_ahead">Przejrzyj z wyprzedzeniem x dni:</string>
     <string name="custom_study_preview">Podgląd nowych kart dodanych w ostatnich x dniach:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Pamięć jest pełna</string>
     <string name="storage_almost_full_title">Pamięć jest prawie pełna</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">Brak miejsca</string>
diff --git a/AnkiDroid/src/main/res/values-pl/10-preferences.xml b/AnkiDroid/src/main/res/values-pl/10-preferences.xml
index 0bc2cb186686..c6774d80644b 100644
--- a/AnkiDroid/src/main/res/values-pl/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-pl/10-preferences.xml
@@ -70,6 +70,7 @@
     <string name="pref_cat_advanced" maxLength="41">Zaawansowane</string>
     <string name="pref_cat_workarounds" maxLength="41">Obejścia</string>
     <string name="pref_cat_plugins" maxLength="41">Pluginy</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Szerokość kreski</string>
     <string name="use_input_tag" maxLength="41">Wprowadź odpowiedź do karty</string>
@@ -207,7 +208,6 @@
     <string name="accessibility" maxLength="41">Ułatwienia dostępu</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Wklej zdjęcia ze schowka jako PNG</string>
-    <string name="paste_as_png_summary">Domyślnie by oszczędzać miejsce na dysku Anki wkleja obrazy ze schowka w formacie JPG. Możesz użyć tej opcji by zamiast tego używać formatu PNG</string>
     <string name="exit_via_double_tap_back" maxLength="41">Kliknij dwa razy \"wstecz\" by wrócić/wyjść</string>
     <string name="exit_via_double_tap_back_summ">Aby uniknąć przypadkowego opuszczenia aplikacji lub ekranu powtórek</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-pt-rBR/01-core.xml b/AnkiDroid/src/main/res/values-pt-rBR/01-core.xml
index 2e87028cd98f..d45bc80a0e3b 100644
--- a/AnkiDroid/src/main/res/values-pt-rBR/01-core.xml
+++ b/AnkiDroid/src/main/res/values-pt-rBR/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Esvaziar</string>
     <string name="create_subdeck">Criar sub-baralho</string>
     <string name="empty_filtered_deck">Esvaziando baralho filtrado&#8230;</string>
-    <string name="custom_study_deck_name">Sessão de estudo personalizado</string>
-    <string name="custom_study_deck_exists">Renomeie o baralho de estudo personalizado existente primeiro</string>
     <string name="search_deck" comment="Deck search for selecting it">Pesquisar baralho</string>
     <string name="empty_deck">Este baralho está vazio</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Pesquisar baralho</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml b/AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml
index dbc73538903a..d31ed8285f66 100644
--- a/AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">O System WebView falhou ao renderizar o card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Bandeiras</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limitar a tags específicas</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d oculto</item>
         <item quantity="other">+%d oculto</item>
diff --git a/AnkiDroid/src/main/res/values-pt-rBR/03-dialogs.xml b/AnkiDroid/src/main/res/values-pt-rBR/03-dialogs.xml
index e3683d124dd6..bfeacca96fdb 100644
--- a/AnkiDroid/src/main/res/values-pt-rBR/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-pt-rBR/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Revisar cards esquecidos nos últimos x dias:</string>
     <string name="custom_study_ahead">Adiantar revisão em x dias:</string>
     <string name="custom_study_preview">Visualizar novos cards adicionados nos últimos x dias:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Armazenamento cheio</string>
     <string name="storage_almost_full_title">Armazenamento quase cheio</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">Sem espaço</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rBR/10-preferences.xml b/AnkiDroid/src/main/res/values-pt-rBR/10-preferences.xml
index 96b1a404208d..2ef896681794 100644
--- a/AnkiDroid/src/main/res/values-pt-rBR/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-pt-rBR/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Avançado</string>
     <string name="pref_cat_workarounds" maxLength="41">Soluções alternativas</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Largura do traço</string>
     <string name="use_input_tag" maxLength="41">Digite a resposta no card</string>
@@ -203,7 +204,6 @@
     <string name="accessibility" maxLength="41">Acessibilidade</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Colar imagens como PNG</string>
-    <string name="paste_as_png_summary">Por padrão, o Anki cola imagens na área de transferência como arquivos JPG para economizar espaço em disco. Você pode usar esta opção para colar como imagens PNG.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Duplo toque em voltar para voltar/sair</string>
     <string name="exit_via_double_tap_back_summ">Para evitar saídas acidentais do revisor ou do aplicativo</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-pt-rPT/01-core.xml b/AnkiDroid/src/main/res/values-pt-rPT/01-core.xml
index 221374f6917f..f7341480fec5 100644
--- a/AnkiDroid/src/main/res/values-pt-rPT/01-core.xml
+++ b/AnkiDroid/src/main/res/values-pt-rPT/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Esvaziar</string>
     <string name="create_subdeck">Criar sub-baralho</string>
     <string name="empty_filtered_deck">A esvaziar baralho filtrado&#8230;</string>
-    <string name="custom_study_deck_name">Sessão de estudo personalizado</string>
-    <string name="custom_study_deck_exists">Renomear primeiro o baralho de estudo personalizado existente</string>
     <string name="search_deck" comment="Deck search for selecting it">Pesquisar baralhos</string>
     <string name="empty_deck">Este baralho está vazio</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Pesquisar baralhos</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml b/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml
index 5255705fd3ae..7bfcc20996a1 100644
--- a/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">O \"WebView\" de sistema falhou no processamento da ficha \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Bandeiras</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limitar a etiquetas específicas</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d adiada</item>
         <item quantity="other">+%d adiadas</item>
diff --git a/AnkiDroid/src/main/res/values-pt-rPT/03-dialogs.xml b/AnkiDroid/src/main/res/values-pt-rPT/03-dialogs.xml
index 1dee5c98cba7..9880a2116696 100644
--- a/AnkiDroid/src/main/res/values-pt-rPT/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-pt-rPT/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Rever fichas esquecidas nos últimos x dias:</string>
     <string name="custom_study_ahead">Rever em avanço por x dias:</string>
     <string name="custom_study_preview">Pré-visualizar novas fichas adicionadas nos últimos x dias:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Armazenamento cheio</string>
     <string name="storage_almost_full_title">Armazenamento quase cheio</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">Sem espaço</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rPT/10-preferences.xml b/AnkiDroid/src/main/res/values-pt-rPT/10-preferences.xml
index 54ec232f5283..4174c778e421 100644
--- a/AnkiDroid/src/main/res/values-pt-rPT/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-pt-rPT/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Avançadas</string>
     <string name="pref_cat_workarounds" maxLength="41">Soluções alternativas</string>
     <string name="pref_cat_plugins" maxLength="41">Plug-ins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Espessura do traço</string>
     <string name="use_input_tag" maxLength="41">Escrever a resposta na ficha</string>
@@ -204,7 +205,6 @@
     <string name="accessibility" maxLength="41">Acessibilidade</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Colar imagens da área de transferência como PNG</string>
-    <string name="paste_as_png_summary">Por defeito, o Anki cola as imagens da área de transferência como ficheiros JPG, para poupar espaço de disco. Pode utilizar esta opção para colar as imagens como PNG.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Duplo toque para voltar atrás/sair</string>
     <string name="exit_via_double_tap_back_summ">Para evitar sair do ecrã de revisão, ou da aplicação, acidentalmente</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-ro/01-core.xml b/AnkiDroid/src/main/res/values-ro/01-core.xml
index 5dabc1bb22a5..740370b773e9 100644
--- a/AnkiDroid/src/main/res/values-ro/01-core.xml
+++ b/AnkiDroid/src/main/res/values-ro/01-core.xml
@@ -126,8 +126,6 @@
     <string name="empty_cram_label" maxLength="28">Goleste</string>
     <string name="create_subdeck">Creați sub-pachet</string>
     <string name="empty_filtered_deck">Emptying filtered deck&#8230;</string>
-    <string name="custom_study_deck_name">Sesiune de studiu personalizata</string>
-    <string name="custom_study_deck_exists">Vă rugăm să redenumiţi mai inati pachetul de Studiu Personalizat .</string>
     <string name="search_deck" comment="Deck search for selecting it">Căutare Pachete</string>
     <string name="empty_deck">Acest pachet este gol</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Căutare Pachete</string>
diff --git a/AnkiDroid/src/main/res/values-ro/02-strings.xml b/AnkiDroid/src/main/res/values-ro/02-strings.xml
index 92591a5a3883..6a3f59c65a6a 100644
--- a/AnkiDroid/src/main/res/values-ro/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ro/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flags</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limit to particular tags</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="few">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-ro/03-dialogs.xml b/AnkiDroid/src/main/res/values-ro/03-dialogs.xml
index e4dd3b8596c2..77ffcccaebbe 100644
--- a/AnkiDroid/src/main/res/values-ro/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ro/03-dialogs.xml
@@ -75,6 +75,7 @@
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead">Review ahead by x days:</string>
     <string name="custom_study_preview">Preview new cards added in the last x days:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Storage full</string>
     <string name="storage_almost_full_title">Storage almost full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-ro/10-preferences.xml b/AnkiDroid/src/main/res/values-ro/10-preferences.xml
index ecdd4c451ecd..ad43dc8823a3 100644
--- a/AnkiDroid/src/main/res/values-ro/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ro/10-preferences.xml
@@ -69,6 +69,7 @@
     <string name="pref_cat_advanced" maxLength="41">Avansat</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
     <string name="use_input_tag" maxLength="41">Type answer into the card</string>
@@ -206,7 +207,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-ru/01-core.xml b/AnkiDroid/src/main/res/values-ru/01-core.xml
index fcb90ea7f09e..bf10d85362d5 100644
--- a/AnkiDroid/src/main/res/values-ru/01-core.xml
+++ b/AnkiDroid/src/main/res/values-ru/01-core.xml
@@ -129,8 +129,6 @@
     <string name="empty_cram_label" maxLength="28">Очистить</string>
     <string name="create_subdeck">Создать подколоду</string>
     <string name="empty_filtered_deck">Фильтрованная колода очищается&#8230;</string>
-    <string name="custom_study_deck_name">Допзанятие</string>
-    <string name="custom_study_deck_exists">Сначала переименуйте существующую дополнительную колоду</string>
     <string name="search_deck" comment="Deck search for selecting it">Поиск колод</string>
     <string name="empty_deck">Эта колода пуста</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Поиск колоды</string>
diff --git a/AnkiDroid/src/main/res/values-ru/02-strings.xml b/AnkiDroid/src/main/res/values-ru/02-strings.xml
index dc0afc2cc443..b0635238f8c1 100644
--- a/AnkiDroid/src/main/res/values-ru/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ru/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">Системному WebView не удалось отрисовать карточку «%1$s».\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Флажки</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Отфильтровать по меткам</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d отложен</item>
         <item quantity="few">+%d отложено</item>
diff --git a/AnkiDroid/src/main/res/values-ru/03-dialogs.xml b/AnkiDroid/src/main/res/values-ru/03-dialogs.xml
index 739f41392b1e..6ba84e671da5 100644
--- a/AnkiDroid/src/main/res/values-ru/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ru/03-dialogs.xml
@@ -77,6 +77,7 @@
     <string name="custom_study_forgotten">Забытые за сколько дней повторить:</string>
     <string name="custom_study_ahead">На сколько дней опередить повторение:</string>
     <string name="custom_study_preview">Посмотреть новые за сколько дней:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Хранилище заполнено</string>
     <string name="storage_almost_full_title">Хранилище почти заполнено</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">Нет места</string>
diff --git a/AnkiDroid/src/main/res/values-ru/10-preferences.xml b/AnkiDroid/src/main/res/values-ru/10-preferences.xml
index 083bf30fc881..c0e4b8ccdfe8 100644
--- a/AnkiDroid/src/main/res/values-ru/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ru/10-preferences.xml
@@ -70,6 +70,7 @@
     <string name="pref_cat_advanced" maxLength="41">Расширенные</string>
     <string name="pref_cat_workarounds" maxLength="41">Костыли и велосипеды</string>
     <string name="pref_cat_plugins" maxLength="41">Плагины</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Толщина линии</string>
     <string name="use_input_tag" maxLength="41">Ввод ответа на карточке</string>
@@ -207,7 +208,6 @@
     <string name="accessibility" maxLength="41">Специальные возможности</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Вставлять изображения буфера как PNG</string>
-    <string name="paste_as_png_summary">По умолчанию Anki вставляет изображения в формате JPG, чтобы сэкономить место. Эта настройка заменяет JPG на PNG.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Нажмите «Назад» дважды, чтобы выйти</string>
     <string name="exit_via_double_tap_back_summ">Предотвращает случайный выход</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-sat/01-core.xml b/AnkiDroid/src/main/res/values-sat/01-core.xml
index 8431af58b448..934dbc4c9159 100644
--- a/AnkiDroid/src/main/res/values-sat/01-core.xml
+++ b/AnkiDroid/src/main/res/values-sat/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">ᱵᱟ.ᱱᱩᱜᱼᱟ</string>
     <string name="create_subdeck">ᱥᱚᱵᱰᱮᱠ ᱛᱮᱭᱟᱨ ᱢᱮ</string>
     <string name="empty_filtered_deck">ᱯᱷᱤᱞᱴᱚᱨ ᱰᱮᱠ ᱠᱷᱟᱹᱞᱤᱜ ᱠᱟᱱᱟ&#8230;</string>
-    <string name="custom_study_deck_name">ᱱᱤᱡᱮᱛᱮ ᱯᱟᱲᱦᱟᱣᱜ ᱥᱚᱢᱚᱭ ᱛᱮᱭᱟᱨ ᱢᱮ</string>
-    <string name="custom_study_deck_exists">ᱢᱟᱲᱟᱝ ᱠᱷᱚᱱ ᱢᱮᱱᱟᱜ ᱱᱤᱡᱮᱛᱮ ᱯᱟᱲᱦᱟᱣ ᱰᱮᱠ ᱟᱜ ᱧᱩᱛᱩᱢ ᱵᱚᱫᱚᱞ ᱢᱮ</string>
     <string name="search_deck" comment="Deck search for selecting it">ᱰᱮᱠ ᱥᱮᱸᱫᱽᱨᱟ</string>
     <string name="empty_deck">ᱱᱚᱶᱟ ᱰᱮᱠ ᱫᱚ ᱠᱷᱟᱹᱞᱤ ᱜᱮᱭᱟ</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">ᱰᱮᱠ ᱥᱮᱸᱫᱽᱨᱟ</string>
diff --git a/AnkiDroid/src/main/res/values-sat/02-strings.xml b/AnkiDroid/src/main/res/values-sat/02-strings.xml
index c279b10c0fa5..75d272c5b3c8 100644
--- a/AnkiDroid/src/main/res/values-sat/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sat/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">ᱥᱤᱥᱴᱚᱢ WebView ᱠᱟᱨᱰ ᱨᱮᱱᱰᱚᱨᱤᱝ ᱡᱚᱠᱷᱟᱜ ᱯᱷᱮᱞ ᱮᱱᱟ \'%1$s\'.\n%2$s</string>
     <string name="filter_by_flags" maxLength="41">ᱯᱚᱛᱠᱟ ᱠᱚ</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">ᱱᱤᱥᱪᱤᱛ ᱴᱮᱜ ᱛᱮ ᱞᱤᱢᱤᱴ ᱢᱮ</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d ᱫᱷᱩᱲᱤ ᱟᱠᱟᱱᱟ</item>
         <item quantity="other">+%d ᱫᱷᱩᱲᱤ ᱟᱠᱟᱱᱟ</item>
diff --git a/AnkiDroid/src/main/res/values-sat/03-dialogs.xml b/AnkiDroid/src/main/res/values-sat/03-dialogs.xml
index 002cb2d475e2..e173d6cc40b0 100644
--- a/AnkiDroid/src/main/res/values-sat/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sat/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">ᱨᱤᱵᱷᱭᱩ ᱠᱟᱰ x ᱫᱤᱱ ᱨᱮ ᱦᱤᱲᱤᱧᱟᱜ ᱠᱚᱺ</string>
     <string name="custom_study_ahead">᱑᱐ ᱫᱤᱱ ᱢᱟᱲᱟᱝ ᱥᱮᱱ ᱨᱤᱵᱷᱤᱣᱺ</string>
     <string name="custom_study_preview">ᱢᱟᱲᱟᱝ xᱫᱤᱱ ᱨᱮ ᱥᱮᱞᱮᱫ ᱠᱟᱱ ᱠᱟᱰ ᱠᱚ preview ᱢᱮ</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">ᱥᱴᱳᱨᱮᱡ ᱯᱩᱨᱤ</string>
     <string name="storage_almost_full_title">ᱥᱴᱳᱨᱮᱡ ᱜᱮ ᱯᱩᱨᱤ</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">ᱡᱟᱭᱜᱟ ᱵᱟᱹᱱᱩᱜ-ᱟ</string>
diff --git a/AnkiDroid/src/main/res/values-sat/10-preferences.xml b/AnkiDroid/src/main/res/values-sat/10-preferences.xml
index 4fe179f6b92d..f7201526d3d7 100644
--- a/AnkiDroid/src/main/res/values-sat/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sat/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">ᱞᱟᱦᱟ ᱦᱚᱪᱚ</string>
     <string name="pref_cat_workarounds" maxLength="41">ᱥᱚᱢᱟᱫᱷᱟᱱ</string>
     <string name="pref_cat_plugins" maxLength="41">ᱠᱷᱚᱸᱡᱟ ᱟᱫᱮᱨ</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">ᱥᱴᱨᱚᱠ ᱨᱮᱭᱟᱜ ᱚᱥᱟᱨ</string>
     <string name="use_input_tag" maxLength="41">ᱠᱟᱰ ᱨᱮ ᱛᱮᱞᱟ ᱚᱞ ᱛᱟᱢ</string>
@@ -203,7 +204,6 @@
     <string name="accessibility" maxLength="41">ᱥᱮᱴᱮᱨᱚᱜ</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">ᱠᱞᱤᱯᱵᱚᱰ ᱪᱤᱛᱟᱹᱨ ᱫᱚ PNG</string>
-    <string name="paste_as_png_summary">ᱰᱤᱯᱷᱚᱞᱴ ᱞᱮᱠᱟᱛᱮ Anki ᱥᱯᱮᱥ ᱟᱨᱡᱟᱣ JPG ᱯᱷᱟᱹᱤᱞ ᱞᱮᱠᱟ ᱠᱞᱤᱯᱵᱚᱰ ᱨᱮ ᱪᱤᱛᱟᱹᱨ ᱠᱚᱭ ᱯᱮᱥᱴᱟᱭ । ᱟᱢ ᱱᱚᱣᱟ ᱚᱯᱥᱚᱱ ᱮᱢ ᱵᱮᱵᱷᱟᱨ ᱫᱟᱲᱮ ᱟᱫ-ᱟ PNG ᱪᱤᱛᱟᱹᱨ ᱯᱮᱥᱴ ᱞᱟᱹᱜᱤᱫ ।</string>
     <string name="exit_via_double_tap_back" maxLength="41">ᱨᱩᱣᱟᱹᱲ/ᱩᱴᱷᱟᱹᱣᱜ ᱞᱟᱹᱜᱤᱫ ᱵᱟᱨ ᱫᱷᱟᱣ ᱚᱛᱟᱭ ᱢᱮ</string>
     <string name="exit_via_double_tap_back_summ">ᱦᱩᱯᱠᱟᱹ  ᱧᱮᱧᱮᱞᱤᱭᱟᱹ ᱟᱨ ᱟᱯᱞᱤᱠᱮᱥᱚᱱ ᱥᱟᱦᱟ ᱞᱟᱹᱜᱤᱫ</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-sc/01-core.xml b/AnkiDroid/src/main/res/values-sc/01-core.xml
index d636cd873728..b699adbc3648 100644
--- a/AnkiDroid/src/main/res/values-sc/01-core.xml
+++ b/AnkiDroid/src/main/res/values-sc/01-core.xml
@@ -125,8 +125,6 @@
     <string name="empty_cram_label" maxLength="28">Isbòida</string>
     <string name="create_subdeck">Crea unu suta-matzu</string>
     <string name="empty_filtered_deck">Isboidende su matzu filtradu&#8230;</string>
-    <string name="custom_study_deck_name">Sessione de istùdiu personalizada</string>
-    <string name="custom_study_deck_exists">In antis càmbia su nùmene a su matzu de istùdiu personalizadu chi esistit</string>
     <string name="search_deck" comment="Deck search for selecting it">Chirca de matzos</string>
     <string name="empty_deck">Custu matzu est bòidu</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Chirca de matzos</string>
diff --git a/AnkiDroid/src/main/res/values-sc/02-strings.xml b/AnkiDroid/src/main/res/values-sc/02-strings.xml
index 9fba136f1daf..4a4076240a93 100644
--- a/AnkiDroid/src/main/res/values-sc/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sc/02-strings.xml
@@ -83,7 +83,8 @@
    %2$s</string>
     <string name="filter_by_flags" maxLength="41">Banderas</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Lìmita a etichetas particulares</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d interrada</item>
         <item quantity="other">+%d interradas</item>
diff --git a/AnkiDroid/src/main/res/values-sc/03-dialogs.xml b/AnkiDroid/src/main/res/values-sc/03-dialogs.xml
index 6fcb493d0cfc..bea7d7cf508c 100644
--- a/AnkiDroid/src/main/res/values-sc/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sc/03-dialogs.xml
@@ -78,6 +78,7 @@
     <string name="custom_study_forgotten">Revisiona sas cartas ismentigadas in sas ùrtimas x dies:</string>
     <string name="custom_study_ahead">Revisiona in antìtzipu de x dies:</string>
     <string name="custom_study_preview">Ammustra s\'antiprima de sas cartas noas annànghidas in sas ùrtimas x dies:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Memòria prena</string>
     <string name="storage_almost_full_title">Memòria belle prena</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">Non b\'at ispàtziu</string>
diff --git a/AnkiDroid/src/main/res/values-sc/10-preferences.xml b/AnkiDroid/src/main/res/values-sc/10-preferences.xml
index c14f816604b0..f69a46f43ba3 100644
--- a/AnkiDroid/src/main/res/values-sc/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sc/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Avantzadas</string>
     <string name="pref_cat_workarounds" maxLength="41">Solutziones alternativas</string>
     <string name="pref_cat_plugins" maxLength="41">Estensiones</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Grussària de su tratu</string>
     <string name="use_input_tag" maxLength="41">Iscrie sa risposta in sa carta</string>
@@ -203,7 +204,6 @@
     <string name="accessibility" maxLength="41">Atzessibilidade</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Incolla sas immàgines in PNG</string>
-    <string name="paste_as_png_summary">Comente impostatzione predefinida Anki incollat sas immàgines in punta de billete in formadu JPG pro savare logu in sa memòria. Pro incollare sas immàgines in formadu PNG podes, imbetzes, impreare custa optzione.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Incarca 2 bortas in segus pro essire</string>
     <string name="exit_via_double_tap_back_summ">Pro evitare de essire in manera atzidentale dae su revisionadore o dae s\'aplicatzione</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-sk/01-core.xml b/AnkiDroid/src/main/res/values-sk/01-core.xml
index 929364582828..797f60901ec7 100644
--- a/AnkiDroid/src/main/res/values-sk/01-core.xml
+++ b/AnkiDroid/src/main/res/values-sk/01-core.xml
@@ -129,8 +129,6 @@
     <string name="empty_cram_label" maxLength="28">Vyprázdniť</string>
     <string name="create_subdeck">Vytvoriť podbalíček</string>
     <string name="empty_filtered_deck">Vyprázdňujem filtrovaný balíček&#8230;</string>
-    <string name="custom_study_deck_name">Vlastné štúdium</string>
-    <string name="custom_study_deck_exists">Prosím premenujte najprv existujúci balíček Vlastné štúdium.</string>
     <string name="search_deck" comment="Deck search for selecting it">Vyhľadávanie v balíčku</string>
     <string name="empty_deck">Tento balíček je prázdny</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Vyhľadávanie v balíčku</string>
diff --git a/AnkiDroid/src/main/res/values-sk/02-strings.xml b/AnkiDroid/src/main/res/values-sk/02-strings.xml
index 293336a41d17..45ba852b4cd1 100644
--- a/AnkiDroid/src/main/res/values-sk/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sk/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">Zobrazenie kartičky systémom WebView zlyhalo \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Vlajky</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Obmedziť na určité štítky</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="few">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-sk/03-dialogs.xml b/AnkiDroid/src/main/res/values-sk/03-dialogs.xml
index d31786717bd8..0665c088dda9 100644
--- a/AnkiDroid/src/main/res/values-sk/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sk/03-dialogs.xml
@@ -77,6 +77,7 @@
     <string name="custom_study_forgotten">Zopakovať si kartičky zabudnuté za posledných x dní:</string>
     <string name="custom_study_ahead">Opakovať dopredu o x dní:</string>
     <string name="custom_study_preview">Ukážka nových kartičiek pridaných za posledných x dní:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Úložisko je plné</string>
     <string name="storage_almost_full_title">Úložisko je takmer plné</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">Nedostatok miesta</string>
diff --git a/AnkiDroid/src/main/res/values-sk/10-preferences.xml b/AnkiDroid/src/main/res/values-sk/10-preferences.xml
index 2d586f1858ee..7115061d6573 100644
--- a/AnkiDroid/src/main/res/values-sk/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sk/10-preferences.xml
@@ -70,6 +70,7 @@
     <string name="pref_cat_advanced" maxLength="41">Pokročilé</string>
     <string name="pref_cat_workarounds" maxLength="41">Možné riešenia</string>
     <string name="pref_cat_plugins" maxLength="41">Rozšírenia</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Hrúbka ťahu</string>
     <string name="use_input_tag" maxLength="41">Napíšte odpoveď do kartičky</string>
@@ -208,7 +209,6 @@
     <string name="accessibility" maxLength="41">Veľkosť rozhrania</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Prilepiť obrázky zo schránky ako PNG</string>
-    <string name="paste_as_png_summary">Východiskové nastavenie Anki ukladá obrázky do schránky ako JPG súbory aby sa ušetril ukladací priestor. Môžete použiť túto možnosť a ukladať obrázky ako PNG.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Pre ukončenie stlačte späť ešte raz</string>
     <string name="exit_via_double_tap_back_summ">Vyhnúť sa nechcenému opusteniu opakovania alebo ukončeniu aplikácie</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-sl/01-core.xml b/AnkiDroid/src/main/res/values-sl/01-core.xml
index 360706145a1a..f7d76fc9427f 100644
--- a/AnkiDroid/src/main/res/values-sl/01-core.xml
+++ b/AnkiDroid/src/main/res/values-sl/01-core.xml
@@ -129,8 +129,6 @@
     <string name="empty_cram_label" maxLength="28">Prazen</string>
     <string name="create_subdeck">Create subdeck</string>
     <string name="empty_filtered_deck">Emptying filtered deck&#8230;</string>
-    <string name="custom_study_deck_name">Seja učenja po meri</string>
-    <string name="custom_study_deck_exists">Najprej preimenujte obstoječi komplet za učenje po meri.</string>
     <string name="search_deck" comment="Deck search for selecting it">Deck Search</string>
     <string name="empty_deck">Ta komplet je prazen</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Deck Search</string>
diff --git a/AnkiDroid/src/main/res/values-sl/02-strings.xml b/AnkiDroid/src/main/res/values-sl/02-strings.xml
index 25f2b99f843d..24fb37cbae39 100644
--- a/AnkiDroid/src/main/res/values-sl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sl/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Oznaka</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Omeji na določene oznake</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="two">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-sl/03-dialogs.xml b/AnkiDroid/src/main/res/values-sl/03-dialogs.xml
index bb73164f8080..7c9c33dca8d7 100644
--- a/AnkiDroid/src/main/res/values-sl/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sl/03-dialogs.xml
@@ -77,6 +77,7 @@
     <string name="custom_study_forgotten">Preglej kartice, ki so bile v zadnjih x-ih dneh pozabljene:</string>
     <string name="custom_study_ahead">Preglej vnaprej za x dni:</string>
     <string name="custom_study_preview">Preglej nove kartice dodane v zadnjih x-ih dneh:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Storage full</string>
     <string name="storage_almost_full_title">Storage almost full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-sl/10-preferences.xml b/AnkiDroid/src/main/res/values-sl/10-preferences.xml
index e8ff108fb2ab..c4e9476ae1cc 100644
--- a/AnkiDroid/src/main/res/values-sl/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sl/10-preferences.xml
@@ -70,6 +70,7 @@
     <string name="pref_cat_advanced" maxLength="41">Napredno</string>
     <string name="pref_cat_workarounds" maxLength="41">Zaobidenja</string>
     <string name="pref_cat_plugins" maxLength="41">Vstavki</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Debelina črte</string>
     <string name="use_input_tag" maxLength="41">Vtipkaj odgovor v kartico</string>
@@ -208,7 +209,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-sq/01-core.xml b/AnkiDroid/src/main/res/values-sq/01-core.xml
index cf4b51e526e7..fe4ebaa1df46 100644
--- a/AnkiDroid/src/main/res/values-sq/01-core.xml
+++ b/AnkiDroid/src/main/res/values-sq/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Bosh</string>
     <string name="create_subdeck">Krijoni nëndeck</string>
     <string name="empty_filtered_deck">Po zbrazni kuvertën e filtruar&#8230;</string>
-    <string name="custom_study_deck_name">Sesion studimi me porosi</string>
-    <string name="custom_study_deck_exists">Riemërtoni fillimisht kuvertën ekzistuese të studimit të personalizuar</string>
     <string name="search_deck" comment="Deck search for selecting it">Kërkimi i kuvertës</string>
     <string name="empty_deck">Kjo kuvertë është bosh</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Kërkimi i kuvertës</string>
diff --git a/AnkiDroid/src/main/res/values-sq/02-strings.xml b/AnkiDroid/src/main/res/values-sq/02-strings.xml
index db7381d4d795..029f25f457bb 100644
--- a/AnkiDroid/src/main/res/values-sq/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sq/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">Sistemi WebView dështoi në paraqitjen e kartës \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flags</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limit to particular tags</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="other">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-sq/03-dialogs.xml b/AnkiDroid/src/main/res/values-sq/03-dialogs.xml
index 0b994843e1bb..bd50833fc617 100644
--- a/AnkiDroid/src/main/res/values-sq/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sq/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Rishikoni kartat e harruara në x ditët e fundit:</string>
     <string name="custom_study_ahead">Rishikoni përpara për x ditë:</string>
     <string name="custom_study_preview">Shikoni paraprakisht kartat e reja të shtuara në x ditët e fundit:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Magazinimi plot</string>
     <string name="storage_almost_full_title">Magazinimi pothuajse i mbushur</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">Nuk ka hapësirë</string>
diff --git a/AnkiDroid/src/main/res/values-sq/10-preferences.xml b/AnkiDroid/src/main/res/values-sq/10-preferences.xml
index 685d62aa4d39..8d49177684a2 100644
--- a/AnkiDroid/src/main/res/values-sq/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sq/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Advanced</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
     <string name="use_input_tag" maxLength="41">Type answer into the card</string>
@@ -204,7 +205,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-sr/01-core.xml b/AnkiDroid/src/main/res/values-sr/01-core.xml
index 9dc003997a01..a7c825fd254e 100644
--- a/AnkiDroid/src/main/res/values-sr/01-core.xml
+++ b/AnkiDroid/src/main/res/values-sr/01-core.xml
@@ -126,8 +126,6 @@
     <string name="empty_cram_label" maxLength="28">Очисти</string>
     <string name="create_subdeck">Create subdeck</string>
     <string name="empty_filtered_deck">Emptying filtered deck&#8230;</string>
-    <string name="custom_study_deck_name">Посебна сесија проучавања</string>
-    <string name="custom_study_deck_exists">Прво преименујте постојеће специјалне шпилове.</string>
     <string name="search_deck" comment="Deck search for selecting it">Deck Search</string>
     <string name="empty_deck">Овај шпил је празан</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Deck Search</string>
diff --git a/AnkiDroid/src/main/res/values-sr/02-strings.xml b/AnkiDroid/src/main/res/values-sr/02-strings.xml
index ff220d215e38..c39fa441dc0e 100644
--- a/AnkiDroid/src/main/res/values-sr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sr/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flags</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Постави ограничење по ознакама</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="few">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-sr/03-dialogs.xml b/AnkiDroid/src/main/res/values-sr/03-dialogs.xml
index fa7c748858c6..ee93f2ee4460 100644
--- a/AnkiDroid/src/main/res/values-sr/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sr/03-dialogs.xml
@@ -75,6 +75,7 @@
     <string name="custom_study_forgotten">Понови заборављено за последњих х дана:</string>
     <string name="custom_study_ahead">Прегледај унапред за х дана:</string>
     <string name="custom_study_preview">Нове картице, додате за последњих х дана:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Storage full</string>
     <string name="storage_almost_full_title">Storage almost full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-sr/10-preferences.xml b/AnkiDroid/src/main/res/values-sr/10-preferences.xml
index 8b279ece25cf..dc4e2ea5b0ad 100644
--- a/AnkiDroid/src/main/res/values-sr/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sr/10-preferences.xml
@@ -69,6 +69,7 @@
     <string name="pref_cat_advanced" maxLength="41">Напредно</string>
     <string name="pref_cat_workarounds" maxLength="41">Трикови</string>
     <string name="pref_cat_plugins" maxLength="41">Додаци</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Ширина капи</string>
     <string name="use_input_tag" maxLength="41">Type answer into the card</string>
@@ -206,7 +207,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-ss/01-core.xml b/AnkiDroid/src/main/res/values-ss/01-core.xml
index 1db2f2a10b0e..110c4db2fc79 100644
--- a/AnkiDroid/src/main/res/values-ss/01-core.xml
+++ b/AnkiDroid/src/main/res/values-ss/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Empty</string>
     <string name="create_subdeck">Create subdeck</string>
     <string name="empty_filtered_deck">Emptying filtered deck&#8230;</string>
-    <string name="custom_study_deck_name">Custom study session</string>
-    <string name="custom_study_deck_exists">Rename the existing custom study deck first</string>
     <string name="search_deck" comment="Deck search for selecting it">Deck Search</string>
     <string name="empty_deck">This deck is empty</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Deck Search</string>
diff --git a/AnkiDroid/src/main/res/values-ss/02-strings.xml b/AnkiDroid/src/main/res/values-ss/02-strings.xml
index 509505f66399..5e4fab69ad3c 100644
--- a/AnkiDroid/src/main/res/values-ss/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ss/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flags</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limit to particular tags</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="other">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-ss/03-dialogs.xml b/AnkiDroid/src/main/res/values-ss/03-dialogs.xml
index db01ccc584a3..c85228a8acd8 100644
--- a/AnkiDroid/src/main/res/values-ss/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ss/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead">Review ahead by x days:</string>
     <string name="custom_study_preview">Preview new cards added in the last x days:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Storage full</string>
     <string name="storage_almost_full_title">Storage almost full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-ss/10-preferences.xml b/AnkiDroid/src/main/res/values-ss/10-preferences.xml
index 685d62aa4d39..8d49177684a2 100644
--- a/AnkiDroid/src/main/res/values-ss/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ss/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Advanced</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
     <string name="use_input_tag" maxLength="41">Type answer into the card</string>
@@ -204,7 +205,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-sv/01-core.xml b/AnkiDroid/src/main/res/values-sv/01-core.xml
index 6c7759af4b22..a384baa7b1c3 100644
--- a/AnkiDroid/src/main/res/values-sv/01-core.xml
+++ b/AnkiDroid/src/main/res/values-sv/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Töm</string>
     <string name="create_subdeck">Skapa underkortlek</string>
     <string name="empty_filtered_deck">Tömmer filtrerad kortlek&#8230;</string>
-    <string name="custom_study_deck_name">Anpassad studiesession</string>
-    <string name="custom_study_deck_exists">Var god döp om den existerande anpassade studiekortleken först.</string>
     <string name="search_deck" comment="Deck search for selecting it">Kortlekssökning</string>
     <string name="empty_deck">Den här kortleken är tom</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Kortlekssökning</string>
diff --git a/AnkiDroid/src/main/res/values-sv/02-strings.xml b/AnkiDroid/src/main/res/values-sv/02-strings.xml
index 4cf63da0d96d..912172f05bc6 100644
--- a/AnkiDroid/src/main/res/values-sv/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sv/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">WebViewern kunde inte hämta kortet \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flaggor</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Begränsa till vissa etiketter</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="other">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-sv/03-dialogs.xml b/AnkiDroid/src/main/res/values-sv/03-dialogs.xml
index 58f3b0645f6f..90b2a29c9629 100644
--- a/AnkiDroid/src/main/res/values-sv/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sv/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Repetera kort som är glömda under de senaste x dagarna:</string>
     <string name="custom_study_ahead">Repetera i förväg för x dagar:</string>
     <string name="custom_study_preview">Förhandsgranska nya kort som lagts till de senaste x dagarna:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Lagring full</string>
     <string name="storage_almost_full_title">Lagring nästan full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">Inget utrymme</string>
diff --git a/AnkiDroid/src/main/res/values-sv/10-preferences.xml b/AnkiDroid/src/main/res/values-sv/10-preferences.xml
index da3634ecc729..4157b6f29f87 100644
--- a/AnkiDroid/src/main/res/values-sv/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sv/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Avancerat</string>
     <string name="pref_cat_workarounds" maxLength="41">Specialfunktioner</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Streckbredd</string>
     <string name="use_input_tag" maxLength="41">Skriv svar i kortet</string>
@@ -203,7 +204,6 @@
     <string name="accessibility" maxLength="41">Tillgänglighet</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Klistra in urklipps bilder som PNG</string>
-    <string name="paste_as_png_summary">Som standard klistrar Anki in bilder från urklipp som JPG-filer för att spara diskutrymme. Du kan använda den här inställningen för att klistra in bilder som PNG-filer istället.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Tryck bakåt 2 ggr för att gå bakåt/sluta</string>
     <string name="exit_via_double_tap_back_summ">För att undvika att av misstag lämna granskaren eller appen</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-sw/01-core.xml b/AnkiDroid/src/main/res/values-sw/01-core.xml
index 1db2f2a10b0e..110c4db2fc79 100644
--- a/AnkiDroid/src/main/res/values-sw/01-core.xml
+++ b/AnkiDroid/src/main/res/values-sw/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Empty</string>
     <string name="create_subdeck">Create subdeck</string>
     <string name="empty_filtered_deck">Emptying filtered deck&#8230;</string>
-    <string name="custom_study_deck_name">Custom study session</string>
-    <string name="custom_study_deck_exists">Rename the existing custom study deck first</string>
     <string name="search_deck" comment="Deck search for selecting it">Deck Search</string>
     <string name="empty_deck">This deck is empty</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Deck Search</string>
diff --git a/AnkiDroid/src/main/res/values-sw/02-strings.xml b/AnkiDroid/src/main/res/values-sw/02-strings.xml
index 509505f66399..5e4fab69ad3c 100644
--- a/AnkiDroid/src/main/res/values-sw/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sw/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flags</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limit to particular tags</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="other">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-sw/03-dialogs.xml b/AnkiDroid/src/main/res/values-sw/03-dialogs.xml
index db01ccc584a3..c85228a8acd8 100644
--- a/AnkiDroid/src/main/res/values-sw/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-sw/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead">Review ahead by x days:</string>
     <string name="custom_study_preview">Preview new cards added in the last x days:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Storage full</string>
     <string name="storage_almost_full_title">Storage almost full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-sw/10-preferences.xml b/AnkiDroid/src/main/res/values-sw/10-preferences.xml
index 685d62aa4d39..8d49177684a2 100644
--- a/AnkiDroid/src/main/res/values-sw/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sw/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Advanced</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
     <string name="use_input_tag" maxLength="41">Type answer into the card</string>
@@ -204,7 +205,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-ta/01-core.xml b/AnkiDroid/src/main/res/values-ta/01-core.xml
index 6cd20ea59667..84718e8b3fcb 100644
--- a/AnkiDroid/src/main/res/values-ta/01-core.xml
+++ b/AnkiDroid/src/main/res/values-ta/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">காலி</string>
     <string name="create_subdeck">துணைத் தளத்தை உருவாக்கவும்</string>
     <string name="empty_filtered_deck">வடிகட்டிய தளத்தைக் காலி செய்கிறது&#8230;</string>
-    <string name="custom_study_deck_name">தனிப்பயன் ஆய்வு கூட்டம்</string>
-    <string name="custom_study_deck_exists">தற்போதுள்ள விருப்ப ஆய்வு கட்டு முதலில் மறுபெயரிடு</string>
     <string name="search_deck" comment="Deck search for selecting it">டெக் தேடல்</string>
     <string name="empty_deck">இந்த கட்டு காலியாக உள்ளது</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">டெக் தேடல்</string>
diff --git a/AnkiDroid/src/main/res/values-ta/02-strings.xml b/AnkiDroid/src/main/res/values-ta/02-strings.xml
index d200c96aed65..b5aa0fa2f03c 100644
--- a/AnkiDroid/src/main/res/values-ta/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ta/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">சிஸ்டம் வெப்வியூ கார்டை \'%1$s\' ரெண்டர் செய்வதில் தோல்வியடைந்தது.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">கொடிகள்</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">குறிப்பிட்ட குறிச்சொற்களுக்கு வரம்பு</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d புதைக்கப்பட்டது</item>
         <item quantity="other">+%d புதைக்கப்பட்டது</item>
diff --git a/AnkiDroid/src/main/res/values-ta/03-dialogs.xml b/AnkiDroid/src/main/res/values-ta/03-dialogs.xml
index eac6f1f0d0ef..eac464d4a3bf 100644
--- a/AnkiDroid/src/main/res/values-ta/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ta/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">கடந்த x நாட்களில் மறக்கப்பட்ட மதிப்பாய்வு அட்டைகள்:</string>
     <string name="custom_study_ahead">x நாட்களுக்குள் மதிப்பாய்வு செய்யவும்:</string>
     <string name="custom_study_preview">கடந்த x நாட்களில் சேர்க்கப்பட்ட புதிய கார்டுகளின் மாதிரிக்காட்சி:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">சேமிப்பு நிரம்பியது</string>
     <string name="storage_almost_full_title">சேமிப்பு கிட்டத்தட்ட நிரம்பிவிட்டது</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">இடமில்லை</string>
diff --git a/AnkiDroid/src/main/res/values-ta/10-preferences.xml b/AnkiDroid/src/main/res/values-ta/10-preferences.xml
index 617bbb61c891..50b735684fd4 100644
--- a/AnkiDroid/src/main/res/values-ta/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ta/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">மேம்பட்டது</string>
     <string name="pref_cat_workarounds" maxLength="41">தீர்வுகள்</string>
     <string name="pref_cat_plugins" maxLength="41">செருகுநிரல்கள்</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">ஸ்ட்ரோக் அகலம்</string>
     <string name="use_input_tag" maxLength="41">அட்டையில் பதிலை உள்ளிடவும்</string>
@@ -203,7 +204,6 @@
     <string name="accessibility" maxLength="41">அணுகல்தன்மை</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">கிளிப்போர்டு படங்களை PNG ஆக ஒட்டவும்</string>
-    <string name="paste_as_png_summary">டிஸ்க் இடத்தைச் சேமிப்பதற்காக அங்கி இயல்பாகக் கிளிப்போர்டில் படங்களை JPG கோப்புகளாக ஒட்டுகிறது. அதற்குப் பதிலாக PNG படங்களாக ஒட்டுவதற்கு இந்த விருப்பத்தைப் பயன்படுத்தலாம்.</string>
     <string name="exit_via_double_tap_back" maxLength="41">திரும்பிச் செல்ல/வெளியேற மீண்டும் இருமுறை அழுத்தவும்</string>
     <string name="exit_via_double_tap_back_summ">தற்செயலாக மதிப்பாய்வாளர் அல்லது விண்ணப்பத்தை விட்டு வெளியேறுவதைத் தவிர்க்க</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-te/01-core.xml b/AnkiDroid/src/main/res/values-te/01-core.xml
index b0498eb6ad68..4042e7525337 100644
--- a/AnkiDroid/src/main/res/values-te/01-core.xml
+++ b/AnkiDroid/src/main/res/values-te/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">ఖాళీ</string>
     <string name="create_subdeck">సబ్‌డెక్‌ను సృష్టించండి</string>
     <string name="empty_filtered_deck">ఫిల్టర్ చేసిన డెక్‌ను ఖాళీ చేస్తోంది&#8230;</string>
-    <string name="custom_study_deck_name">కస్టమ్ అధ్యయనం సెషన్</string>
-    <string name="custom_study_deck_exists">మొదటి సానుకూల అధ్యయనం డెక్ యొక్క పేరు మార్చండి</string>
     <string name="search_deck" comment="Deck search for selecting it">డెక్ శోధన</string>
     <string name="empty_deck">ఈ డెక్ ఖాళీగా ఉంది</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">డెక్ శోధన</string>
diff --git a/AnkiDroid/src/main/res/values-te/02-strings.xml b/AnkiDroid/src/main/res/values-te/02-strings.xml
index 2c0a1727d606..5ef13b860940 100644
--- a/AnkiDroid/src/main/res/values-te/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-te/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">\'%1$s\' కార్డ్‌ని రెండర్ చేయడంలో సిస్టమ్ WebView విఫలమైంది.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">జెండాలు</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">నిర్దిష్ట ట్యాగ్లకు పరిమితం చేయండి</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d ఖననం చేయబడింది</item>
         <item quantity="other">+%d ఖననం చేయబడింది</item>
diff --git a/AnkiDroid/src/main/res/values-te/03-dialogs.xml b/AnkiDroid/src/main/res/values-te/03-dialogs.xml
index d556f1cfa6ba..154cd5bbd652 100644
--- a/AnkiDroid/src/main/res/values-te/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-te/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">గత x రోజుల్లో రిజిస్టర్డ్ కార్డులను మర్చిపోయారు:</string>
     <string name="custom_study_ahead">X రోజుల ముందుగా సమీక్షించండి:</string>
     <string name="custom_study_preview">గత x రోజులలో జోడించిన కొత్త కార్డులను ప్రివ్యూ చేయండి:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">నిల్వ నిండింది</string>
     <string name="storage_almost_full_title">నిల్వ దాదాపు నిండింది</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">ఖాళీ లేదు</string>
diff --git a/AnkiDroid/src/main/res/values-te/10-preferences.xml b/AnkiDroid/src/main/res/values-te/10-preferences.xml
index 68f6b9e97056..77c84636187e 100644
--- a/AnkiDroid/src/main/res/values-te/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-te/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">ఉన్నతస్థాయి</string>
     <string name="pref_cat_workarounds" maxLength="41">పరిష్కారాలను</string>
     <string name="pref_cat_plugins" maxLength="41">ప్లగ్ఇన్</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">స్ట్రోక్ వెడల్పు</string>
     <string name="use_input_tag" maxLength="41">కార్డుకు సమాధానం టైప్ చేయండి</string>
@@ -203,7 +204,6 @@
     <string name="accessibility" maxLength="41">సౌలభ్యాన్ని</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">క్లిప్‌బోర్డ్ చిత్రాలను PNGగా అతికించండి</string>
-    <string name="paste_as_png_summary">డిఫాల్ట్‌గా Anki డిస్క్ స్థలాన్ని ఆదా చేయడానికి చిత్రాలను JPG ఫైల్‌లుగా క్లిప్‌బోర్డ్‌కు అతికిస్తుంది. బదులుగా PNG చిత్రాల వలె అతికించడానికి మీరు ఈ ఎంపికను ఉపయోగించవచ్చు.</string>
     <string name="exit_via_double_tap_back" maxLength="41">వెనుకకు వెళ్లడానికి/నిష్క్రమించడానికి రెండుసార్లు వెనుకకు నొక్కండి</string>
     <string name="exit_via_double_tap_back_summ">ప్రమాదవశాత్తూ సమీక్షకుడు లేదా యాప్ నుండి నిష్క్రమించడాన్ని నివారించడానికి</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-tg/01-core.xml b/AnkiDroid/src/main/res/values-tg/01-core.xml
index f40a05931978..a4f9e577046d 100644
--- a/AnkiDroid/src/main/res/values-tg/01-core.xml
+++ b/AnkiDroid/src/main/res/values-tg/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Empty</string>
     <string name="create_subdeck">Create subdeck</string>
     <string name="empty_filtered_deck">Emptying filtered deck&#8230;</string>
-    <string name="custom_study_deck_name">Custom study session</string>
-    <string name="custom_study_deck_exists">Rename the existing custom study deck first</string>
     <string name="search_deck" comment="Deck search for selecting it">Deck Search</string>
     <string name="empty_deck">This deck is empty</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Deck Search</string>
diff --git a/AnkiDroid/src/main/res/values-tg/02-strings.xml b/AnkiDroid/src/main/res/values-tg/02-strings.xml
index 509505f66399..5e4fab69ad3c 100644
--- a/AnkiDroid/src/main/res/values-tg/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tg/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flags</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limit to particular tags</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="other">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-tg/03-dialogs.xml b/AnkiDroid/src/main/res/values-tg/03-dialogs.xml
index a3140a5beb94..55ff0771836e 100644
--- a/AnkiDroid/src/main/res/values-tg/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-tg/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead">Review ahead by x days:</string>
     <string name="custom_study_preview">Preview new cards added in the last x days:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Storage full</string>
     <string name="storage_almost_full_title">Storage almost full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-tg/10-preferences.xml b/AnkiDroid/src/main/res/values-tg/10-preferences.xml
index 685d62aa4d39..8d49177684a2 100644
--- a/AnkiDroid/src/main/res/values-tg/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-tg/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Advanced</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
     <string name="use_input_tag" maxLength="41">Type answer into the card</string>
@@ -204,7 +205,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-tgl/01-core.xml b/AnkiDroid/src/main/res/values-tgl/01-core.xml
index 6b91a4257913..f2b45d8c87f0 100644
--- a/AnkiDroid/src/main/res/values-tgl/01-core.xml
+++ b/AnkiDroid/src/main/res/values-tgl/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Walang laman</string>
     <string name="create_subdeck">Create subdeck</string>
     <string name="empty_filtered_deck">Emptying filtered deck&#8230;</string>
-    <string name="custom_study_deck_name">Pinasadyang sesyon ng pagaaral</string>
-    <string name="custom_study_deck_exists">Palitan muna ang pangalan ng pinasadyang paaaral ng deck</string>
     <string name="search_deck" comment="Deck search for selecting it">Deck Search</string>
     <string name="empty_deck">Walang laman ang deck na ito</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Deck Search</string>
diff --git a/AnkiDroid/src/main/res/values-tgl/02-strings.xml b/AnkiDroid/src/main/res/values-tgl/02-strings.xml
index 29d8d31cbb88..fb3dba00be7b 100644
--- a/AnkiDroid/src/main/res/values-tgl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tgl/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flags</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limitahan sa mga natatanging mga tag</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="other">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-tgl/03-dialogs.xml b/AnkiDroid/src/main/res/values-tgl/03-dialogs.xml
index 4a43116540af..3ffe026f7d60 100644
--- a/AnkiDroid/src/main/res/values-tgl/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-tgl/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Ang mga baraha na sinusuri ay nakalimutan sa huling x na mga araw:</string>
     <string name="custom_study_ahead">Suriin nang maaga sa pamamagitan ng x na mga araw:</string>
     <string name="custom_study_preview">I-prebiyu ang mga bagong baraha na idinagdag sa huling x na mga araw:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Storage full</string>
     <string name="storage_almost_full_title">Storage almost full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-tgl/10-preferences.xml b/AnkiDroid/src/main/res/values-tgl/10-preferences.xml
index 3067be54aaae..697498d1ae70 100644
--- a/AnkiDroid/src/main/res/values-tgl/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-tgl/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Masulong</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Mga Plugin</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Lapad ng stroke</string>
     <string name="use_input_tag" maxLength="41">I-type ang sagot sa card</string>
@@ -204,7 +205,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-th/01-core.xml b/AnkiDroid/src/main/res/values-th/01-core.xml
index b8723ab1ffef..a580aa75b717 100644
--- a/AnkiDroid/src/main/res/values-th/01-core.xml
+++ b/AnkiDroid/src/main/res/values-th/01-core.xml
@@ -120,8 +120,6 @@
     <string name="empty_cram_label" maxLength="28">ล้างสำรับ</string>
     <string name="create_subdeck">สร้างสำรับย่อย</string>
     <string name="empty_filtered_deck">กำลังทำให้สำรับแบบกรองว่าง&#8230;</string>
-    <string name="custom_study_deck_name">Custom study session</string>
-    <string name="custom_study_deck_exists">Rename the existing custom study deck first</string>
     <string name="search_deck" comment="Deck search for selecting it">ค้นหาสำรับ</string>
     <string name="empty_deck">สำรับนี้ว่างเปล่า</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">ค้นหาสำรับ</string>
diff --git a/AnkiDroid/src/main/res/values-th/02-strings.xml b/AnkiDroid/src/main/res/values-th/02-strings.xml
index 13fe654e2012..77318aa3c107 100644
--- a/AnkiDroid/src/main/res/values-th/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-th/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flags</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limit to particular tags</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="other">+%d buried</item>
     </plurals>
diff --git a/AnkiDroid/src/main/res/values-th/03-dialogs.xml b/AnkiDroid/src/main/res/values-th/03-dialogs.xml
index 874f16210ea4..0b791e72d8c2 100644
--- a/AnkiDroid/src/main/res/values-th/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-th/03-dialogs.xml
@@ -71,6 +71,7 @@
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead">Review ahead by x days:</string>
     <string name="custom_study_preview">Preview new cards added in the last x days:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Storage full</string>
     <string name="storage_almost_full_title">Storage almost full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-th/10-preferences.xml b/AnkiDroid/src/main/res/values-th/10-preferences.xml
index d42d70fdb5b1..9cbbc5259b8d 100644
--- a/AnkiDroid/src/main/res/values-th/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-th/10-preferences.xml
@@ -67,6 +67,7 @@
     <string name="pref_cat_advanced" maxLength="41">Advanced</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">ปลั๊กอิน</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
     <string name="use_input_tag" maxLength="41">Type answer into the card</string>
@@ -202,7 +203,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-ti/01-core.xml b/AnkiDroid/src/main/res/values-ti/01-core.xml
index 56d3d145ff6a..a1f906b21ddd 100644
--- a/AnkiDroid/src/main/res/values-ti/01-core.xml
+++ b/AnkiDroid/src/main/res/values-ti/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">ባዶ ቦታ</string>
     <string name="create_subdeck">Create subdeck</string>
     <string name="empty_filtered_deck">Emptying filtered deck&#8230;</string>
-    <string name="custom_study_deck_name">መጽናዕቲ ብዝጠዕም ምምዕርራይ</string>
-    <string name="custom_study_deck_exists">መጀመርያ ዝነበረ ምምዕርራይ መጽናዕቲ ባይታ ከምባሓዱሽ ሰዩም።</string>
     <string name="search_deck" comment="Deck search for selecting it">Deck Search</string>
     <string name="empty_deck">እዚ ባይታ እዚ ጥርሑ እዩ ዘሎ።</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Deck Search</string>
diff --git a/AnkiDroid/src/main/res/values-ti/02-strings.xml b/AnkiDroid/src/main/res/values-ti/02-strings.xml
index 509505f66399..5e4fab69ad3c 100644
--- a/AnkiDroid/src/main/res/values-ti/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ti/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flags</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limit to particular tags</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="other">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-ti/03-dialogs.xml b/AnkiDroid/src/main/res/values-ti/03-dialogs.xml
index db01ccc584a3..c85228a8acd8 100644
--- a/AnkiDroid/src/main/res/values-ti/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ti/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead">Review ahead by x days:</string>
     <string name="custom_study_preview">Preview new cards added in the last x days:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Storage full</string>
     <string name="storage_almost_full_title">Storage almost full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-ti/10-preferences.xml b/AnkiDroid/src/main/res/values-ti/10-preferences.xml
index 685d62aa4d39..8d49177684a2 100644
--- a/AnkiDroid/src/main/res/values-ti/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ti/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Advanced</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
     <string name="use_input_tag" maxLength="41">Type answer into the card</string>
@@ -204,7 +205,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-tn/01-core.xml b/AnkiDroid/src/main/res/values-tn/01-core.xml
index 1db2f2a10b0e..110c4db2fc79 100644
--- a/AnkiDroid/src/main/res/values-tn/01-core.xml
+++ b/AnkiDroid/src/main/res/values-tn/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Empty</string>
     <string name="create_subdeck">Create subdeck</string>
     <string name="empty_filtered_deck">Emptying filtered deck&#8230;</string>
-    <string name="custom_study_deck_name">Custom study session</string>
-    <string name="custom_study_deck_exists">Rename the existing custom study deck first</string>
     <string name="search_deck" comment="Deck search for selecting it">Deck Search</string>
     <string name="empty_deck">This deck is empty</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Deck Search</string>
diff --git a/AnkiDroid/src/main/res/values-tn/02-strings.xml b/AnkiDroid/src/main/res/values-tn/02-strings.xml
index 509505f66399..5e4fab69ad3c 100644
--- a/AnkiDroid/src/main/res/values-tn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tn/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flags</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limit to particular tags</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="other">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-tn/03-dialogs.xml b/AnkiDroid/src/main/res/values-tn/03-dialogs.xml
index db01ccc584a3..c85228a8acd8 100644
--- a/AnkiDroid/src/main/res/values-tn/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-tn/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead">Review ahead by x days:</string>
     <string name="custom_study_preview">Preview new cards added in the last x days:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Storage full</string>
     <string name="storage_almost_full_title">Storage almost full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-tn/10-preferences.xml b/AnkiDroid/src/main/res/values-tn/10-preferences.xml
index 685d62aa4d39..8d49177684a2 100644
--- a/AnkiDroid/src/main/res/values-tn/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-tn/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Advanced</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
     <string name="use_input_tag" maxLength="41">Type answer into the card</string>
@@ -204,7 +205,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-tr/01-core.xml b/AnkiDroid/src/main/res/values-tr/01-core.xml
index 1c90eca2df16..32fe790d9c8c 100644
--- a/AnkiDroid/src/main/res/values-tr/01-core.xml
+++ b/AnkiDroid/src/main/res/values-tr/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Boşalt</string>
     <string name="create_subdeck">Altdeste oluştur</string>
     <string name="empty_filtered_deck">Filtreli deste boşaltılıyor&#8230;</string>
-    <string name="custom_study_deck_name">Kişiselleştirilmiş çalışma oturumu</string>
-    <string name="custom_study_deck_exists">Önce mevcut özel çalışma destesini yeniden adlandırın.</string>
     <string name="search_deck" comment="Deck search for selecting it">Deste Ara</string>
     <string name="empty_deck">Bu deste boş</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Deste Ara</string>
diff --git a/AnkiDroid/src/main/res/values-tr/02-strings.xml b/AnkiDroid/src/main/res/values-tr/02-strings.xml
index 85af5314ba82..d7aefe93952c 100644
--- a/AnkiDroid/src/main/res/values-tr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tr/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">Sistem WebView bu kartı işleyemedi: \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Bayraklar</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Belirli etiketlere sınırla</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d gömülü</item>
         <item quantity="other">+%d gömülü</item>
diff --git a/AnkiDroid/src/main/res/values-tr/03-dialogs.xml b/AnkiDroid/src/main/res/values-tr/03-dialogs.xml
index f14440d55ae8..a0b3d5e8eebc 100644
--- a/AnkiDroid/src/main/res/values-tr/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-tr/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Son x gündeki unutulan kartları izle:</string>
     <string name="custom_study_ahead">X günleri önce izle:</string>
     <string name="custom_study_preview">Son x günlerdeki eklenen yeni kartları önizle:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Depolama alanı dolu</string>
     <string name="storage_almost_full_title">Depolama alanı nerdeyse dolu</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">Hiç alan yok</string>
diff --git a/AnkiDroid/src/main/res/values-tr/10-preferences.xml b/AnkiDroid/src/main/res/values-tr/10-preferences.xml
index ede36be64927..e39b8833b980 100644
--- a/AnkiDroid/src/main/res/values-tr/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-tr/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Gelişmiş</string>
     <string name="pref_cat_workarounds" maxLength="41">Geçici çözümler</string>
     <string name="pref_cat_plugins" maxLength="41">Eklentiler</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Kontur genişliği</string>
     <string name="use_input_tag" maxLength="41">Cevabı karta yaz</string>
@@ -203,7 +204,6 @@
     <string name="accessibility" maxLength="41">Erişilebilirlik</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Panodaki resimleri PNG olarak yapıştırın</string>
-    <string name="paste_as_png_summary">Varsayılan olarak Anki, disk alanından tasarruf etmek için panodaki görüntüleri JPG dosyası olarak yapıştırır. Bunun yerine PNG görüntüleri olarak yapıştırmak için bu seçeneği kullanabilirsiniz.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Geri gitmek/çıkmak için iki kez basın</string>
     <string name="exit_via_double_tap_back_summ">Çalışıcıdan veya uygulamadan yanlışlıkla çıkmamak için</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-ts/01-core.xml b/AnkiDroid/src/main/res/values-ts/01-core.xml
index 1db2f2a10b0e..110c4db2fc79 100644
--- a/AnkiDroid/src/main/res/values-ts/01-core.xml
+++ b/AnkiDroid/src/main/res/values-ts/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Empty</string>
     <string name="create_subdeck">Create subdeck</string>
     <string name="empty_filtered_deck">Emptying filtered deck&#8230;</string>
-    <string name="custom_study_deck_name">Custom study session</string>
-    <string name="custom_study_deck_exists">Rename the existing custom study deck first</string>
     <string name="search_deck" comment="Deck search for selecting it">Deck Search</string>
     <string name="empty_deck">This deck is empty</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Deck Search</string>
diff --git a/AnkiDroid/src/main/res/values-ts/02-strings.xml b/AnkiDroid/src/main/res/values-ts/02-strings.xml
index 509505f66399..5e4fab69ad3c 100644
--- a/AnkiDroid/src/main/res/values-ts/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ts/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flags</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limit to particular tags</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="other">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-ts/03-dialogs.xml b/AnkiDroid/src/main/res/values-ts/03-dialogs.xml
index db01ccc584a3..c85228a8acd8 100644
--- a/AnkiDroid/src/main/res/values-ts/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ts/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead">Review ahead by x days:</string>
     <string name="custom_study_preview">Preview new cards added in the last x days:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Storage full</string>
     <string name="storage_almost_full_title">Storage almost full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-ts/10-preferences.xml b/AnkiDroid/src/main/res/values-ts/10-preferences.xml
index 685d62aa4d39..8d49177684a2 100644
--- a/AnkiDroid/src/main/res/values-ts/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ts/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Advanced</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
     <string name="use_input_tag" maxLength="41">Type answer into the card</string>
@@ -204,7 +205,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-tt/01-core.xml b/AnkiDroid/src/main/res/values-tt/01-core.xml
index dd825a424d23..d4bdde1c3939 100644
--- a/AnkiDroid/src/main/res/values-tt/01-core.xml
+++ b/AnkiDroid/src/main/res/values-tt/01-core.xml
@@ -120,8 +120,6 @@
     <string name="empty_cram_label" maxLength="28">Бушату</string>
     <string name="create_subdeck">Колода эчендә колода ясау</string>
     <string name="empty_filtered_deck">Фильтрлы колода бушатыла&#8230;</string>
-    <string name="custom_study_deck_name">Шәхси өйрәнү сессиясе</string>
-    <string name="custom_study_deck_exists">Башта булган артык өйрәнү колода исемен үзгәртегез</string>
     <string name="search_deck" comment="Deck search for selecting it">Колода эзләү</string>
     <string name="empty_deck">Бу колода буш</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Колода эзләү</string>
diff --git a/AnkiDroid/src/main/res/values-tt/02-strings.xml b/AnkiDroid/src/main/res/values-tt/02-strings.xml
index 35a62dc1d33a..c003b91cee26 100644
--- a/AnkiDroid/src/main/res/values-tt/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tt/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">Система WebViewы \'%1$s\' кәртен ача алмады.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Байраклар</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Кайбер тамгаларны гына</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="other">+%d buried</item>
     </plurals>
diff --git a/AnkiDroid/src/main/res/values-tt/03-dialogs.xml b/AnkiDroid/src/main/res/values-tt/03-dialogs.xml
index 31df6c5538fe..56de3340fe58 100644
--- a/AnkiDroid/src/main/res/values-tt/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-tt/03-dialogs.xml
@@ -71,6 +71,7 @@
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead">Review ahead by x days:</string>
     <string name="custom_study_preview">Preview new cards added in the last x days:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Storage full</string>
     <string name="storage_almost_full_title">Storage almost full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-tt/10-preferences.xml b/AnkiDroid/src/main/res/values-tt/10-preferences.xml
index b79ebb5c0528..3a0190ed8706 100644
--- a/AnkiDroid/src/main/res/values-tt/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-tt/10-preferences.xml
@@ -67,6 +67,7 @@
     <string name="pref_cat_advanced" maxLength="41">Advanced</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
     <string name="use_input_tag" maxLength="41">Type answer into the card</string>
@@ -202,7 +203,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-ug/01-core.xml b/AnkiDroid/src/main/res/values-ug/01-core.xml
index 8ea008af1427..fc714f325710 100644
--- a/AnkiDroid/src/main/res/values-ug/01-core.xml
+++ b/AnkiDroid/src/main/res/values-ug/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">بوش</string>
     <string name="create_subdeck">تارماق دەستە قۇر</string>
     <string name="empty_filtered_deck">سۈزۈلگەن دەستىنى بوشىتىۋاتىدۇ&#8230;</string>
-    <string name="custom_study_deck_name">ئىختىيارى ئۆگىنىش جەريانى</string>
-    <string name="custom_study_deck_exists">ئالدى بىلەن مەۋجۇت ئىختىيارى ئۆگىنىش دەستىسىنىڭ ئاتىنى ئۆزگەرتىڭ</string>
     <string name="search_deck" comment="Deck search for selecting it">دەستە ئىزدە</string>
     <string name="empty_deck">بۇ دەستە بوش</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">دەستە ئىزدە</string>
diff --git a/AnkiDroid/src/main/res/values-ug/02-strings.xml b/AnkiDroid/src/main/res/values-ug/02-strings.xml
index 81e3236aacff..2e8e8a7bdaec 100644
--- a/AnkiDroid/src/main/res/values-ug/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ug/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">سىستېما WebView دا «%1$s» كارتىنى ھاسىللىيالمىدى.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">بايراق</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">مۇئەييەن بەلگە بىلەنلا چەكلىنىدۇ</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d يوشۇرۇلدى</item>
         <item quantity="other">+%d يوشۇرۇلدى</item>
diff --git a/AnkiDroid/src/main/res/values-ug/03-dialogs.xml b/AnkiDroid/src/main/res/values-ug/03-dialogs.xml
index febd8e0f976c..e1098fe6ef21 100644
--- a/AnkiDroid/src/main/res/values-ug/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ug/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">ئۆتكەن x كۈندە ئۇنتۇلغان كارتىنى تەكرارلايدۇ:</string>
     <string name="custom_study_ahead">ئالدىن تەكرارلاش ۋاقتى x كۈنى:</string>
     <string name="custom_study_preview">يېقىنقى x كۈندە قوشقان يېڭى كارتىنى ئالدىن كۆزىتىدۇ:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">ساقلىغۇچ لىق</string>
     <string name="storage_almost_full_title">ساقلىغۇچ ئاساسەن لىق</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">بوشلۇق يوق</string>
diff --git a/AnkiDroid/src/main/res/values-ug/10-preferences.xml b/AnkiDroid/src/main/res/values-ug/10-preferences.xml
index d696fb5ae134..89258869c2fd 100644
--- a/AnkiDroid/src/main/res/values-ug/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ug/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">ئالىي</string>
     <string name="pref_cat_workarounds" maxLength="41">خىزمەت رايونى</string>
     <string name="pref_cat_plugins" maxLength="41">قىستۇرما</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">سىزىق توملۇقى</string>
     <string name="use_input_tag" maxLength="41">كارتىغا جاۋاب كىرگۈزۈلىدۇ</string>
@@ -204,7 +205,6 @@
     <string name="accessibility" maxLength="41">قوشۇمچە ئىقتىدار</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">سۈرەتنى png سۈپىتىدە چاپلاش تاختىسىغا چاپلايدۇ</string>
-    <string name="paste_as_png_summary">كۆڭۈلدىكى ئەھۋالدا Anki سۈرەتلەرنى JPG پىچىمىدا چاپلاش تاختىسىدا ساقلاپ دىسكا بوشلۇقىنى تېجەيدۇ. ئۇنىڭ ئورنىغا PNG سۈرەت سۈپىتىدە چاپلىسىڭىز بولىدۇ.</string>
     <string name="exit_via_double_tap_back" maxLength="41">قايت ئىككى قېتىم چېكىلسە قايتىدۇ/چېكىنىدۇ</string>
     <string name="exit_via_double_tap_back_summ">ئېھتىياتسىزلىقتىن تەكرارلاش كۆرۈنۈشى ياكى ئەپتىن ئايرىلىشنىڭ ئالدىنى ئالىدۇ</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-uk/01-core.xml b/AnkiDroid/src/main/res/values-uk/01-core.xml
index e6615e6d3b07..95e5f980c23e 100644
--- a/AnkiDroid/src/main/res/values-uk/01-core.xml
+++ b/AnkiDroid/src/main/res/values-uk/01-core.xml
@@ -129,8 +129,6 @@
     <string name="empty_cram_label" maxLength="28">Спорожнити</string>
     <string name="create_subdeck">Створити підколоду</string>
     <string name="empty_filtered_deck">Очищення фільтрованої колоди&#8230;</string>
-    <string name="custom_study_deck_name">Сесія індивідуального навчання</string>
-    <string name="custom_study_deck_exists">Спочатку перейменуйте колоду індивідуального навчання</string>
     <string name="search_deck" comment="Deck search for selecting it">Пошук колоди</string>
     <string name="empty_deck">Ця колода порожня</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Пошук колоди</string>
diff --git a/AnkiDroid/src/main/res/values-uk/02-strings.xml b/AnkiDroid/src/main/res/values-uk/02-strings.xml
index b85212bbb496..620b070a679d 100644
--- a/AnkiDroid/src/main/res/values-uk/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-uk/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">Системою WebView не вдалося відобразити картку \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Прапорці</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Обмежити конкретними тегами</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d відкладено</item>
         <item quantity="few">+%d відкладено</item>
diff --git a/AnkiDroid/src/main/res/values-uk/03-dialogs.xml b/AnkiDroid/src/main/res/values-uk/03-dialogs.xml
index 2af0976f46d8..b04f19b89ba1 100644
--- a/AnkiDroid/src/main/res/values-uk/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-uk/03-dialogs.xml
@@ -77,6 +77,7 @@
     <string name="custom_study_forgotten">Повторити картки забуті за останні x днів:</string>
     <string name="custom_study_ahead">Повторити наперед за х днів:</string>
     <string name="custom_study_preview">Переглянути нові картки додані за останні x днів:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Сховище заповнено</string>
     <string name="storage_almost_full_title">Сховище майже заповнено</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">Пам\'ять заповнена</string>
diff --git a/AnkiDroid/src/main/res/values-uk/10-preferences.xml b/AnkiDroid/src/main/res/values-uk/10-preferences.xml
index 507b176d059e..c4ead4ab77f7 100644
--- a/AnkiDroid/src/main/res/values-uk/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-uk/10-preferences.xml
@@ -70,6 +70,7 @@
     <string name="pref_cat_advanced" maxLength="41">Розширені налаштування</string>
     <string name="pref_cat_workarounds" maxLength="41">Спеціальні функції</string>
     <string name="pref_cat_plugins" maxLength="41">Плагіни</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Ширина штриха</string>
     <string name="use_input_tag" maxLength="41">Введіть відповідь на картці</string>
@@ -208,7 +209,6 @@
     <string name="accessibility" maxLength="41">Доступність</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Вставити зображення у форматі PNG</string>
-    <string name="paste_as_png_summary">За замовчуванням Anki вводить зображення в буфер обміну в якості JPG файлів для економії місця на диску. Ви можете змінити в меню на PNG зображення.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Натиснeння \"Назад\" двічі, щоб перейти назад/вийти</string>
     <string name="exit_via_double_tap_back_summ">Для уникнення випадкового виходу з оглядача чи додатку</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-ur/01-core.xml b/AnkiDroid/src/main/res/values-ur/01-core.xml
index b2c38e954bac..7c0b991d15a8 100644
--- a/AnkiDroid/src/main/res/values-ur/01-core.xml
+++ b/AnkiDroid/src/main/res/values-ur/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">خالى</string>
     <string name="create_subdeck">سب ڈیک بنائیں</string>
     <string name="empty_filtered_deck">فلٹر شدہ ڈیک کو خالی کیا جا رہا ہے&#8230;</string>
-    <string name="custom_study_deck_name">اپنی مرضی کے مطابق تعلیمی سیشن</string>
-    <string name="custom_study_deck_exists">پہلے موجودہ مخصوص مطالعہ ڈیک کو نیا نام دیں</string>
     <string name="search_deck" comment="Deck search for selecting it">ڈیک تلاش</string>
     <string name="empty_deck">یہ ڈیک خالی ہے</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">ڈیک تلاش</string>
diff --git a/AnkiDroid/src/main/res/values-ur/02-strings.xml b/AnkiDroid/src/main/res/values-ur/02-strings.xml
index 1fea5c281be0..9023f28f672c 100644
--- a/AnkiDroid/src/main/res/values-ur/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ur/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">سسٹم WebView کارڈ \'%1$s\' رینڈر کرنے میں ناکام رہا۔\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">جھنڈے</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">مخصوص ٹیگز تک محدود</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d دفن کر دیا گیا۔</item>
         <item quantity="other">+%d دفن کر دیا گیا۔</item>
diff --git a/AnkiDroid/src/main/res/values-ur/03-dialogs.xml b/AnkiDroid/src/main/res/values-ur/03-dialogs.xml
index 761a4d1cab4e..c8f68048a4b6 100644
--- a/AnkiDroid/src/main/res/values-ur/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ur/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">پچھلے دنوں میں بھولے گئے کارڈز کا جائزہ لیں:</string>
     <string name="custom_study_ahead">ایکس دنوں میں آگے کا جائزہ لیں:</string>
     <string name="custom_study_preview">پچھلے x دنوں میں شامل کیے گئے نئے کارڈز کا جائزہ لیں:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">اسٹوریج بھرا ہوا ہے</string>
     <string name="storage_almost_full_title">اسٹوریج تقریباً بھر گیا ہے</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">کوئی جگہ نہیں</string>
diff --git a/AnkiDroid/src/main/res/values-ur/10-preferences.xml b/AnkiDroid/src/main/res/values-ur/10-preferences.xml
index cc6717183e11..4171301b394f 100644
--- a/AnkiDroid/src/main/res/values-ur/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ur/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">ترقی یافتہ</string>
     <string name="pref_cat_workarounds" maxLength="41">حل</string>
     <string name="pref_cat_plugins" maxLength="41">پلگ ان</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">اسٹروک کی چوڑائی</string>
     <string name="use_input_tag" maxLength="41">کارڈ میں جواب ٹائپ کریں۔</string>
@@ -204,7 +205,6 @@
     <string name="accessibility" maxLength="41">رسائی</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">کلپ بورڈ کی تصاویر کو PNG کے بطور پیسٹ کریں</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-uz/01-core.xml b/AnkiDroid/src/main/res/values-uz/01-core.xml
index 6a0d3b2d1e6c..41782300c4a8 100644
--- a/AnkiDroid/src/main/res/values-uz/01-core.xml
+++ b/AnkiDroid/src/main/res/values-uz/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Bo\'sh</string>
     <string name="create_subdeck">Palubani o‘rnini bosuvchi narsa yaratish</string>
     <string name="empty_filtered_deck">Emptying filtered deck&#8230;</string>
-    <string name="custom_study_deck_name">Qo\'shimcha shug\'ullanish</string>
-    <string name="custom_study_deck_exists">Avval qo\'shimcha shug\'ullanish to\'plamini qayta nomlang</string>
     <string name="search_deck" comment="Deck search for selecting it">To\'plam qidirish</string>
     <string name="empty_deck">Bu to\'plam bo\'sh</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">To\'plam qidirish</string>
diff --git a/AnkiDroid/src/main/res/values-uz/02-strings.xml b/AnkiDroid/src/main/res/values-uz/02-strings.xml
index 0d3a9683f043..818be124790b 100644
--- a/AnkiDroid/src/main/res/values-uz/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-uz/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flags</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limit to particular tags</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="other">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-uz/03-dialogs.xml b/AnkiDroid/src/main/res/values-uz/03-dialogs.xml
index 6709d342cdf7..82b320b68d68 100644
--- a/AnkiDroid/src/main/res/values-uz/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-uz/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead">Review ahead by x days:</string>
     <string name="custom_study_preview">Preview new cards added in the last x days:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Storage full</string>
     <string name="storage_almost_full_title">Storage almost full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-uz/10-preferences.xml b/AnkiDroid/src/main/res/values-uz/10-preferences.xml
index 685d62aa4d39..8d49177684a2 100644
--- a/AnkiDroid/src/main/res/values-uz/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-uz/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Advanced</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
     <string name="use_input_tag" maxLength="41">Type answer into the card</string>
@@ -204,7 +205,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-ve/01-core.xml b/AnkiDroid/src/main/res/values-ve/01-core.xml
index 1db2f2a10b0e..110c4db2fc79 100644
--- a/AnkiDroid/src/main/res/values-ve/01-core.xml
+++ b/AnkiDroid/src/main/res/values-ve/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Empty</string>
     <string name="create_subdeck">Create subdeck</string>
     <string name="empty_filtered_deck">Emptying filtered deck&#8230;</string>
-    <string name="custom_study_deck_name">Custom study session</string>
-    <string name="custom_study_deck_exists">Rename the existing custom study deck first</string>
     <string name="search_deck" comment="Deck search for selecting it">Deck Search</string>
     <string name="empty_deck">This deck is empty</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Deck Search</string>
diff --git a/AnkiDroid/src/main/res/values-ve/02-strings.xml b/AnkiDroid/src/main/res/values-ve/02-strings.xml
index 509505f66399..5e4fab69ad3c 100644
--- a/AnkiDroid/src/main/res/values-ve/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ve/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flags</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limit to particular tags</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="other">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-ve/03-dialogs.xml b/AnkiDroid/src/main/res/values-ve/03-dialogs.xml
index db01ccc584a3..c85228a8acd8 100644
--- a/AnkiDroid/src/main/res/values-ve/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-ve/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead">Review ahead by x days:</string>
     <string name="custom_study_preview">Preview new cards added in the last x days:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Storage full</string>
     <string name="storage_almost_full_title">Storage almost full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-ve/10-preferences.xml b/AnkiDroid/src/main/res/values-ve/10-preferences.xml
index 685d62aa4d39..8d49177684a2 100644
--- a/AnkiDroid/src/main/res/values-ve/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ve/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Advanced</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
     <string name="use_input_tag" maxLength="41">Type answer into the card</string>
@@ -204,7 +205,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-vi/01-core.xml b/AnkiDroid/src/main/res/values-vi/01-core.xml
index 4806571985a6..b90bf543ef6d 100644
--- a/AnkiDroid/src/main/res/values-vi/01-core.xml
+++ b/AnkiDroid/src/main/res/values-vi/01-core.xml
@@ -120,8 +120,6 @@
     <string name="empty_cram_label" maxLength="28">Dọn trống</string>
     <string name="create_subdeck">Tạo bộ thẻ phụ</string>
     <string name="empty_filtered_deck">Đang làm trống các bộ thẻ đã lọc</string>
-    <string name="custom_study_deck_name">Phiên học tuỳ chọn</string>
-    <string name="custom_study_deck_exists">Đổi tên bộ thẻ học tuỳ chọn hiện hữu trước nhất</string>
     <string name="search_deck" comment="Deck search for selecting it">Tìm kiếm bộ thẻ</string>
     <string name="empty_deck">Bộ thẻ này rỗng</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Tìm kiếm bộ thẻ</string>
diff --git a/AnkiDroid/src/main/res/values-vi/02-strings.xml b/AnkiDroid/src/main/res/values-vi/02-strings.xml
index 47bbfbee8676..b8dd1735cb7a 100644
--- a/AnkiDroid/src/main/res/values-vi/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-vi/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">Hệ thống WebView không thể hiển thị thẻ \'%1$s\'.\ n%2$s</string>
     <string name="filter_by_flags" maxLength="41">Cờ</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Giới hạn cho các đuôi cụ thể</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="other">+%d tạm ẩn</item>
     </plurals>
diff --git a/AnkiDroid/src/main/res/values-vi/03-dialogs.xml b/AnkiDroid/src/main/res/values-vi/03-dialogs.xml
index cccaa2aca267..2d23e01d1ce2 100644
--- a/AnkiDroid/src/main/res/values-vi/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-vi/03-dialogs.xml
@@ -71,6 +71,7 @@
     <string name="custom_study_forgotten">Ôn lại các thẻ đã quên trong x ngày trước:</string>
     <string name="custom_study_ahead">Ôn tập trước x ngày:</string>
     <string name="custom_study_preview">Xem trước thẻ mới được thêm vào x ngày trước:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Bộ nhớ đầy</string>
     <string name="storage_almost_full_title">Bộ nhớ gần đầy</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">Không có không gian</string>
diff --git a/AnkiDroid/src/main/res/values-vi/10-preferences.xml b/AnkiDroid/src/main/res/values-vi/10-preferences.xml
index e1f663a5e2c0..6db396590371 100644
--- a/AnkiDroid/src/main/res/values-vi/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-vi/10-preferences.xml
@@ -67,6 +67,7 @@
     <string name="pref_cat_advanced" maxLength="41">Tuỳ chọn nâng cao</string>
     <string name="pref_cat_workarounds" maxLength="41">Nền tảng công việc xung quanh</string>
     <string name="pref_cat_plugins" maxLength="41">Các bổ sung plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Chiều rộng không cố định</string>
     <string name="use_input_tag" maxLength="41">Nhập câu trả lời vào thẻ</string>
@@ -201,7 +202,6 @@
     <string name="accessibility" maxLength="41">Trợ năng</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-wo/01-core.xml b/AnkiDroid/src/main/res/values-wo/01-core.xml
index 9ef7be03d79f..5a76f984371a 100644
--- a/AnkiDroid/src/main/res/values-wo/01-core.xml
+++ b/AnkiDroid/src/main/res/values-wo/01-core.xml
@@ -120,8 +120,6 @@
     <string name="empty_cram_label" maxLength="28">Empty</string>
     <string name="create_subdeck">Create subdeck</string>
     <string name="empty_filtered_deck">Emptying filtered deck&#8230;</string>
-    <string name="custom_study_deck_name">Custom study session</string>
-    <string name="custom_study_deck_exists">Rename the existing custom study deck first</string>
     <string name="search_deck" comment="Deck search for selecting it">Deck Search</string>
     <string name="empty_deck">This deck is empty</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Deck Search</string>
diff --git a/AnkiDroid/src/main/res/values-wo/02-strings.xml b/AnkiDroid/src/main/res/values-wo/02-strings.xml
index f45046133624..fb9a40012630 100644
--- a/AnkiDroid/src/main/res/values-wo/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-wo/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flags</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limit to particular tags</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="other">+%d buried</item>
     </plurals>
diff --git a/AnkiDroid/src/main/res/values-wo/03-dialogs.xml b/AnkiDroid/src/main/res/values-wo/03-dialogs.xml
index 874f16210ea4..0b791e72d8c2 100644
--- a/AnkiDroid/src/main/res/values-wo/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-wo/03-dialogs.xml
@@ -71,6 +71,7 @@
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead">Review ahead by x days:</string>
     <string name="custom_study_preview">Preview new cards added in the last x days:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Storage full</string>
     <string name="storage_almost_full_title">Storage almost full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-wo/10-preferences.xml b/AnkiDroid/src/main/res/values-wo/10-preferences.xml
index 6744950912bc..3f9dd4876545 100644
--- a/AnkiDroid/src/main/res/values-wo/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-wo/10-preferences.xml
@@ -67,6 +67,7 @@
     <string name="pref_cat_advanced" maxLength="41">Advanced</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
     <string name="use_input_tag" maxLength="41">Type answer into the card</string>
@@ -202,7 +203,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-xh/01-core.xml b/AnkiDroid/src/main/res/values-xh/01-core.xml
index 1db2f2a10b0e..110c4db2fc79 100644
--- a/AnkiDroid/src/main/res/values-xh/01-core.xml
+++ b/AnkiDroid/src/main/res/values-xh/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Empty</string>
     <string name="create_subdeck">Create subdeck</string>
     <string name="empty_filtered_deck">Emptying filtered deck&#8230;</string>
-    <string name="custom_study_deck_name">Custom study session</string>
-    <string name="custom_study_deck_exists">Rename the existing custom study deck first</string>
     <string name="search_deck" comment="Deck search for selecting it">Deck Search</string>
     <string name="empty_deck">This deck is empty</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Deck Search</string>
diff --git a/AnkiDroid/src/main/res/values-xh/02-strings.xml b/AnkiDroid/src/main/res/values-xh/02-strings.xml
index 509505f66399..5e4fab69ad3c 100644
--- a/AnkiDroid/src/main/res/values-xh/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-xh/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flags</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limit to particular tags</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="other">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-xh/03-dialogs.xml b/AnkiDroid/src/main/res/values-xh/03-dialogs.xml
index db01ccc584a3..c85228a8acd8 100644
--- a/AnkiDroid/src/main/res/values-xh/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-xh/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead">Review ahead by x days:</string>
     <string name="custom_study_preview">Preview new cards added in the last x days:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Storage full</string>
     <string name="storage_almost_full_title">Storage almost full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-xh/10-preferences.xml b/AnkiDroid/src/main/res/values-xh/10-preferences.xml
index 685d62aa4d39..8d49177684a2 100644
--- a/AnkiDroid/src/main/res/values-xh/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-xh/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Advanced</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
     <string name="use_input_tag" maxLength="41">Type answer into the card</string>
@@ -204,7 +205,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-yue/01-core.xml b/AnkiDroid/src/main/res/values-yue/01-core.xml
index 4c681a86f12d..74521a6a5aa7 100644
--- a/AnkiDroid/src/main/res/values-yue/01-core.xml
+++ b/AnkiDroid/src/main/res/values-yue/01-core.xml
@@ -120,8 +120,6 @@
     <string name="empty_cram_label" maxLength="28">Empty</string>
     <string name="create_subdeck">Create subdeck</string>
     <string name="empty_filtered_deck">Emptying filtered deck&#8230;</string>
-    <string name="custom_study_deck_name">Custom study session</string>
-    <string name="custom_study_deck_exists">Rename the existing custom study deck first</string>
     <string name="search_deck" comment="Deck search for selecting it">Deck Search</string>
     <string name="empty_deck">This deck is empty</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Deck Search</string>
diff --git a/AnkiDroid/src/main/res/values-yue/02-strings.xml b/AnkiDroid/src/main/res/values-yue/02-strings.xml
index 3fa0e9477af6..0e2cef23f173 100644
--- a/AnkiDroid/src/main/res/values-yue/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-yue/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flags</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limit to particular tags</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="other">+%d buried</item>
     </plurals>
diff --git a/AnkiDroid/src/main/res/values-yue/03-dialogs.xml b/AnkiDroid/src/main/res/values-yue/03-dialogs.xml
index 58076e74d9a0..31443989e8f1 100644
--- a/AnkiDroid/src/main/res/values-yue/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-yue/03-dialogs.xml
@@ -71,6 +71,7 @@
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead">Review ahead by x days:</string>
     <string name="custom_study_preview">Preview new cards added in the last x days:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Storage full</string>
     <string name="storage_almost_full_title">Storage almost full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-yue/10-preferences.xml b/AnkiDroid/src/main/res/values-yue/10-preferences.xml
index 6744950912bc..3f9dd4876545 100644
--- a/AnkiDroid/src/main/res/values-yue/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-yue/10-preferences.xml
@@ -67,6 +67,7 @@
     <string name="pref_cat_advanced" maxLength="41">Advanced</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
     <string name="use_input_tag" maxLength="41">Type answer into the card</string>
@@ -202,7 +203,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-zh-rCN/01-core.xml b/AnkiDroid/src/main/res/values-zh-rCN/01-core.xml
index 54cd965c93ee..9c91e9ef4e0e 100644
--- a/AnkiDroid/src/main/res/values-zh-rCN/01-core.xml
+++ b/AnkiDroid/src/main/res/values-zh-rCN/01-core.xml
@@ -120,8 +120,6 @@
     <string name="empty_cram_label" maxLength="28">清空</string>
     <string name="create_subdeck">创建子牌组</string>
     <string name="empty_filtered_deck">正在清空已过滤的牌组&#8230;</string>
-    <string name="custom_study_deck_name">自定义学习的进程</string>
-    <string name="custom_study_deck_exists">请先重命名现有的自定义学习牌组。</string>
     <string name="search_deck" comment="Deck search for selecting it">牌组搜索</string>
     <string name="empty_deck">此牌组为空</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">牌组搜索</string>
diff --git a/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml b/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml
index ffa1022b79ef..42d879975fca 100644
--- a/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">系统 WebView 渲染卡片 “%1$s” 失败。\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">旗标</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">仅限于特定标签</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="other">+%d 被隐藏</item>
     </plurals>
diff --git a/AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml b/AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml
index 20259444f461..80d2c9beaaf0 100644
--- a/AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml
@@ -71,6 +71,7 @@
     <string name="custom_study_forgotten">复习过去 x 天中忘记的卡片：</string>
     <string name="custom_study_ahead">提前 x 天复习：</string>
     <string name="custom_study_preview">预览过去 x 天中新增的卡片：</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">存储空间已满</string>
     <string name="storage_almost_full_title">存储空间几乎满了</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">没有空间</string>
diff --git a/AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml b/AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml
index d09523cf0fa0..41212a2cf4cd 100644
--- a/AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml
@@ -67,6 +67,7 @@
     <string name="pref_cat_advanced" maxLength="41">高级设置</string>
     <string name="pref_cat_workarounds" maxLength="41">变通方法</string>
     <string name="pref_cat_plugins" maxLength="41">插件</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">笔画粗细</string>
     <string name="use_input_tag" maxLength="41">在卡片中输入答案</string>
@@ -201,7 +202,6 @@
     <string name="accessibility" maxLength="41">无障碍功能</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">将剪贴板图像粘贴为 PNG</string>
-    <string name="paste_as_png_summary">Anki 默认将剪贴板图粘贴为 JPG 以节省空间。 您可用此选项粘贴为 PNG。</string>
     <string name="exit_via_double_tap_back" maxLength="41">按两次返回键返回/退出</string>
     <string name="exit_via_double_tap_back_summ">避免意外离开复习界面或应用程序</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-zh-rTW/01-core.xml b/AnkiDroid/src/main/res/values-zh-rTW/01-core.xml
index 05bee10502c4..a8c2d493fe48 100644
--- a/AnkiDroid/src/main/res/values-zh-rTW/01-core.xml
+++ b/AnkiDroid/src/main/res/values-zh-rTW/01-core.xml
@@ -121,8 +121,6 @@
     <string name="empty_cram_label" maxLength="28">清空</string>
     <string name="create_subdeck">建立子牌組</string>
     <string name="empty_filtered_deck">清除已篩選牌組中&#8230;</string>
-    <string name="custom_study_deck_name">自訂學程</string>
-    <string name="custom_study_deck_exists">請先重新命名現有的「自訂學習」牌組。</string>
     <string name="search_deck" comment="Deck search for selecting it">牌組搜尋</string>
     <string name="empty_deck">這是個空牌組</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">牌組搜尋</string>
diff --git a/AnkiDroid/src/main/res/values-zh-rTW/02-strings.xml b/AnkiDroid/src/main/res/values-zh-rTW/02-strings.xml
index 56e734c01076..9c95128efcdd 100644
--- a/AnkiDroid/src/main/res/values-zh-rTW/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-zh-rTW/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">系統 WebView 渲染卡片 ‘%1$s’ 失敗。\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">標籤</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">僅限特定標籤的卡片</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="other">+%d buried</item>
     </plurals>
diff --git a/AnkiDroid/src/main/res/values-zh-rTW/03-dialogs.xml b/AnkiDroid/src/main/res/values-zh-rTW/03-dialogs.xml
index 5a9b1b5b44f5..03927644145c 100644
--- a/AnkiDroid/src/main/res/values-zh-rTW/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-zh-rTW/03-dialogs.xml
@@ -71,6 +71,7 @@
     <string name="custom_study_forgotten">過去 x 天內忘記的複習卡:</string>
     <string name="custom_study_ahead">提早複習 x 天:</string>
     <string name="custom_study_preview">預覽過去 x 天新增的卡片:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">存儲已滿</string>
     <string name="storage_almost_full_title">存儲空間幾乎滿了</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">沒有空間</string>
diff --git a/AnkiDroid/src/main/res/values-zh-rTW/10-preferences.xml b/AnkiDroid/src/main/res/values-zh-rTW/10-preferences.xml
index 7defa7265934..f23c2837dac9 100644
--- a/AnkiDroid/src/main/res/values-zh-rTW/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-zh-rTW/10-preferences.xml
@@ -67,6 +67,7 @@
     <string name="pref_cat_advanced" maxLength="41">進階設定</string>
     <string name="pref_cat_workarounds" maxLength="41">解決方案</string>
     <string name="pref_cat_plugins" maxLength="41">擴充套件</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">筆跡寬度</string>
     <string name="use_input_tag" maxLength="41">在卡片中輸入答案</string>
@@ -201,7 +202,6 @@
     <string name="accessibility" maxLength="41">無障礙功能</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">複製PNG格式的圖像到剪貼簿上</string>
-    <string name="paste_as_png_summary">為了節省磁盤空間，Anki自動會複製JPG格式到剪貼簿上。你也可以在設置裡面設定PNG格式。</string>
     <string name="exit_via_double_tap_back" maxLength="41">按二次返回鍵返回或者退出</string>
     <string name="exit_via_double_tap_back_summ">避免不小心離開預覽器或者程式</string>
     <!-- Allow all files in media imports -->
diff --git a/AnkiDroid/src/main/res/values-zu/01-core.xml b/AnkiDroid/src/main/res/values-zu/01-core.xml
index 1db2f2a10b0e..110c4db2fc79 100644
--- a/AnkiDroid/src/main/res/values-zu/01-core.xml
+++ b/AnkiDroid/src/main/res/values-zu/01-core.xml
@@ -123,8 +123,6 @@
     <string name="empty_cram_label" maxLength="28">Empty</string>
     <string name="create_subdeck">Create subdeck</string>
     <string name="empty_filtered_deck">Emptying filtered deck&#8230;</string>
-    <string name="custom_study_deck_name">Custom study session</string>
-    <string name="custom_study_deck_exists">Rename the existing custom study deck first</string>
     <string name="search_deck" comment="Deck search for selecting it">Deck Search</string>
     <string name="empty_deck">This deck is empty</string>
     <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Deck Search</string>
diff --git a/AnkiDroid/src/main/res/values-zu/02-strings.xml b/AnkiDroid/src/main/res/values-zu/02-strings.xml
index 509505f66399..5e4fab69ad3c 100644
--- a/AnkiDroid/src/main/res/values-zu/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-zu/02-strings.xml
@@ -82,7 +82,8 @@
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flags</string>
     <!-- Custom study options -->
-    <string name="custom_study_limit_tags">Limit to particular tags</string>
+    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d buried</item>
         <item quantity="other">+%d buried</item>
diff --git a/AnkiDroid/src/main/res/values-zu/03-dialogs.xml b/AnkiDroid/src/main/res/values-zu/03-dialogs.xml
index db01ccc584a3..c85228a8acd8 100644
--- a/AnkiDroid/src/main/res/values-zu/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-zu/03-dialogs.xml
@@ -73,6 +73,7 @@
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead">Review ahead by x days:</string>
     <string name="custom_study_preview">Preview new cards added in the last x days:</string>
+    <string name="custom_study_tags">Select x cards from the deck:</string>
     <string name="storage_full_title">Storage full</string>
     <string name="storage_almost_full_title">Storage almost full</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
diff --git a/AnkiDroid/src/main/res/values-zu/10-preferences.xml b/AnkiDroid/src/main/res/values-zu/10-preferences.xml
index 685d62aa4d39..8d49177684a2 100644
--- a/AnkiDroid/src/main/res/values-zu/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-zu/10-preferences.xml
@@ -68,6 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Advanced</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
+    <string name="pref_cat_editing" maxLength="41">Editing</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
     <string name="use_input_tag" maxLength="41">Type answer into the card</string>
@@ -204,7 +205,6 @@
     <string name="accessibility" maxLength="41">Accessibility</string>
     <!-- Paste clipboard image as png option -->
     <string name="paste_as_png" maxLength="41">Paste clipboard images as PNG</string>
-    <string name="paste_as_png_summary">By default Anki pastes images on the clipboard as JPG files to save disk space. You can use this option to paste as PNG images instead.</string>
     <string name="exit_via_double_tap_back" maxLength="41">Press back twice to go back/exit</string>
     <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the reviewer or the app</string>
     <!-- Allow all files in media imports -->

From d9c0a0618371ccacfc04a85687b989fd37361edd Mon Sep 17 00:00:00 2001
From: Mike Hardy <github@mikehardy.net>
Date: Wed, 2 Apr 2025 21:04:48 +0000
Subject: [PATCH 167/200] Bumped version to 2.21alpha14

---
 AnkiDroid/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AnkiDroid/build.gradle b/AnkiDroid/build.gradle
index cf1d5a1e2928..86c61ec85cf4 100644
--- a/AnkiDroid/build.gradle
+++ b/AnkiDroid/build.gradle
@@ -85,8 +85,8 @@ android {
         //
         // This ensures the correct ordering between the various types of releases (dev < alpha < beta < release) which is
         // needed for upgrades to be offered correctly.
-        versionCode=22100113
-        versionName="2.21alpha13"
+        versionCode=22100114
+        versionName="2.21alpha14"
         minSdk libs.versions.minSdk.get().toInteger()
 
         // After #13695: change .tests_emulator.yml

From 5104f8e4f51da1d9e9829dc0d72b20f9cf4d4364 Mon Sep 17 00:00:00 2001
From: David Allison <62114487+david-allison@users.noreply.github.com>
Date: Thu, 3 Apr 2025 09:39:36 +0100
Subject: [PATCH 168/200] test: ignore flaky tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

CardBrowserTest > FindReplace - replaces text based on regular expression FAILED
    androidx.test.espresso.NoMatchingViewException: No views in hierarchy found matching: an instance of android.widget.TextView and view.getText() with or without transformation to match: is "⁨1⁩ note updated."
    If the target view is not part of the view hierarchy, you may need to use Espresso.onData to load it from one of the following AdapterViews:androidx.appcompat.widget.AppCompatSpinner{37dd5091 VFED..CL. ......ID 56,0-232,64 #7f0a04e6 app:id/toolbar_spinner}

Follow on from PR 18093 (4c5bf718a7c8f170f741553b5e9d5a8b7ff6d80e)
---
 AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt
index d203473e0068..ed927c652fb0 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt
@@ -1425,6 +1425,7 @@ class CardBrowserTest : RobolectricTest() {
     }
 
     @Test
+    @Flaky(OS.ALL)
     fun `FindReplace - replaces text based on regular expression`() {
         val note0 = createFindReplaceTestNote("A", "kart", "ki1logram")
         val note1 = createFindReplaceTestNote("B", "pink", "chicken")

From f1bb1d5e158a208e57c4042d200939ca77c682cb Mon Sep 17 00:00:00 2001
From: Ashish Yadav <48384865+criticalAY@users.noreply.github.com>
Date: Tue, 1 Apr 2025 21:45:31 +0530
Subject: [PATCH 169/200] feat: use new NotificationChannelCompat.Builder -
 removes dependency from compat module for notification channel creation

---
 .../main/java/com/ichi2/anki/AnkiDroidApp.kt  |  2 +-
 .../ichi2/anki/NavigationDrawerActivity.kt    |  3 +-
 .../com/ichi2/anki/NotificationChannels.kt    | 72 +++++++++++--------
 .../main/java/com/ichi2/compat/BaseCompat.kt  |  4 --
 .../src/main/java/com/ichi2/compat/Compat.kt  |  2 -
 .../main/java/com/ichi2/compat/CompatV26.kt   |  9 ---
 6 files changed, 43 insertions(+), 49 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidApp.kt b/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidApp.kt
index ed4dd6194ed1..316f590c493a 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidApp.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidApp.kt
@@ -180,7 +180,7 @@ open class AnkiDroidApp :
             this,
             preferences.getBoolean(getString(R.string.anki_card_external_context_menu_key), true),
         )
-        CompatHelper.compat.setupNotificationChannel(applicationContext)
+        setupNotificationChannels(applicationContext)
 
         makeBackendUsable(this)
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/NavigationDrawerActivity.kt b/AnkiDroid/src/main/java/com/ichi2/anki/NavigationDrawerActivity.kt
index 848a4a10e83b..b319c4a94a4b 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/NavigationDrawerActivity.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/NavigationDrawerActivity.kt
@@ -49,7 +49,6 @@ import com.ichi2.anki.preferences.PreferencesActivity
 import com.ichi2.anki.preferences.sharedPrefs
 import com.ichi2.anki.utils.ext.showDialogFragment
 import com.ichi2.anki.workarounds.FullDraggableContainerFix
-import com.ichi2.compat.CompatHelper
 import com.ichi2.libanki.CardId
 import com.ichi2.utils.HandlerUtils
 import com.ichi2.utils.IntentUtil
@@ -276,7 +275,7 @@ abstract class NavigationDrawerActivity :
                 REQUEST_PREFERENCES_UPDATE,
                 result.resultCode,
             )
-            CompatHelper.compat.setupNotificationChannel(applicationContext)
+            setupNotificationChannels(applicationContext)
             // Restart the activity on preference change
             // collection path hasn't been changed so just restart the current activity
             if (this is Reviewer && preferences.getBoolean("tts", false)) {
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/NotificationChannels.kt b/AnkiDroid/src/main/java/com/ichi2/anki/NotificationChannels.kt
index dbfa9fc0cd33..166f35035c0b 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/NotificationChannels.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/NotificationChannels.kt
@@ -17,53 +17,63 @@
 
 package com.ichi2.anki
 
-import android.app.NotificationChannel
-import android.app.NotificationManager
 import android.content.Context
 import android.content.Intent
 import android.content.res.Resources
-import androidx.annotation.RequiresApi
 import androidx.annotation.StringRes
-import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationChannelCompat
+import androidx.core.app.NotificationManagerCompat
 import timber.log.Timber
 
-object NotificationChannels {
-    /**
-     * Create or update all the notification channels for the app
-     *
-     * In Oreo and higher, you must create a channel for all notifications.
-     * This will create the channel if it doesn't exist, or if it exists it will update the name.
-     *
-     * Note that once a channel is created, only the name may be changed as long as the application
-     * is installed on the user device. All other settings are fully under user control.
+/**
+ * Create or update all the notification channels for the app
+ *
+ * In Oreo and higher, you must create a channel for all notifications.
+ * This will create the channel if it doesn't exist, or if it exists it will update the name.
+ *
+ * Note that once a channel is created, only the name may be changed as long as the application
+ * is installed on the user device. All other settings are fully under user control.
+ *
+ * TODO should be called in response to [Intent.ACTION_LOCALE_CHANGED]
+ * @param context the context for access to localized strings for channel names
+ */
+fun setupNotificationChannels(context: Context) {
+    val res = context.resources
+    val manager = NotificationManagerCompat.from(context)
 
-     * TODO should be called in response to [Intent.ACTION_LOCALE_CHANGED]
-     * @param context the context for access to localized strings for channel names
-     */
-    @RequiresApi(26)
-    fun setup(context: Context) {
-        val res = context.resources
-        for (channel in Channel.entries) {
-            val id = channel.id
-            val name = channel.getName(res)
-            val importance = NotificationManager.IMPORTANCE_DEFAULT
-            Timber.i("Creating notification channel with id/name: %s/%s", id, name)
-            val manager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-            val notificationChannel = NotificationChannel(id, name, importance)
-            notificationChannel.setShowBadge(true)
-            notificationChannel.lockscreenVisibility = NotificationCompat.VISIBILITY_PUBLIC
-            manager.createNotificationChannel(notificationChannel)
-        }
+    for (channel in Channel.entries) {
+        val id = channel.id
+        val name = channel.getName(res)
+        val importance = NotificationManagerCompat.IMPORTANCE_DEFAULT
+        Timber.i("Creating notification channel with id/name: %s/%s", id, name)
+
+        val notificationChannel =
+            NotificationChannelCompat
+                .Builder(id, importance)
+                .setName(name)
+                .setShowBadge(true)
+                .build()
+
+        manager.createNotificationChannel(notificationChannel)
     }
 }
 
+/**
+ * Defines the available notification channels for the application.
+ *
+ * @property id The unique identifier for the notification channel.
+ * @property nameId The string resource ID for the localized channel name.
+ */
 enum class Channel(
     val id: String,
     @StringRes val nameId: Int,
 ) {
     GENERAL("General Notifications", R.string.app_name),
     SYNC("Synchronization", R.string.sync_title),
-    GLOBAL_REMINDERS("Global Reminders", R.string.widget_minimum_cards_due_notification_ticker_title),
+    GLOBAL_REMINDERS(
+        "Global Reminders",
+        R.string.widget_minimum_cards_due_notification_ticker_title,
+    ),
     DECK_REMINDERS("Deck Reminders", R.string.deck_conf_reminders),
     ;
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/compat/BaseCompat.kt b/AnkiDroid/src/main/java/com/ichi2/compat/BaseCompat.kt
index f2b15c57f7c4..ca5560cb19bf 100644
--- a/AnkiDroid/src/main/java/com/ichi2/compat/BaseCompat.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/compat/BaseCompat.kt
@@ -47,10 +47,6 @@ import kotlin.time.Duration
 @KotlinCleanup("add extension method logging file.delete() failure" + "Fix Deprecation")
 @Suppress("Deprecation")
 open class BaseCompat : Compat {
-    // Until API26, ignore notification channels
-    override fun setupNotificationChannel(context: Context) { // pre-API26, do nothing
-    }
-
     // Until API26, tooltips cannot be defined declaratively in layouts
     override fun setTooltipTextByContentDescription(view: View) {
         TooltipCompat.setTooltipText(view, view.contentDescription)
diff --git a/AnkiDroid/src/main/java/com/ichi2/compat/Compat.kt b/AnkiDroid/src/main/java/com/ichi2/compat/Compat.kt
index 5b61952bdd5c..342455df1af6 100644
--- a/AnkiDroid/src/main/java/com/ichi2/compat/Compat.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/compat/Compat.kt
@@ -76,8 +76,6 @@ import kotlin.time.Duration
  * [CompatV29] in order to use [Environment.DIRECTORY_PICTURES], need not be implemented again in [CompatV26].
  */
 interface Compat {
-    fun setupNotificationChannel(context: Context)
-
     fun setTooltipTextByContentDescription(view: View)
 
     fun vibrate(
diff --git a/AnkiDroid/src/main/java/com/ichi2/compat/CompatV26.kt b/AnkiDroid/src/main/java/com/ichi2/compat/CompatV26.kt
index 7b092d3c8252..5ad33b859a46 100644
--- a/AnkiDroid/src/main/java/com/ichi2/compat/CompatV26.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/compat/CompatV26.kt
@@ -22,7 +22,6 @@ import android.os.Vibrator
 import android.view.View
 import androidx.annotation.RequiresApi
 import androidx.annotation.VisibleForTesting
-import com.ichi2.anki.NotificationChannels
 import java.io.File
 import java.io.FileNotFoundException
 import java.io.IOException
@@ -40,14 +39,6 @@ import kotlin.time.Duration
 /** Implementation of [Compat] for SDK level 26 and higher. Check  [Compat]'s for more detail.  */
 @RequiresApi(26)
 open class CompatV26 : CompatV24() {
-    /**
-     * In Oreo and higher, you must create a channel for all notifications.
-     * This will create the channel if it doesn't exist, or if it exists it will update the name.
-     */
-    override fun setupNotificationChannel(context: Context) {
-        NotificationChannels.setup(context)
-    }
-
     override fun setTooltipTextByContentDescription(view: View) { // Nothing to do API26+
     }
 

From 64e1c19e5fbfa5fa4dbf4f7669a022346b0c3fc2 Mon Sep 17 00:00:00 2001
From: RivanParmar <parmarrivan@gmail.com>
Date: Sat, 5 Apr 2025 00:18:18 +0530
Subject: [PATCH 170/200] Remove redundant empty check and use kotlin.Any
 instead of java.lang.Object

---
 AnkiDroid/src/main/java/com/ichi2/anki/pages/PageFragment.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/pages/PageFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/pages/PageFragment.kt
index 944eff939048..6fd3f8c3154c 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/pages/PageFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/pages/PageFragment.kt
@@ -79,10 +79,10 @@ open class PageFragment(
             return
         }
         webView.addJavascriptInterface(
-            object : Object() {
+            object : Any() {
                 @JavascriptInterface
                 fun bridgeCommandImpl(request: String) {
-                    bridgeCommands.orEmpty().getOrDefault(request) {
+                    bridgeCommands.getOrDefault(request) {
                         Timber.d("Unknown request received %s", request)
                     }()
                 }

From edc7ff1fcdeb4b38a0fe10450941d4bf16901601 Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Thu, 3 Apr 2025 21:34:55 -0300
Subject: [PATCH 171/200] fix: don't send sync notifications without the
 permission

---
 .../java/com/ichi2/anki/worker/SyncMediaWorker.kt  | 12 +++++++++---
 .../main/java/com/ichi2/anki/worker/SyncWorker.kt  | 14 ++++++++++----
 .../src/main/java/com/ichi2/utils/Permissions.kt   |  4 ++++
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/worker/SyncMediaWorker.kt b/AnkiDroid/src/main/java/com/ichi2/anki/worker/SyncMediaWorker.kt
index ac636e90afcb..0cea2387f911 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/worker/SyncMediaWorker.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/worker/SyncMediaWorker.kt
@@ -41,6 +41,7 @@ import com.ichi2.anki.R
 import com.ichi2.anki.cancelMediaSync
 import com.ichi2.anki.notifications.NotificationId
 import com.ichi2.anki.utils.ext.trySetForeground
+import com.ichi2.utils.Permissions
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.delay
 import net.ankiweb.rsdroid.Backend
@@ -50,8 +51,13 @@ class SyncMediaWorker(
     context: Context,
     parameters: WorkerParameters,
 ) : CoroutineWorker(context, parameters) {
-    private val notificationManager = NotificationManagerCompat.from(context)
     private val cancelIntent = WorkManager.getInstance(context).createCancelPendingIntent(id)
+    private val notificationManager: NotificationManagerCompat? =
+        if (Permissions.canPostNotifications(context)) {
+            NotificationManagerCompat.from(context)
+        } else {
+            null
+        }
 
     override suspend fun doWork(): Result {
         Timber.v("SyncMediaWorker::doWork")
@@ -86,7 +92,7 @@ class SyncMediaWorker(
             return Result.failure()
         } finally {
             Timber.d("SyncMediaWorker: cancelling notification")
-            notificationManager.cancel(NotificationId.SYNC_MEDIA)
+            notificationManager?.cancel(NotificationId.SYNC_MEDIA)
         }
 
         Timber.d("SyncMediaWorker: success")
@@ -132,7 +138,7 @@ class SyncMediaWorker(
         }
     }
 
-    private fun notify(notification: Notification) = notificationManager.notify(NotificationId.SYNC_MEDIA, notification)
+    private fun notify(notification: Notification) = notificationManager?.notify(NotificationId.SYNC_MEDIA, notification)
 
     private fun notify(builder: NotificationCompat.Builder.() -> Unit) {
         notify(buildNotification(builder))
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/worker/SyncWorker.kt b/AnkiDroid/src/main/java/com/ichi2/anki/worker/SyncWorker.kt
index aed0a2be0f7a..5afa492c8a9e 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/worker/SyncWorker.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/worker/SyncWorker.kt
@@ -48,6 +48,7 @@ import com.ichi2.anki.preferences.sharedPrefs
 import com.ichi2.anki.setLastSyncTimeToNow
 import com.ichi2.anki.utils.ext.trySetForeground
 import com.ichi2.libanki.syncCollection
+import com.ichi2.utils.Permissions
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
@@ -74,8 +75,13 @@ class SyncWorker(
     parameters: WorkerParameters,
 ) : CoroutineWorker(context, parameters) {
     private val workManager = WorkManager.getInstance(context)
-    private val notificationManager = NotificationManagerCompat.from(context)
-    private val cancelIntent = workManager.createCancelPendingIntent(id)
+    private val cancelIntent = WorkManager.getInstance(context).createCancelPendingIntent(id)
+    private val notificationManager: NotificationManagerCompat? =
+        if (Permissions.canPostNotifications(context)) {
+            NotificationManagerCompat.from(context)
+        } else {
+            null
+        }
 
     override suspend fun doWork(): Result {
         Timber.v("SyncWorker::doWork")
@@ -106,7 +112,7 @@ class SyncWorker(
             return Result.failure()
         } finally {
             Timber.d("SyncWorker: cancelling notification")
-            notificationManager.cancel(NotificationId.SYNC)
+            notificationManager?.cancel(NotificationId.SYNC)
         }
 
         Timber.d("SyncWorker: success")
@@ -206,7 +212,7 @@ class SyncWorker(
     }
 
     private fun notify(notification: Notification) {
-        notificationManager.notify(NotificationId.SYNC, notification)
+        notificationManager?.notify(NotificationId.SYNC, notification)
     }
 
     private fun notify(builder: NotificationCompat.Builder.() -> Unit) {
diff --git a/AnkiDroid/src/main/java/com/ichi2/utils/Permissions.kt b/AnkiDroid/src/main/java/com/ichi2/utils/Permissions.kt
index 22ee9bdbfee1..0897ebffe12a 100644
--- a/AnkiDroid/src/main/java/com/ichi2/utils/Permissions.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/utils/Permissions.kt
@@ -180,6 +180,10 @@ object Permissions {
         return Build.VERSION.SDK_INT >= Build.VERSION_CODES.R &&
             context.arePermissionsDefinedInAnkiDroidManifest(MANAGE_EXTERNAL_STORAGE)
     }
+
+    fun canPostNotifications(context: Context): Boolean =
+        Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU ||
+            ContextCompat.checkSelfPermission(context, Manifest.permission.POST_NOTIFICATIONS) == PackageManager.PERMISSION_GRANTED
 }
 
 fun Fragment.hasAnyOfPermissionsBeenDenied(permissions: Collection<String>): Boolean {

From 3c302a684a596ddcd405380eecbc19dbde4e1ed6 Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Fri, 7 Feb 2025 06:51:07 -0300
Subject: [PATCH 172/200] refactor: generify PeripheralKeymap

so it can be reused in the previewer and in the new reviewer
---
 .../anki/reviewer/PeripheralKeymapTest.kt     |  12 +-
 .../src/main/java/com/ichi2/anki/Reviewer.kt  |  32 +++---
 .../ichi2/anki/cardviewer/ViewerCommand.kt    |  14 ++-
 .../ichi2/anki/reviewer/MappableBinding.kt    |  20 ++++
 .../ichi2/anki/reviewer/PeripheralKeymap.kt   | 107 +++++-------------
 .../ichi2/anki/ReviewerKeyboardInputTest.kt   |   6 +-
 .../anki/reviewer/PeripheralKeymapTest.kt     |  11 +-
 7 files changed, 88 insertions(+), 114 deletions(-)

diff --git a/AnkiDroid/src/androidTest/java/com/ichi2/anki/reviewer/PeripheralKeymapTest.kt b/AnkiDroid/src/androidTest/java/com/ichi2/anki/reviewer/PeripheralKeymapTest.kt
index c148563b8f8b..79a4056a5e55 100644
--- a/AnkiDroid/src/androidTest/java/com/ichi2/anki/reviewer/PeripheralKeymapTest.kt
+++ b/AnkiDroid/src/androidTest/java/com/ichi2/anki/reviewer/PeripheralKeymapTest.kt
@@ -17,10 +17,9 @@ package com.ichi2.anki.reviewer
 
 import android.view.KeyEvent
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ichi2.anki.cardviewer.Gesture
 import com.ichi2.anki.cardviewer.ViewerCommand
+import com.ichi2.anki.preferences.sharedPrefs
 import com.ichi2.anki.tests.InstrumentedTest
-import com.ichi2.anki.testutil.MockReviewerUi
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
 import org.hamcrest.Matchers.hasSize
@@ -34,16 +33,11 @@ class PeripheralKeymapTest : InstrumentedTest() {
         // #7736 Ensures that a numpad key is passed through (mostly testing num lock)
         val processed: MutableList<ViewerCommand> = ArrayList()
 
+        val sharedPrefs = testContext.sharedPrefs()
         val peripheralKeymap =
-            PeripheralKeymap(MockReviewerUi.displayingAnswer()) { e: ViewerCommand, _: Gesture? -> processed.add(e) }
-        peripheralKeymap.setup()
+            PeripheralKeymap(sharedPrefs, ViewerCommand.entries) { e: ViewerCommand, _ -> processed.add(e) }
 
         peripheralKeymap.onKeyDown(
-            KeyEvent.KEYCODE_NUMPAD_1,
-            getNumpadEvent(KeyEvent.KEYCODE_NUMPAD_1),
-        )
-        peripheralKeymap.onKeyUp(
-            KeyEvent.KEYCODE_NUMPAD_1,
             getNumpadEvent(KeyEvent.KEYCODE_NUMPAD_1),
         )
         assertThat<List<ViewerCommand>>(processed, hasSize(1))
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.kt b/AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.kt
index 23a2d4cc9683..2b6543c344c4 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.kt
@@ -81,11 +81,15 @@ import com.ichi2.anki.reviewer.AnswerButtons.Companion.getBackgroundColors
 import com.ichi2.anki.reviewer.AnswerButtons.Companion.getTextColors
 import com.ichi2.anki.reviewer.AnswerTimer
 import com.ichi2.anki.reviewer.AutomaticAnswerAction
+import com.ichi2.anki.reviewer.Binding
+import com.ichi2.anki.reviewer.BindingProcessor
 import com.ichi2.anki.reviewer.CardMarker
+import com.ichi2.anki.reviewer.CardSide
 import com.ichi2.anki.reviewer.FullScreenMode
 import com.ichi2.anki.reviewer.FullScreenMode.Companion.fromPreference
 import com.ichi2.anki.reviewer.FullScreenMode.Companion.isFullScreenReview
 import com.ichi2.anki.reviewer.PeripheralKeymap
+import com.ichi2.anki.reviewer.ReviewerBinding
 import com.ichi2.anki.reviewer.ReviewerUi
 import com.ichi2.anki.scheduling.ForgetCardsDialog
 import com.ichi2.anki.scheduling.SetDueDateDialog
@@ -135,7 +139,8 @@ import kotlin.coroutines.resume
 @NeedsTest("#14709: Timebox shouldn't appear instantly when the Reviewer is opened")
 open class Reviewer :
     AbstractFlashcardViewer(),
-    ReviewerUi {
+    ReviewerUi,
+    BindingProcessor<ReviewerBinding, ViewerCommand> {
     private var queueState: CurrentQueueState? = null
     private val customSchedulingKey = TimeManager.time.intTimeMS().toString()
     private var hasDrawerSwipeConflicts = false
@@ -199,7 +204,7 @@ open class Reviewer :
     private lateinit var toolbar: Toolbar
 
     @VisibleForTesting
-    protected val processor = PeripheralKeymap(this, this)
+    protected open lateinit var processor: PeripheralKeymap<ReviewerBinding, ViewerCommand>
 
     private val addNoteLauncher =
         registerForActivityResult(
@@ -224,6 +229,7 @@ open class Reviewer :
         textBarReview = findViewById(R.id.review_number)
         toolbar = findViewById(R.id.toolbar)
         micToolBarLayer = findViewById(R.id.mic_tool_bar_layer)
+        processor = PeripheralKeymap(sharedPrefs(), ViewerCommand.entries, this)
         if (sharedPrefs().getString("answerButtonPosition", "bottom") == "bottom" && !navBarNeedsScrim) {
             setNavigationBarColor(R.attr.showAnswerColor)
         }
@@ -909,22 +915,12 @@ open class Reviewer :
         if (answerFieldIsFocused()) {
             return super.onKeyDown(keyCode, event)
         }
-        if (processor.onKeyDown(keyCode, event) || super.onKeyDown(keyCode, event)) {
+        if (processor.onKeyDown(event) || super.onKeyDown(keyCode, event)) {
             return true
         }
         return false
     }
 
-    override fun onKeyUp(
-        keyCode: Int,
-        event: KeyEvent,
-    ): Boolean =
-        if (processor.onKeyUp(keyCode, event)) {
-            true
-        } else {
-            super.onKeyUp(keyCode, event)
-        }
-
     override fun onGenericMotionEvent(event: MotionEvent?): Boolean {
         if (motionEventHandler.onGenericMotionEvent(event)) {
             return true
@@ -980,7 +976,6 @@ open class Reviewer :
         val preferences = super.restorePreferences()
         prefHideDueCount = preferences.getBoolean("hideDueCount", false)
         prefShowETA = preferences.getBoolean("showETA", false)
-        processor.setup()
         prefFullscreenReview = isFullScreenReview(preferences)
         actionButtons.setup(preferences)
         return preferences
@@ -1673,4 +1668,13 @@ open class Reviewer :
                 Intent(context, Reviewer::class.java)
             }
     }
+
+    override fun processAction(
+        action: ViewerCommand,
+        binding: ReviewerBinding,
+    ): Boolean {
+        if (binding.side != CardSide.BOTH && CardSide.fromAnswer(isDisplayingAnswer) != binding.side) return false
+        val gesture = (binding.binding as? Binding.GestureInput)?.gesture
+        return executeCommand(action, gesture)
+    }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/ViewerCommand.kt b/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/ViewerCommand.kt
index 526bdc9164b9..a3273bd23f8e 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/ViewerCommand.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/ViewerCommand.kt
@@ -15,6 +15,7 @@
  */
 package com.ichi2.anki.cardviewer
 
+import android.content.SharedPreferences
 import android.view.KeyEvent
 import com.ichi2.anki.reviewer.Binding.Companion.keyCode
 import com.ichi2.anki.reviewer.Binding.Companion.unicode
@@ -22,11 +23,11 @@ import com.ichi2.anki.reviewer.Binding.ModifierKeys
 import com.ichi2.anki.reviewer.Binding.ModifierKeys.Companion.ctrl
 import com.ichi2.anki.reviewer.Binding.ModifierKeys.Companion.shift
 import com.ichi2.anki.reviewer.CardSide
-import com.ichi2.anki.reviewer.MappableBinding
+import com.ichi2.anki.reviewer.MappableAction
 import com.ichi2.anki.reviewer.ReviewerBinding
 
 /** Abstraction: Discuss moving many of these to 'Reviewer'  */
-enum class ViewerCommand {
+enum class ViewerCommand : MappableAction<ReviewerBinding> {
     SHOW_ANSWER,
     FLIP_OR_ANSWER_EASE1,
     FLIP_OR_ANSWER_EASE2,
@@ -78,11 +79,16 @@ enum class ViewerCommand {
     USER_ACTION_9,
     ;
 
-    val preferenceKey: String
+    override val preferenceKey: String
         get() = "binding_$name"
 
+    override fun getBindings(prefs: SharedPreferences): List<ReviewerBinding> {
+        val prefValue = prefs.getString(preferenceKey, null) ?: return defaultValue
+        return ReviewerBinding.fromPreferenceString(prefValue)
+    }
+
     // If we use the serialised format, then this adds additional coupling to the properties.
-    val defaultValue: List<MappableBinding>
+    val defaultValue: List<ReviewerBinding>
         get() {
             return when (this) {
                 FLIP_OR_ANSWER_EASE1 ->
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MappableBinding.kt b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MappableBinding.kt
index 8250e5663eb6..048b80d4ccb2 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MappableBinding.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MappableBinding.kt
@@ -17,6 +17,7 @@
 package com.ichi2.anki.reviewer
 
 import android.content.Context
+import android.content.SharedPreferences
 import androidx.annotation.CheckResult
 import com.ichi2.anki.reviewer.Binding.KeyBinding
 import com.ichi2.utils.hash
@@ -73,3 +74,22 @@ open class MappableBinding(
         }
     }
 }
+
+/**
+ * Action that can be triggered through a [Binding], like a gesture or a key press.
+ *
+ * The bindings can be configured with a [MappableBinding] ([B]) in
+ * the settings, by changing the preference with the corresponding [preferenceKey].
+ */
+interface MappableAction<B : MappableBinding> {
+    val preferenceKey: String
+
+    fun getBindings(prefs: SharedPreferences): List<B>
+}
+
+fun interface BindingProcessor<B : MappableBinding, A : MappableAction<B>> {
+    fun processAction(
+        action: A,
+        binding: B,
+    ): Boolean
+}
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/PeripheralKeymap.kt b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/PeripheralKeymap.kt
index 99d5f0936d46..b7d07bc1e7a0 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/PeripheralKeymap.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/PeripheralKeymap.kt
@@ -18,94 +18,47 @@ package com.ichi2.anki.reviewer
 
 import android.content.SharedPreferences
 import android.view.KeyEvent
-import com.ichi2.anki.AnkiDroidApp
-import com.ichi2.anki.cardviewer.ViewerCommand
 import com.ichi2.anki.preferences.sharedPrefs
 import com.ichi2.anki.reviewer.Binding.Companion.possibleKeyBindings
-import com.ichi2.anki.reviewer.CardSide.Companion.fromAnswer
 
-/** Accepts peripheral input, mapping via various keybinding strategies,
- * and converting them to commands for the Reviewer.  */
-class PeripheralKeymap(
-    reviewerUi: ReviewerUi,
-    commandProcessor: ViewerCommand.CommandProcessor,
+/**
+ * Maps the [MappableAction] ([A]) with their configured [MappableBinding] ([B]).
+ *
+ * That way, [onKeyDown] can be used to detect key presses and trigger their actions.
+ */
+class PeripheralKeymap<B : MappableBinding, A : MappableAction<B>>(
+    sharedPrefs: SharedPreferences,
+    actions: List<A>,
+    private val processor: BindingProcessor<B, A>,
 ) {
-    private val keyMap: KeyMap = KeyMap(commandProcessor, reviewerUi)
-    private var hasSetup = false
-
-    fun setup() {
-        val preferences = AnkiDroidApp.instance.sharedPrefs()
-        setup(preferences)
-    }
-
-    fun setup(preferences: SharedPreferences) {
-        for (command in ViewerCommand.entries) {
-            add(command, preferences)
-        }
-        hasSetup = true
-    }
+    private val bindingMap = HashMap<Binding, List<Pair<A, B>>>()
 
-    private fun add(
-        command: ViewerCommand,
-        preferences: SharedPreferences,
-    ) {
-        val bindings =
-            ReviewerBinding
-                .fromPreference(preferences, command)
-                .filterIsInstance<ReviewerBinding>()
-        for (b in bindings) {
-            if (!b.isKey) {
-                continue
+    init {
+        for (action in actions) {
+            val mappableBindings = action.getBindings(sharedPrefs)
+            for (mappableBinding in mappableBindings) {
+                if (!mappableBinding.isKey) continue
+                val binding = mappableBinding.binding
+                if (binding in bindingMap) {
+                    (bindingMap[binding] as MutableList).add(action to mappableBinding)
+                } else {
+                    bindingMap[binding] = mutableListOf(action to mappableBinding)
+                }
             }
-            keyMap[b] = command
         }
     }
 
-    fun onKeyDown(
-        keyCode: Int,
-        event: KeyEvent,
-    ): Boolean =
-        if (!hasSetup || event.repeatCount > 0) {
-            false
-        } else {
-            keyMap.onKeyDown(keyCode, event)
+    fun onKeyDown(event: KeyEvent): Boolean {
+        if (event.repeatCount > 0) {
+            return false
         }
-
-    @Suppress("UNUSED_PARAMETER")
-    fun onKeyUp(
-        keyCode: Int,
-        event: KeyEvent?,
-    ): Boolean = false
-
-    class KeyMap(
-        private val processor: ViewerCommand.CommandProcessor,
-        private val reviewerUI: ReviewerUi,
-    ) {
-        val bindingMap = HashMap<MappableBinding, ViewerCommand>()
-
-        @Suppress("UNUSED_PARAMETER")
-        fun onKeyDown(
-            keyCode: Int,
-            event: KeyEvent?,
-        ): Boolean {
-            var ret = false
-            val bindings = possibleKeyBindings(event!!)
-            val side = fromAnswer(reviewerUI.isDisplayingAnswer)
-            for (b in bindings) {
-                val binding = ReviewerBinding(b, side)
-                val command = bindingMap[binding] ?: continue
-                ret = ret or processor.executeCommand(command, fromGesture = null)
+        val bindings = possibleKeyBindings(event)
+        for (binding in bindings) {
+            val actionAndMappableBindings = bindingMap[binding] ?: continue
+            for ((action, mappableBinding) in actionAndMappableBindings) {
+                if (processor.processAction(action, mappableBinding)) return true
             }
-            return ret
         }
-
-        operator fun set(
-            key: MappableBinding,
-            value: ViewerCommand,
-        ) {
-            bindingMap[key] = value
-        }
-
-        operator fun get(key: MappableBinding): ViewerCommand? = bindingMap[key]
+        return false
     }
 }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerKeyboardInputTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerKeyboardInputTest.kt
index 69b2b12d9d70..725f0d5da7e5 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerKeyboardInputTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerKeyboardInputTest.kt
@@ -44,6 +44,7 @@ import com.ichi2.anki.cardviewer.ViewerCommand
 import com.ichi2.anki.reviewer.Binding.Companion.keyCode
 import com.ichi2.anki.reviewer.Binding.ModifierKeys
 import com.ichi2.anki.reviewer.CardSide
+import com.ichi2.anki.reviewer.PeripheralKeymap
 import com.ichi2.anki.reviewer.ReviewerBinding
 import com.ichi2.anki.utils.ext.addBinding
 import com.ichi2.libanki.Card
@@ -259,6 +260,9 @@ class ReviewerKeyboardInputTest : RobolectricTest() {
             displayAnswer = true
         }
 
+        override var processor: PeripheralKeymap<ReviewerBinding, ViewerCommand> =
+            PeripheralKeymap(sharedPrefs(), ViewerCommand.entries, this)
+
         override fun answerFieldIsFocused(): Boolean = focusTextField
 
         override fun displayCardAnswer() {
@@ -448,7 +452,6 @@ class ReviewerKeyboardInputTest : RobolectricTest() {
             fun displayingAnswer(): KeyboardInputTestReviewer {
                 val keyboardInputTestReviewer = KeyboardInputTestReviewer()
                 displayAnswer = true
-                keyboardInputTestReviewer.processor.setup()
                 return keyboardInputTestReviewer
             }
 
@@ -456,7 +459,6 @@ class ReviewerKeyboardInputTest : RobolectricTest() {
             fun displayingQuestion(): KeyboardInputTestReviewer {
                 val keyboardInputTestReviewer = KeyboardInputTestReviewer()
                 displayAnswer = false
-                keyboardInputTestReviewer.processor.setup()
                 return keyboardInputTestReviewer
             }
         }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/PeripheralKeymapTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/PeripheralKeymapTest.kt
index 8e610325b37e..6fcb2ccd3da4 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/PeripheralKeymapTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/PeripheralKeymapTest.kt
@@ -30,8 +30,8 @@ class PeripheralKeymapTest {
     fun flagAndAnswerDoNotConflict() {
         val processed: MutableList<ViewerCommand> = ArrayList()
 
-        val peripheralKeymap = PeripheralKeymap(MockReviewerUi()) { e: ViewerCommand, _ -> processed.add(e) }
-        peripheralKeymap.setup(SPMockBuilder().createSharedPreferences())
+        val sharedPrefs = SPMockBuilder().createSharedPreferences()
+        val peripheralKeymap = PeripheralKeymap(sharedPrefs, ViewerCommand.entries) { e: ViewerCommand, _ -> processed.add(e) }
         val event = mock(KeyEvent::class.java)
         whenever(event.unicodeChar).thenReturn(0)
         whenever(event.isCtrlPressed).thenReturn(true)
@@ -40,14 +40,9 @@ class PeripheralKeymapTest {
 
         assertThat(event.unicodeChar.toChar(), equalTo('\u0000'))
         assertThat(event.getUnicodeChar(0).toChar(), equalTo('1'))
-        peripheralKeymap.onKeyDown(KeyEvent.KEYCODE_1, event)
+        peripheralKeymap.onKeyDown(event)
 
         assertThat<List<ViewerCommand>>(processed, hasSize(1))
         assertThat(processed[0], equalTo(ViewerCommand.TOGGLE_FLAG_RED))
     }
-
-    private class MockReviewerUi : ReviewerUi {
-        override val isDisplayingAnswer: Boolean
-            get() = false
-    }
 }

From 4a7ffdd40a730693496873804e7c41423f424461 Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Fri, 7 Feb 2025 07:07:08 -0300
Subject: [PATCH 173/200] feat: implement keybindings in the new reviewer

---
 .../anki/preferences/reviewer/ViewerAction.kt | 77 ++++++++++++++++++-
 .../ui/windows/reviewer/ReviewerFragment.kt   | 37 +++++++--
 2 files changed, 108 insertions(+), 6 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ViewerAction.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ViewerAction.kt
index 9f9038e9ed53..17c89fe3a187 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ViewerAction.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ViewerAction.kt
@@ -15,6 +15,8 @@
  */
 package com.ichi2.anki.preferences.reviewer
 
+import android.content.SharedPreferences
+import android.view.KeyEvent
 import androidx.annotation.DrawableRes
 import androidx.annotation.IdRes
 import androidx.annotation.StringRes
@@ -23,6 +25,13 @@ import com.ichi2.anki.R
 import com.ichi2.anki.preferences.reviewer.MenuDisplayType.ALWAYS
 import com.ichi2.anki.preferences.reviewer.MenuDisplayType.DISABLED
 import com.ichi2.anki.preferences.reviewer.MenuDisplayType.MENU_ONLY
+import com.ichi2.anki.reviewer.Binding
+import com.ichi2.anki.reviewer.Binding.ModifierKeys
+import com.ichi2.anki.reviewer.Binding.ModifierKeys.Companion.ctrl
+import com.ichi2.anki.reviewer.Binding.ModifierKeys.Companion.shift
+import com.ichi2.anki.reviewer.CardSide
+import com.ichi2.anki.reviewer.MappableAction
+import com.ichi2.anki.reviewer.ReviewerBinding
 
 /**
  * @param menuId menu Id of the action
@@ -37,7 +46,7 @@ enum class ViewerAction(
     @StringRes val titleRes: Int = R.string.empty_string,
     val defaultDisplayType: MenuDisplayType? = null,
     val parentMenu: ViewerAction? = null,
-) {
+) : MappableAction<ReviewerBinding> {
     // Always
     UNDO(R.id.action_undo, R.drawable.ic_undo_white, R.string.undo, ALWAYS),
 
@@ -80,8 +89,74 @@ enum class ViewerAction(
     FLAG_PURPLE(Flag.PURPLE.id, Flag.PURPLE.drawableRes, parentMenu = FLAG_MENU),
     ;
 
+    override val preferenceKey: String get() = "binding_$name"
+
+    override fun getBindings(prefs: SharedPreferences): List<ReviewerBinding> {
+        val prefValue = prefs.getString(preferenceKey, null) ?: return defaultBindings
+        return ReviewerBinding.fromPreferenceString(prefValue)
+    }
+
+    private val defaultBindings: List<ReviewerBinding> get() =
+        when (this) {
+            UNDO -> listOf(keycode(KeyEvent.KEYCODE_Z, ctrl()))
+            REDO -> listOf(keycode(KeyEvent.KEYCODE_Z, ModifierKeys(shift = true, ctrl = true, alt = false)))
+            MARK -> listOf(unicode('*'))
+            EDIT -> listOf(keycode(KeyEvent.KEYCODE_E))
+            ADD_NOTE -> listOf(keycode(KeyEvent.KEYCODE_A))
+            BURY_NOTE -> listOf(unicode('='))
+            BURY_CARD -> listOf(unicode('-'))
+            SUSPEND_NOTE -> listOf(unicode('!'))
+            SUSPEND_CARD -> listOf(unicode('@'))
+            TOGGLE_AUTO_ADVANCE -> listOf(keycode(KeyEvent.KEYCODE_A, shift()))
+            // No default gestures
+            DELETE,
+            CARD_INFO,
+            USER_ACTION_1,
+            USER_ACTION_2,
+            USER_ACTION_3,
+            USER_ACTION_4,
+            USER_ACTION_5,
+            USER_ACTION_6,
+            USER_ACTION_7,
+            USER_ACTION_8,
+            USER_ACTION_9,
+            // Menu flag actions. They set the flag, but don't toggle it
+            UNSET_FLAG,
+            FLAG_RED,
+            FLAG_ORANGE,
+            FLAG_BLUE,
+            FLAG_GREEN,
+            FLAG_PINK,
+            FLAG_TURQUOISE,
+            FLAG_PURPLE,
+            // Menu only
+            DECK_OPTIONS,
+            BURY_MENU,
+            SUSPEND_MENU,
+            FLAG_MENU,
+            -> emptyList()
+        }
+
     fun isSubMenu() = ViewerAction.entries.any { it.parentMenu == this }
 
+    private fun keycode(
+        keycode: Int,
+        keys: ModifierKeys = ModifierKeys.none(),
+        side: CardSide = CardSide.BOTH,
+    ): ReviewerBinding {
+        val binding = Binding.keyCode(keycode, keys)
+        return ReviewerBinding(binding = binding, side = side)
+    }
+
+    private fun unicode(
+        unicodeChar: Char,
+        keys: ModifierKeys = ModifierKeys.none(),
+        side: CardSide = CardSide.BOTH,
+    ): ReviewerBinding {
+        val binding = Binding.unicode(unicodeChar, keys)
+        return ReviewerBinding(binding = binding, side = side)
+    }
+
     companion object {
         fun fromId(
             @IdRes id: Int,
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt
index 7cbebf419a6f..e0990e398915 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt
@@ -20,6 +20,7 @@ import android.content.Intent
 import android.os.Bundle
 import android.text.SpannableString
 import android.text.style.UnderlineSpan
+import android.view.KeyEvent
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
@@ -51,6 +52,7 @@ import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textview.MaterialTextView
 import com.ichi2.anki.AbstractFlashcardViewer.Companion.RESULT_NO_MORE_CARDS
 import com.ichi2.anki.CollectionManager
+import com.ichi2.anki.DispatchKeyEventListener
 import com.ichi2.anki.Flag
 import com.ichi2.anki.NoteEditor
 import com.ichi2.anki.R
@@ -93,6 +95,10 @@ import com.ichi2.anki.preferences.reviewer.ViewerAction.USER_ACTION_8
 import com.ichi2.anki.preferences.reviewer.ViewerAction.USER_ACTION_9
 import com.ichi2.anki.previewer.CardViewerActivity
 import com.ichi2.anki.previewer.CardViewerFragment
+import com.ichi2.anki.reviewer.BindingProcessor
+import com.ichi2.anki.reviewer.CardSide
+import com.ichi2.anki.reviewer.PeripheralKeymap
+import com.ichi2.anki.reviewer.ReviewerBinding
 import com.ichi2.anki.settings.Prefs
 import com.ichi2.anki.settings.enums.FrameStyle
 import com.ichi2.anki.settings.enums.HideSystemBars
@@ -111,7 +117,9 @@ import kotlinx.coroutines.launch
 class ReviewerFragment :
     CardViewerFragment(R.layout.reviewer2),
     BaseSnackbarBuilderProvider,
-    ActionMenuView.OnMenuItemClickListener {
+    ActionMenuView.OnMenuItemClickListener,
+    BindingProcessor<ReviewerBinding, ViewerAction>,
+    DispatchKeyEventListener {
     override val viewModel: ReviewerViewModel by viewModels {
         ReviewerViewModel.factory(CardMediaPlayer())
     }
@@ -123,6 +131,8 @@ class ReviewerFragment :
         anchorView = this@ReviewerFragment.view?.findViewById(R.id.snackbar_anchor)
     }
 
+    private lateinit var keyMap: PeripheralKeymap<ReviewerBinding, ViewerAction>
+
     override fun onStop() {
         super.onStop()
         if (!requireActivity().isChangingConfigurations) {
@@ -135,6 +145,7 @@ class ReviewerFragment :
         savedInstanceState: Bundle?,
     ) {
         super.onViewCreated(view, savedInstanceState)
+        keyMap = PeripheralKeymap(sharedPrefs(), ViewerAction.entries, this)
 
         view.findViewById<AppCompatImageButton>(R.id.back_button).setOnClickListener {
             requireActivity().finish()
@@ -173,10 +184,7 @@ class ReviewerFragment :
         }
     }
 
-    // TODO
-    override fun onMenuItemClick(item: MenuItem): Boolean {
-        if (item.hasSubMenu()) return false
-        val action = ViewerAction.fromId(item.itemId)
+    private fun executeAction(action: ViewerAction): Boolean {
         when (action) {
             ADD_NOTE -> launchAddNote()
             CARD_INFO -> launchCardInfo()
@@ -261,6 +269,25 @@ class ReviewerFragment :
         webView.settings.loadWithOverviewMode = true
     }
 
+    override fun dispatchKeyEvent(event: KeyEvent): Boolean {
+        if (event.action != KeyEvent.ACTION_DOWN) return false
+        return keyMap.onKeyDown(event)
+    }
+
+    override fun processAction(
+        action: ViewerAction,
+        binding: ReviewerBinding,
+    ): Boolean {
+        if (binding.side != CardSide.BOTH && CardSide.fromAnswer(viewModel.showingAnswer.value) != binding.side) return false
+        return executeAction(action)
+    }
+
+    override fun onMenuItemClick(item: MenuItem): Boolean {
+        if (item.hasSubMenu()) return false
+        val action = ViewerAction.fromId(item.itemId)
+        return executeAction(action)
+    }
+
     private fun setupAnswerButtons(view: View) {
         val prefs = sharedPrefs()
         val answerButtonsLayout = view.findViewById<LinearLayout>(R.id.answer_buttons)

From cb00db4065816cd7f5723ee3688456f4c13b81f2 Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Fri, 7 Feb 2025 07:53:39 -0300
Subject: [PATCH 174/200] refactor: move executeAction to viewModel

also make a lot of methods private, now that it is a possibility
---
 .../ui/windows/reviewer/ReviewerFragment.kt   | 103 +------
 .../ui/windows/reviewer/ReviewerViewModel.kt  | 260 ++++++++++--------
 2 files changed, 157 insertions(+), 206 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt
index e0990e398915..0adb2543f7a7 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt
@@ -53,46 +53,24 @@ import com.google.android.material.textview.MaterialTextView
 import com.ichi2.anki.AbstractFlashcardViewer.Companion.RESULT_NO_MORE_CARDS
 import com.ichi2.anki.CollectionManager
 import com.ichi2.anki.DispatchKeyEventListener
-import com.ichi2.anki.Flag
 import com.ichi2.anki.NoteEditor
 import com.ichi2.anki.R
 import com.ichi2.anki.cardviewer.CardMediaPlayer
 import com.ichi2.anki.noteeditor.NoteEditorLauncher
+import com.ichi2.anki.pages.CardInfoDestination
+import com.ichi2.anki.pages.DeckOptionsDestination
 import com.ichi2.anki.preferences.reviewer.ReviewerMenuView
 import com.ichi2.anki.preferences.reviewer.ViewerAction
-import com.ichi2.anki.preferences.reviewer.ViewerAction.ADD_NOTE
 import com.ichi2.anki.preferences.reviewer.ViewerAction.BURY_CARD
 import com.ichi2.anki.preferences.reviewer.ViewerAction.BURY_MENU
 import com.ichi2.anki.preferences.reviewer.ViewerAction.BURY_NOTE
-import com.ichi2.anki.preferences.reviewer.ViewerAction.CARD_INFO
-import com.ichi2.anki.preferences.reviewer.ViewerAction.DECK_OPTIONS
-import com.ichi2.anki.preferences.reviewer.ViewerAction.DELETE
-import com.ichi2.anki.preferences.reviewer.ViewerAction.EDIT
-import com.ichi2.anki.preferences.reviewer.ViewerAction.FLAG_BLUE
-import com.ichi2.anki.preferences.reviewer.ViewerAction.FLAG_GREEN
 import com.ichi2.anki.preferences.reviewer.ViewerAction.FLAG_MENU
-import com.ichi2.anki.preferences.reviewer.ViewerAction.FLAG_ORANGE
-import com.ichi2.anki.preferences.reviewer.ViewerAction.FLAG_PINK
-import com.ichi2.anki.preferences.reviewer.ViewerAction.FLAG_PURPLE
-import com.ichi2.anki.preferences.reviewer.ViewerAction.FLAG_RED
-import com.ichi2.anki.preferences.reviewer.ViewerAction.FLAG_TURQUOISE
 import com.ichi2.anki.preferences.reviewer.ViewerAction.MARK
 import com.ichi2.anki.preferences.reviewer.ViewerAction.REDO
 import com.ichi2.anki.preferences.reviewer.ViewerAction.SUSPEND_CARD
 import com.ichi2.anki.preferences.reviewer.ViewerAction.SUSPEND_MENU
 import com.ichi2.anki.preferences.reviewer.ViewerAction.SUSPEND_NOTE
-import com.ichi2.anki.preferences.reviewer.ViewerAction.TOGGLE_AUTO_ADVANCE
 import com.ichi2.anki.preferences.reviewer.ViewerAction.UNDO
-import com.ichi2.anki.preferences.reviewer.ViewerAction.UNSET_FLAG
-import com.ichi2.anki.preferences.reviewer.ViewerAction.USER_ACTION_1
-import com.ichi2.anki.preferences.reviewer.ViewerAction.USER_ACTION_2
-import com.ichi2.anki.preferences.reviewer.ViewerAction.USER_ACTION_3
-import com.ichi2.anki.preferences.reviewer.ViewerAction.USER_ACTION_4
-import com.ichi2.anki.preferences.reviewer.ViewerAction.USER_ACTION_5
-import com.ichi2.anki.preferences.reviewer.ViewerAction.USER_ACTION_6
-import com.ichi2.anki.preferences.reviewer.ViewerAction.USER_ACTION_7
-import com.ichi2.anki.preferences.reviewer.ViewerAction.USER_ACTION_8
-import com.ichi2.anki.preferences.reviewer.ViewerAction.USER_ACTION_9
 import com.ichi2.anki.previewer.CardViewerActivity
 import com.ichi2.anki.previewer.CardViewerFragment
 import com.ichi2.anki.reviewer.BindingProcessor
@@ -182,45 +160,16 @@ class ReviewerFragment :
         viewModel.showingAnswer.collectIn(lifecycleScope) {
             resetZoom()
         }
-    }
 
-    private fun executeAction(action: ViewerAction): Boolean {
-        when (action) {
-            ADD_NOTE -> launchAddNote()
-            CARD_INFO -> launchCardInfo()
-            DECK_OPTIONS -> launchDeckOptions()
-            EDIT -> launchEditNote()
-            DELETE -> viewModel.deleteNote()
-            MARK -> viewModel.toggleMark()
-            REDO -> viewModel.redo()
-            UNDO -> viewModel.undo()
-            TOGGLE_AUTO_ADVANCE -> viewModel.toggleAutoAdvance()
-            BURY_NOTE -> viewModel.buryNote()
-            BURY_CARD -> viewModel.buryCard()
-            SUSPEND_NOTE -> viewModel.suspendNote()
-            SUSPEND_CARD -> viewModel.suspendCard()
-            UNSET_FLAG -> viewModel.setFlag(Flag.NONE)
-            FLAG_RED -> viewModel.setFlag(Flag.RED)
-            FLAG_ORANGE -> viewModel.setFlag(Flag.ORANGE)
-            FLAG_BLUE -> viewModel.setFlag(Flag.BLUE)
-            FLAG_GREEN -> viewModel.setFlag(Flag.GREEN)
-            FLAG_PINK -> viewModel.setFlag(Flag.PINK)
-            FLAG_TURQUOISE -> viewModel.setFlag(Flag.TURQUOISE)
-            FLAG_PURPLE -> viewModel.setFlag(Flag.PURPLE)
-            USER_ACTION_1 -> viewModel.userAction(1)
-            USER_ACTION_2 -> viewModel.userAction(2)
-            USER_ACTION_3 -> viewModel.userAction(3)
-            USER_ACTION_4 -> viewModel.userAction(4)
-            USER_ACTION_5 -> viewModel.userAction(5)
-            USER_ACTION_6 -> viewModel.userAction(6)
-            USER_ACTION_7 -> viewModel.userAction(7)
-            USER_ACTION_8 -> viewModel.userAction(8)
-            USER_ACTION_9 -> viewModel.userAction(9)
-            SUSPEND_MENU -> viewModel.suspendCard()
-            BURY_MENU -> viewModel.buryCard()
-            FLAG_MENU -> return false
+        viewModel.destinationFlow.collectIn(lifecycleScope) { destination ->
+            val intent = destination.toIntent(requireContext())
+            when (destination) {
+                is NoteEditorLauncher.EditNoteFromPreviewer -> noteEditorLauncher.launch(intent)
+                is NoteEditorLauncher.AddNote -> noteEditorLauncher.launch(intent)
+                is DeckOptionsDestination -> deckOptionsLauncher.launch(intent)
+                is CardInfoDestination -> startActivity(intent)
+            }
         }
-        return true
     }
 
     private fun setupTypeAnswer(view: View) {
@@ -279,13 +228,15 @@ class ReviewerFragment :
         binding: ReviewerBinding,
     ): Boolean {
         if (binding.side != CardSide.BOTH && CardSide.fromAnswer(viewModel.showingAnswer.value) != binding.side) return false
-        return executeAction(action)
+        viewModel.executeAction(action)
+        return true
     }
 
     override fun onMenuItemClick(item: MenuItem): Boolean {
         if (item.hasSubMenu()) return false
         val action = ViewerAction.fromId(item.itemId)
-        return executeAction(action)
+        viewModel.executeAction(action)
+        return true
     }
 
     private fun setupAnswerButtons(view: View) {
@@ -538,37 +489,11 @@ class ReviewerFragment :
             }
         }
 
-    private fun launchEditNote() {
-        lifecycleScope.launch {
-            val intent = viewModel.getEditNoteDestination().toIntent(requireContext())
-            noteEditorLauncher.launch(intent)
-        }
-    }
-
-    private fun launchAddNote() {
-        val intent = NoteEditorLauncher.AddNoteFromReviewer().toIntent(requireContext())
-        noteEditorLauncher.launch(intent)
-    }
-
-    private fun launchCardInfo() {
-        lifecycleScope.launch {
-            val intent = viewModel.getCardInfoDestination().toIntent(requireContext())
-            startActivity(intent)
-        }
-    }
-
     private val deckOptionsLauncher =
         registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
             viewModel.refreshCard()
         }
 
-    private fun launchDeckOptions() {
-        lifecycleScope.launch {
-            val intent = viewModel.getDeckOptionsDestination().toIntent(requireContext())
-            deckOptionsLauncher.launch(intent)
-        }
-    }
-
     companion object {
         fun getIntent(context: Context): Intent = CardViewerActivity.getIntent(context, ReviewerFragment::class)
     }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModel.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModel.kt
index bbb19058ea6a..2938e714da4b 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModel.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModel.kt
@@ -36,6 +36,7 @@ import com.ichi2.anki.pages.AnkiServer
 import com.ichi2.anki.pages.CardInfoDestination
 import com.ichi2.anki.pages.DeckOptionsDestination
 import com.ichi2.anki.preferences.getShowIntervalOnButtons
+import com.ichi2.anki.preferences.reviewer.ViewerAction
 import com.ichi2.anki.previewer.CardViewerViewModel
 import com.ichi2.anki.previewer.TypeAnswer
 import com.ichi2.anki.reviewer.CardSide
@@ -44,6 +45,7 @@ import com.ichi2.anki.servicelayer.NoteService
 import com.ichi2.anki.servicelayer.isBuryNoteAvailable
 import com.ichi2.anki.servicelayer.isSuspendNoteAvailable
 import com.ichi2.anki.ui.windows.reviewer.autoadvance.AutoAdvance
+import com.ichi2.anki.utils.Destination
 import com.ichi2.anki.utils.ext.flag
 import com.ichi2.anki.utils.ext.setUserFlagForCards
 import com.ichi2.libanki.ChangeManager
@@ -82,6 +84,7 @@ class ReviewerViewModel(
     val redoLabelFlow = MutableStateFlow<String?>(null)
     val countsFlow = MutableStateFlow(Counts() to Counts.Queue.NEW)
     val typeAnswerFlow = MutableStateFlow<TypeAnswer?>(null)
+    val destinationFlow = MutableSharedFlow<Destination>()
 
     override val server = AnkiServer(this).also { it.start() }
     private val stateMutationKey = TimeManager.time.intTimeMS().toString()
@@ -177,30 +180,31 @@ class ReviewerViewModel(
 
     fun answerEasy() = answerCard(Ease.EASY)
 
-    fun toggleMark() {
-        launchCatchingIO {
-            val card = currentCard.await()
-            val note = withCol { card.note(this@withCol) }
-            NoteService.toggleMark(note)
-            isMarkedFlow.emit(NoteService.isMarked(note))
-        }
+    private suspend fun toggleMark() {
+        val card = currentCard.await()
+        val note = withCol { card.note(this@withCol) }
+        NoteService.toggleMark(note)
+        isMarkedFlow.emit(NoteService.isMarked(note))
     }
 
-    fun setFlag(flag: Flag) {
-        launchCatchingIO {
-            val card = currentCard.await()
-            undoableOp {
-                setUserFlagForCards(listOf(card.id), flag)
-            }
-            flagFlow.emit(flag)
+    private suspend fun setFlag(flag: Flag) {
+        val card = currentCard.await()
+        undoableOp {
+            setUserFlagForCards(listOf(card.id), flag)
         }
+        flagFlow.emit(flag)
     }
 
     fun onStateMutationCallback() {
         statesMutated = true
     }
 
-    suspend fun getEditNoteDestination(): NoteEditorLauncher = NoteEditorLauncher.EditNoteFromPreviewer(currentCard.await().id)
+    private suspend fun emitEditNoteDestination() {
+        val destination = NoteEditorLauncher.EditNoteFromPreviewer(currentCard.await().id)
+        destinationFlow.emit(destination)
+    }
+
+    private suspend fun emitAddNoteDestination() = destinationFlow.emit(NoteEditorLauncher.AddNoteFromReviewer())
 
     fun refreshCard() {
         launchCatchingIO {
@@ -208,137 +212,119 @@ class ReviewerViewModel(
         }
     }
 
-    suspend fun getCardInfoDestination(): CardInfoDestination = CardInfoDestination(currentCard.await().id)
+    private suspend fun emitCardInfoDestination() {
+        val destination = CardInfoDestination(currentCard.await().id)
+        destinationFlow.emit(destination)
+    }
 
-    suspend fun getDeckOptionsDestination(): DeckOptionsDestination {
+    private suspend fun emitDeckOptionsDestination() {
         val deckId = withCol { decks.getCurrentId() }
         val isFiltered = withCol { decks.isFiltered(deckId) }
-        return DeckOptionsDestination(deckId, isFiltered)
+        val destination = DeckOptionsDestination(deckId, isFiltered)
+        destinationFlow.emit(destination)
     }
 
-    fun deleteNote() {
-        launchCatchingIO {
-            val cardId = currentCard.await().id
-            val noteCount =
-                undoableOp {
-                    removeNotes(cids = listOf(cardId))
-                }.count
-            actionFeedbackFlow.emit(CollectionManager.TR.browsingCardsDeleted(noteCount))
-            updateCurrentCard()
-        }
-    }
-
-    fun buryCard() {
-        launchCatchingIO {
-            val cardId = currentCard.await().id
-            val noteCount =
-                undoableOp {
-                    sched.buryCards(cids = listOf(cardId))
-                }.count
-            actionFeedbackFlow.emit(CollectionManager.TR.studyingCardsBuried(noteCount))
-            updateCurrentCard()
-        }
+    private suspend fun deleteNote() {
+        val cardId = currentCard.await().id
+        val noteCount =
+            undoableOp {
+                removeNotes(cids = listOf(cardId))
+            }.count
+        actionFeedbackFlow.emit(CollectionManager.TR.browsingCardsDeleted(noteCount))
+        updateCurrentCard()
     }
 
-    fun buryNote() {
-        launchCatchingIO {
-            val noteId = currentCard.await().nid
-            val noteCount =
-                undoableOp {
-                    sched.buryNotes(nids = listOf(noteId))
-                }.count
-            actionFeedbackFlow.emit(CollectionManager.TR.studyingCardsBuried(noteCount))
-            updateCurrentCard()
-        }
+    suspend fun buryCard() {
+        val cardId = currentCard.await().id
+        val noteCount =
+            undoableOp {
+                sched.buryCards(cids = listOf(cardId))
+            }.count
+        actionFeedbackFlow.emit(CollectionManager.TR.studyingCardsBuried(noteCount))
+        updateCurrentCard()
     }
 
-    fun suspendCard() {
-        launchCatchingIO {
-            val cardId = currentCard.await().id
+    private suspend fun buryNote() {
+        val noteId = currentCard.await().nid
+        val noteCount =
             undoableOp {
-                sched.suspendCards(ids = listOf(cardId))
+                sched.buryNotes(nids = listOf(noteId))
             }.count
-            actionFeedbackFlow.emit(CollectionManager.TR.studyingCardSuspended())
-            updateCurrentCard()
-        }
+        actionFeedbackFlow.emit(CollectionManager.TR.studyingCardsBuried(noteCount))
+        updateCurrentCard()
     }
 
-    fun suspendNote() {
-        launchCatchingIO {
-            val noteId = currentCard.await().nid
-            undoableOp {
-                sched.suspendNotes(ids = listOf(noteId))
-            }
-            actionFeedbackFlow.emit(CollectionManager.TR.studyingNoteSuspended())
-            updateCurrentCard()
-        }
+    private suspend fun suspendCard() {
+        val cardId = currentCard.await().id
+        undoableOp {
+            sched.suspendCards(ids = listOf(cardId))
+        }.count
+        actionFeedbackFlow.emit(CollectionManager.TR.studyingCardSuspended())
+        updateCurrentCard()
     }
 
-    fun undo() {
-        launchCatchingIO {
-            val changes =
-                undoableOp {
-                    undo()
-                }
-            val message =
-                if (changes.operation.isEmpty()) {
-                    CollectionManager.TR.actionsNothingToUndo()
-                } else {
-                    CollectionManager.TR.undoActionUndone(changes.operation)
-                }
-            actionFeedbackFlow.emit(message)
-            updateCurrentCard()
+    private suspend fun suspendNote() {
+        val noteId = currentCard.await().nid
+        undoableOp {
+            sched.suspendNotes(ids = listOf(noteId))
         }
+        actionFeedbackFlow.emit(CollectionManager.TR.studyingNoteSuspended())
+        updateCurrentCard()
     }
 
-    fun redo() {
-        launchCatchingIO {
-            val changes =
-                undoableOp {
-                    redo()
-                }
-            val message =
-                if (changes.operation.isEmpty()) {
-                    CollectionManager.TR.actionsNothingToRedo()
-                } else {
-                    CollectionManager.TR.undoRedoAction(changes.operation)
-                }
-            actionFeedbackFlow.emit(message)
-            updateCurrentCard()
-        }
+    private suspend fun undo() {
+        val changes =
+            undoableOp {
+                undo()
+            }
+        val message =
+            if (changes.operation.isEmpty()) {
+                CollectionManager.TR.actionsNothingToUndo()
+            } else {
+                CollectionManager.TR.undoActionUndone(changes.operation)
+            }
+        actionFeedbackFlow.emit(message)
+        updateCurrentCard()
     }
 
-    fun userAction(
+    private suspend fun redo() {
+        val changes = undoableOp { redo() }
+        val message =
+            if (changes.operation.isEmpty()) {
+                CollectionManager.TR.actionsNothingToRedo()
+            } else {
+                CollectionManager.TR.undoRedoAction(changes.operation)
+            }
+        actionFeedbackFlow.emit(message)
+        updateCurrentCard()
+    }
+
+    private suspend fun userAction(
         @Reviewer.UserAction number: Int,
     ) {
-        launchCatchingIO {
-            eval.emit("javascript: ankidroid.userAction($number);")
-        }
+        eval.emit("javascript: ankidroid.userAction($number);")
     }
 
     fun stopAutoAdvance() {
         autoAdvance.cancelQuestionAndAnswerActionJobs()
     }
 
-    fun toggleAutoAdvance() {
-        launchCatchingIO {
-            autoAdvance.isEnabled = !autoAdvance.isEnabled
-
-            val message =
-                if (autoAdvance.isEnabled) {
-                    CollectionManager.TR.actionsAutoAdvanceActivated()
-                } else {
-                    CollectionManager.TR.actionsAutoAdvanceDeactivated()
-                }
-            actionFeedbackFlow.emit(message)
-
-            if (autoAdvance.shouldWaitForAudio() && cardMediaPlayer.isPlaying) return@launchCatchingIO
-
-            if (showingAnswer.value) {
-                autoAdvance.onShowAnswer()
+    private suspend fun toggleAutoAdvance() {
+        autoAdvance.isEnabled = !autoAdvance.isEnabled
+        val message =
+            if (autoAdvance.isEnabled) {
+                CollectionManager.TR.actionsAutoAdvanceActivated()
             } else {
-                autoAdvance.onShowQuestion()
+                CollectionManager.TR.actionsAutoAdvanceDeactivated()
             }
+        actionFeedbackFlow.emit(message)
+
+        if (autoAdvance.shouldWaitForAudio() && cardMediaPlayer.isPlaying) return
+
+        if (showingAnswer.value) {
+            autoAdvance.onShowAnswer()
+        } else {
+            autoAdvance.onShowQuestion()
         }
     }
 
@@ -411,7 +397,7 @@ class ReviewerViewModel(
     private fun answerCard(ease: Ease) {
         launchCatchingIO {
             queueState.await()?.let {
-                undoableOp<OpChanges> { sched.answerCard(it, ease) }
+                undoableOp { sched.answerCard(it, ease) }
                 updateCurrentCard()
             }
         }
@@ -480,6 +466,46 @@ class ReviewerViewModel(
         answerButtonsNextTimeFlow.emit(nextTimes)
     }
 
+    fun executeAction(action: ViewerAction) {
+        launchCatchingIO {
+            when (action) {
+                ViewerAction.ADD_NOTE -> emitAddNoteDestination()
+                ViewerAction.CARD_INFO -> emitCardInfoDestination()
+                ViewerAction.DECK_OPTIONS -> emitDeckOptionsDestination()
+                ViewerAction.EDIT -> emitEditNoteDestination()
+                ViewerAction.DELETE -> deleteNote()
+                ViewerAction.MARK -> toggleMark()
+                ViewerAction.REDO -> redo()
+                ViewerAction.UNDO -> undo()
+                ViewerAction.TOGGLE_AUTO_ADVANCE -> toggleAutoAdvance()
+                ViewerAction.BURY_NOTE -> buryNote()
+                ViewerAction.BURY_CARD -> buryCard()
+                ViewerAction.SUSPEND_NOTE -> suspendNote()
+                ViewerAction.SUSPEND_CARD -> suspendCard()
+                ViewerAction.UNSET_FLAG -> setFlag(Flag.NONE)
+                ViewerAction.FLAG_RED -> setFlag(Flag.RED)
+                ViewerAction.FLAG_ORANGE -> setFlag(Flag.ORANGE)
+                ViewerAction.FLAG_BLUE -> setFlag(Flag.BLUE)
+                ViewerAction.FLAG_GREEN -> setFlag(Flag.GREEN)
+                ViewerAction.FLAG_PINK -> setFlag(Flag.PINK)
+                ViewerAction.FLAG_TURQUOISE -> setFlag(Flag.TURQUOISE)
+                ViewerAction.FLAG_PURPLE -> setFlag(Flag.PURPLE)
+                ViewerAction.USER_ACTION_1 -> userAction(1)
+                ViewerAction.USER_ACTION_2 -> userAction(2)
+                ViewerAction.USER_ACTION_3 -> userAction(3)
+                ViewerAction.USER_ACTION_4 -> userAction(4)
+                ViewerAction.USER_ACTION_5 -> userAction(5)
+                ViewerAction.USER_ACTION_6 -> userAction(6)
+                ViewerAction.USER_ACTION_7 -> userAction(7)
+                ViewerAction.USER_ACTION_8 -> userAction(8)
+                ViewerAction.USER_ACTION_9 -> userAction(9)
+                ViewerAction.SUSPEND_MENU -> suspendCard()
+                ViewerAction.BURY_MENU -> buryCard()
+                ViewerAction.FLAG_MENU -> {}
+            }
+        }
+    }
+
     override fun opExecuted(
         changes: OpChanges,
         handler: Any?,

From 8468969474bfa676f5d35ab21ef7c5be88a348c2 Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Fri, 7 Feb 2025 08:12:11 -0300
Subject: [PATCH 175/200] refactor(new reviewer): move key processing to
 viewModel

---
 .../ichi2/anki/reviewer/PeripheralKeymap.kt   |  8 +++--
 .../ui/windows/reviewer/ReviewerFragment.kt   | 24 ++-------------
 .../ui/windows/reviewer/ReviewerViewModel.kt  | 30 +++++++++++++++++--
 3 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/PeripheralKeymap.kt b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/PeripheralKeymap.kt
index b7d07bc1e7a0..ca3822363427 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/PeripheralKeymap.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/PeripheralKeymap.kt
@@ -29,7 +29,7 @@ import com.ichi2.anki.reviewer.Binding.Companion.possibleKeyBindings
 class PeripheralKeymap<B : MappableBinding, A : MappableAction<B>>(
     sharedPrefs: SharedPreferences,
     actions: List<A>,
-    private val processor: BindingProcessor<B, A>,
+    private var processor: BindingProcessor<B, A>? = null,
 ) {
     private val bindingMap = HashMap<Binding, List<Pair<A, B>>>()
 
@@ -48,6 +48,10 @@ class PeripheralKeymap<B : MappableBinding, A : MappableAction<B>>(
         }
     }
 
+    fun setProcessor(processor: BindingProcessor<B, A>) {
+        this.processor = processor
+    }
+
     fun onKeyDown(event: KeyEvent): Boolean {
         if (event.repeatCount > 0) {
             return false
@@ -56,7 +60,7 @@ class PeripheralKeymap<B : MappableBinding, A : MappableAction<B>>(
         for (binding in bindings) {
             val actionAndMappableBindings = bindingMap[binding] ?: continue
             for ((action, mappableBinding) in actionAndMappableBindings) {
-                if (processor.processAction(action, mappableBinding)) return true
+                if (processor?.processAction(action, mappableBinding) == true) return true
             }
         }
         return false
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt
index 0adb2543f7a7..ca5a7ade4528 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt
@@ -73,10 +73,7 @@ import com.ichi2.anki.preferences.reviewer.ViewerAction.SUSPEND_NOTE
 import com.ichi2.anki.preferences.reviewer.ViewerAction.UNDO
 import com.ichi2.anki.previewer.CardViewerActivity
 import com.ichi2.anki.previewer.CardViewerFragment
-import com.ichi2.anki.reviewer.BindingProcessor
-import com.ichi2.anki.reviewer.CardSide
 import com.ichi2.anki.reviewer.PeripheralKeymap
-import com.ichi2.anki.reviewer.ReviewerBinding
 import com.ichi2.anki.settings.Prefs
 import com.ichi2.anki.settings.enums.FrameStyle
 import com.ichi2.anki.settings.enums.HideSystemBars
@@ -90,16 +87,14 @@ import com.ichi2.anki.utils.ext.removeSubMenu
 import com.ichi2.anki.utils.ext.sharedPrefs
 import com.ichi2.anki.utils.ext.window
 import com.ichi2.libanki.sched.Counts
-import kotlinx.coroutines.launch
 
 class ReviewerFragment :
     CardViewerFragment(R.layout.reviewer2),
     BaseSnackbarBuilderProvider,
     ActionMenuView.OnMenuItemClickListener,
-    BindingProcessor<ReviewerBinding, ViewerAction>,
     DispatchKeyEventListener {
     override val viewModel: ReviewerViewModel by viewModels {
-        ReviewerViewModel.factory(CardMediaPlayer())
+        ReviewerViewModel.factory(CardMediaPlayer(), PeripheralKeymap(sharedPrefs(), ViewerAction.entries))
     }
 
     override val webView: WebView
@@ -109,8 +104,6 @@ class ReviewerFragment :
         anchorView = this@ReviewerFragment.view?.findViewById(R.id.snackbar_anchor)
     }
 
-    private lateinit var keyMap: PeripheralKeymap<ReviewerBinding, ViewerAction>
-
     override fun onStop() {
         super.onStop()
         if (!requireActivity().isChangingConfigurations) {
@@ -123,7 +116,6 @@ class ReviewerFragment :
         savedInstanceState: Bundle?,
     ) {
         super.onViewCreated(view, savedInstanceState)
-        keyMap = PeripheralKeymap(sharedPrefs(), ViewerAction.entries, this)
 
         view.findViewById<AppCompatImageButton>(R.id.back_button).setOnClickListener {
             requireActivity().finish()
@@ -218,19 +210,7 @@ class ReviewerFragment :
         webView.settings.loadWithOverviewMode = true
     }
 
-    override fun dispatchKeyEvent(event: KeyEvent): Boolean {
-        if (event.action != KeyEvent.ACTION_DOWN) return false
-        return keyMap.onKeyDown(event)
-    }
-
-    override fun processAction(
-        action: ViewerAction,
-        binding: ReviewerBinding,
-    ): Boolean {
-        if (binding.side != CardSide.BOTH && CardSide.fromAnswer(viewModel.showingAnswer.value) != binding.side) return false
-        viewModel.executeAction(action)
-        return true
-    }
+    override fun dispatchKeyEvent(event: KeyEvent): Boolean = viewModel.dispatchKeyEvent(event)
 
     override fun onMenuItemClick(item: MenuItem): Boolean {
         if (item.hasSubMenu()) return false
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModel.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModel.kt
index 2938e714da4b..9bc65cbcd96c 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModel.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModel.kt
@@ -16,6 +16,7 @@
 package com.ichi2.anki.ui.windows.reviewer
 
 import android.text.style.RelativeSizeSpan
+import android.view.KeyEvent
 import androidx.core.text.buildSpannedString
 import androidx.core.text.inSpans
 import androidx.lifecycle.ViewModelProvider
@@ -39,7 +40,10 @@ import com.ichi2.anki.preferences.getShowIntervalOnButtons
 import com.ichi2.anki.preferences.reviewer.ViewerAction
 import com.ichi2.anki.previewer.CardViewerViewModel
 import com.ichi2.anki.previewer.TypeAnswer
+import com.ichi2.anki.reviewer.BindingProcessor
 import com.ichi2.anki.reviewer.CardSide
+import com.ichi2.anki.reviewer.PeripheralKeymap
+import com.ichi2.anki.reviewer.ReviewerBinding
 import com.ichi2.anki.servicelayer.MARKED_TAG
 import com.ichi2.anki.servicelayer.NoteService
 import com.ichi2.anki.servicelayer.isBuryNoteAvailable
@@ -63,8 +67,10 @@ import kotlinx.coroutines.flow.MutableStateFlow
 
 class ReviewerViewModel(
     cardMediaPlayer: CardMediaPlayer,
+    private val keyMap: PeripheralKeymap<ReviewerBinding, ViewerAction>,
 ) : CardViewerViewModel(cardMediaPlayer),
-    ChangeManager.Subscriber {
+    ChangeManager.Subscriber,
+    BindingProcessor<ReviewerBinding, ViewerAction> {
     private var queueState: Deferred<CurrentQueueState?> =
         asyncIO {
             // this assumes that the Reviewer won't be launched if there isn't a queueState
@@ -114,6 +120,7 @@ class ReviewerViewModel(
         }
 
     init {
+        keyMap.setProcessor(this)
         ChangeManager.subscribe(this)
         launchCatchingIO {
             updateUndoAndRedoLabels()
@@ -180,6 +187,11 @@ class ReviewerViewModel(
 
     fun answerEasy() = answerCard(Ease.EASY)
 
+    fun dispatchKeyEvent(event: KeyEvent): Boolean {
+        if (event.action != KeyEvent.ACTION_DOWN) return false
+        return keyMap.onKeyDown(event)
+    }
+
     private suspend fun toggleMark() {
         val card = currentCard.await()
         val note = withCol { card.note(this@withCol) }
@@ -506,6 +518,15 @@ class ReviewerViewModel(
         }
     }
 
+    override fun processAction(
+        action: ViewerAction,
+        binding: ReviewerBinding,
+    ): Boolean {
+        if (binding.side != CardSide.BOTH && CardSide.fromAnswer(showingAnswer.value) != binding.side) return false
+        executeAction(action)
+        return true
+    }
+
     override fun opExecuted(
         changes: OpChanges,
         handler: Any?,
@@ -514,10 +535,13 @@ class ReviewerViewModel(
     }
 
     companion object {
-        fun factory(soundPlayer: CardMediaPlayer): ViewModelProvider.Factory =
+        fun factory(
+            soundPlayer: CardMediaPlayer,
+            keyMap: PeripheralKeymap<ReviewerBinding, ViewerAction>,
+        ): ViewModelProvider.Factory =
             viewModelFactory {
                 initializer {
-                    ReviewerViewModel(soundPlayer)
+                    ReviewerViewModel(soundPlayer, keyMap)
                 }
             }
 

From ccdb678f85ab4bf30bbfb60175ef582b9879379c Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Fri, 7 Feb 2025 08:15:24 -0300
Subject: [PATCH 176/200] refactor(new reviewer): move menu click processing to
 viewModel

---
 .../ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt |  7 +------
 .../anki/ui/windows/reviewer/ReviewerViewModel.kt      | 10 +++++++++-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt
index ca5a7ade4528..65c631accc3f 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt
@@ -212,12 +212,7 @@ class ReviewerFragment :
 
     override fun dispatchKeyEvent(event: KeyEvent): Boolean = viewModel.dispatchKeyEvent(event)
 
-    override fun onMenuItemClick(item: MenuItem): Boolean {
-        if (item.hasSubMenu()) return false
-        val action = ViewerAction.fromId(item.itemId)
-        viewModel.executeAction(action)
-        return true
-    }
+    override fun onMenuItemClick(item: MenuItem): Boolean = viewModel.onMenuItemClick(item)
 
     private fun setupAnswerButtons(view: View) {
         val prefs = sharedPrefs()
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModel.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModel.kt
index 9bc65cbcd96c..14ef0407a3bc 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModel.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModel.kt
@@ -17,6 +17,7 @@ package com.ichi2.anki.ui.windows.reviewer
 
 import android.text.style.RelativeSizeSpan
 import android.view.KeyEvent
+import android.view.MenuItem
 import androidx.core.text.buildSpannedString
 import androidx.core.text.inSpans
 import androidx.lifecycle.ViewModelProvider
@@ -478,7 +479,7 @@ class ReviewerViewModel(
         answerButtonsNextTimeFlow.emit(nextTimes)
     }
 
-    fun executeAction(action: ViewerAction) {
+    private fun executeAction(action: ViewerAction) {
         launchCatchingIO {
             when (action) {
                 ViewerAction.ADD_NOTE -> emitAddNoteDestination()
@@ -527,6 +528,13 @@ class ReviewerViewModel(
         return true
     }
 
+    fun onMenuItemClick(item: MenuItem): Boolean {
+        if (item.hasSubMenu()) return false
+        val action = ViewerAction.fromId(item.itemId)
+        executeAction(action)
+        return true
+    }
+
     override fun opExecuted(
         changes: OpChanges,
         handler: Any?,

From 9791d393daa9f6553b7bfc65607b92063084c87e Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Fri, 7 Feb 2025 09:21:09 -0300
Subject: [PATCH 177/200] feat(new reviewer): keybinds in answer actions

---
 .../anki/preferences/reviewer/ViewerAction.kt | 40 ++++++++++++++++++-
 .../ui/windows/reviewer/ReviewerViewModel.kt  | 13 ++++++
 2 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ViewerAction.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ViewerAction.kt
index 17c89fe3a187..0602a6a757d6 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ViewerAction.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ViewerAction.kt
@@ -41,8 +41,8 @@ import com.ichi2.anki.reviewer.ReviewerBinding
  * or if the item has a [parentMenu].
  */
 enum class ViewerAction(
-    @IdRes val menuId: Int,
-    @DrawableRes val drawableRes: Int?,
+    @IdRes val menuId: Int = 0,
+    @DrawableRes val drawableRes: Int? = null,
     @StringRes val titleRes: Int = R.string.empty_string,
     val defaultDisplayType: MenuDisplayType? = null,
     val parentMenu: ViewerAction? = null,
@@ -87,6 +87,13 @@ enum class ViewerAction(
     FLAG_PINK(Flag.PINK.id, Flag.PINK.drawableRes, parentMenu = FLAG_MENU),
     FLAG_TURQUOISE(Flag.TURQUOISE.id, Flag.TURQUOISE.drawableRes, parentMenu = FLAG_MENU),
     FLAG_PURPLE(Flag.PURPLE.id, Flag.PURPLE.drawableRes, parentMenu = FLAG_MENU),
+
+    // Command only
+    SHOW_ANSWER,
+    FLIP_OR_ANSWER_EASE1,
+    FLIP_OR_ANSWER_EASE2,
+    FLIP_OR_ANSWER_EASE3,
+    FLIP_OR_ANSWER_EASE4,
     ;
 
     override val preferenceKey: String get() = "binding_$name"
@@ -108,7 +115,36 @@ enum class ViewerAction(
             SUSPEND_NOTE -> listOf(unicode('!'))
             SUSPEND_CARD -> listOf(unicode('@'))
             TOGGLE_AUTO_ADVANCE -> listOf(keycode(KeyEvent.KEYCODE_A, shift()))
+            FLIP_OR_ANSWER_EASE1 ->
+                listOf(
+                    keycode(KeyEvent.KEYCODE_BUTTON_Y),
+                    keycode(KeyEvent.KEYCODE_1, side = CardSide.ANSWER),
+                    keycode(KeyEvent.KEYCODE_NUMPAD_1, side = CardSide.ANSWER),
+                )
+            FLIP_OR_ANSWER_EASE2 ->
+                listOf(
+                    keycode(KeyEvent.KEYCODE_BUTTON_X),
+                    keycode(KeyEvent.KEYCODE_2, side = CardSide.ANSWER),
+                    keycode(KeyEvent.KEYCODE_NUMPAD_2, side = CardSide.ANSWER),
+                )
+            FLIP_OR_ANSWER_EASE3 ->
+                listOf(
+                    keycode(KeyEvent.KEYCODE_BUTTON_B),
+                    keycode(KeyEvent.KEYCODE_3, side = CardSide.ANSWER),
+                    keycode(KeyEvent.KEYCODE_NUMPAD_3, side = CardSide.ANSWER),
+                    keycode(KeyEvent.KEYCODE_DPAD_CENTER),
+                    keycode(KeyEvent.KEYCODE_SPACE, side = CardSide.BOTH),
+                    keycode(KeyEvent.KEYCODE_ENTER, side = CardSide.ANSWER),
+                    keycode(KeyEvent.KEYCODE_NUMPAD_ENTER, side = CardSide.ANSWER),
+                )
+            FLIP_OR_ANSWER_EASE4 ->
+                listOf(
+                    keycode(KeyEvent.KEYCODE_BUTTON_A),
+                    keycode(KeyEvent.KEYCODE_4, side = CardSide.ANSWER),
+                    keycode(KeyEvent.KEYCODE_NUMPAD_4, side = CardSide.ANSWER),
+                )
             // No default gestures
+            SHOW_ANSWER,
             DELETE,
             CARD_INFO,
             USER_ACTION_1,
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModel.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModel.kt
index 14ef0407a3bc..e226c3d10d69 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModel.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModel.kt
@@ -479,6 +479,14 @@ class ReviewerViewModel(
         answerButtonsNextTimeFlow.emit(nextTimes)
     }
 
+    private fun flipOrAnswer(ease: Ease) {
+        if (showingAnswer.value) {
+            answerCard(ease)
+        } else {
+            onShowAnswer()
+        }
+    }
+
     private fun executeAction(action: ViewerAction) {
         launchCatchingIO {
             when (action) {
@@ -503,6 +511,11 @@ class ReviewerViewModel(
                 ViewerAction.FLAG_PINK -> setFlag(Flag.PINK)
                 ViewerAction.FLAG_TURQUOISE -> setFlag(Flag.TURQUOISE)
                 ViewerAction.FLAG_PURPLE -> setFlag(Flag.PURPLE)
+                ViewerAction.SHOW_ANSWER -> if (!showingAnswer.value) onShowAnswer()
+                ViewerAction.FLIP_OR_ANSWER_EASE1 -> flipOrAnswer(Ease.AGAIN)
+                ViewerAction.FLIP_OR_ANSWER_EASE2 -> flipOrAnswer(Ease.HARD)
+                ViewerAction.FLIP_OR_ANSWER_EASE3 -> flipOrAnswer(Ease.GOOD)
+                ViewerAction.FLIP_OR_ANSWER_EASE4 -> flipOrAnswer(Ease.EASY)
                 ViewerAction.USER_ACTION_1 -> userAction(1)
                 ViewerAction.USER_ACTION_2 -> userAction(2)
                 ViewerAction.USER_ACTION_3 -> userAction(3)

From 60ef2e76f1bd028976e0747d8934e39528cfdfaa Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Fri, 7 Feb 2025 11:14:02 -0300
Subject: [PATCH 178/200] feat(new reviewer): show hint action

---
 AnkiDroid/src/main/assets/scripts/ankidroid.js            | 8 ++++++++
 .../com/ichi2/anki/preferences/reviewer/ViewerAction.kt   | 4 ++++
 .../ichi2/anki/ui/windows/reviewer/ReviewerViewModel.kt   | 2 ++
 3 files changed, 14 insertions(+)

diff --git a/AnkiDroid/src/main/assets/scripts/ankidroid.js b/AnkiDroid/src/main/assets/scripts/ankidroid.js
index a2dd0210bdbd..c81903da0763 100644
--- a/AnkiDroid/src/main/assets/scripts/ankidroid.js
+++ b/AnkiDroid/src/main/assets/scripts/ankidroid.js
@@ -13,3 +13,11 @@ globalThis.ankidroid.userAction = function (number) {
         alert(e);
     }
 };
+
+globalThis.ankidroid.showHint = function () {
+    document.querySelector("a.hint:not([style*='display: none'])")?.click();
+};
+
+globalThis.ankidroid.showAllHints = function () {
+    document.querySelectorAll("a.hint").forEach(el => el.click());
+};
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ViewerAction.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ViewerAction.kt
index 0602a6a757d6..7136d4fcc6ed 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ViewerAction.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ViewerAction.kt
@@ -94,6 +94,8 @@ enum class ViewerAction(
     FLIP_OR_ANSWER_EASE2,
     FLIP_OR_ANSWER_EASE3,
     FLIP_OR_ANSWER_EASE4,
+    SHOW_HINT,
+    SHOW_ALL_HINTS,
     ;
 
     override val preferenceKey: String get() = "binding_$name"
@@ -115,6 +117,8 @@ enum class ViewerAction(
             SUSPEND_NOTE -> listOf(unicode('!'))
             SUSPEND_CARD -> listOf(unicode('@'))
             TOGGLE_AUTO_ADVANCE -> listOf(keycode(KeyEvent.KEYCODE_A, shift()))
+            SHOW_HINT -> listOf(keycode(KeyEvent.KEYCODE_H))
+            SHOW_ALL_HINTS -> listOf(keycode(KeyEvent.KEYCODE_G))
             FLIP_OR_ANSWER_EASE1 ->
                 listOf(
                     keycode(KeyEvent.KEYCODE_BUTTON_Y),
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModel.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModel.kt
index e226c3d10d69..1dec60db2f3c 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModel.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModel.kt
@@ -516,6 +516,8 @@ class ReviewerViewModel(
                 ViewerAction.FLIP_OR_ANSWER_EASE2 -> flipOrAnswer(Ease.HARD)
                 ViewerAction.FLIP_OR_ANSWER_EASE3 -> flipOrAnswer(Ease.GOOD)
                 ViewerAction.FLIP_OR_ANSWER_EASE4 -> flipOrAnswer(Ease.EASY)
+                ViewerAction.SHOW_HINT -> eval.emit("ankidroid.showHint()")
+                ViewerAction.SHOW_ALL_HINTS -> eval.emit("ankidroid.showAllHints()")
                 ViewerAction.USER_ACTION_1 -> userAction(1)
                 ViewerAction.USER_ACTION_2 -> userAction(2)
                 ViewerAction.USER_ACTION_3 -> userAction(3)

From 4739941e0150b9b38867e37afc82062cb56c04f9 Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Sun, 9 Feb 2025 15:06:38 -0300
Subject: [PATCH 179/200] feat(new reviewer): close action

---
 .../ichi2/anki/preferences/reviewer/ViewerAction.kt   |  2 ++
 .../anki/ui/windows/reviewer/ReviewerFragment.kt      | 11 ++++-------
 .../anki/ui/windows/reviewer/ReviewerViewModel.kt     |  7 +++++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ViewerAction.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ViewerAction.kt
index 7136d4fcc6ed..a0f38966e42d 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ViewerAction.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ViewerAction.kt
@@ -96,6 +96,7 @@ enum class ViewerAction(
     FLIP_OR_ANSWER_EASE4,
     SHOW_HINT,
     SHOW_ALL_HINTS,
+    EXIT,
     ;
 
     override val preferenceKey: String get() = "binding_$name"
@@ -151,6 +152,7 @@ enum class ViewerAction(
             SHOW_ANSWER,
             DELETE,
             CARD_INFO,
+            EXIT,
             USER_ACTION_1,
             USER_ACTION_2,
             USER_ACTION_3,
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt
index 65c631accc3f..a584282382a5 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt
@@ -50,7 +50,6 @@ import com.google.android.material.card.MaterialCardView
 import com.google.android.material.shape.ShapeAppearanceModel
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textview.MaterialTextView
-import com.ichi2.anki.AbstractFlashcardViewer.Companion.RESULT_NO_MORE_CARDS
 import com.ichi2.anki.CollectionManager
 import com.ichi2.anki.DispatchKeyEventListener
 import com.ichi2.anki.NoteEditor
@@ -134,12 +133,10 @@ class ReviewerFragment :
                 showSnackbar(message, duration = 500)
             }
 
-        viewModel.isQueueFinishedFlow.collectIn(lifecycleScope) { isQueueFinished ->
-            if (isQueueFinished) {
-                requireActivity().run {
-                    setResult(RESULT_NO_MORE_CARDS)
-                    finish()
-                }
+        viewModel.finishResultFlow.collectIn(lifecycleScope) { result ->
+            requireActivity().run {
+                setResult(result)
+                finish()
             }
         }
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModel.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModel.kt
index 1dec60db2f3c..c0048739ef04 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModel.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModel.kt
@@ -25,6 +25,8 @@ import androidx.lifecycle.viewmodel.initializer
 import androidx.lifecycle.viewmodel.viewModelFactory
 import anki.collection.OpChanges
 import anki.frontend.SetSchedulingStatesRequest
+import com.ichi2.anki.AbstractFlashcardViewer
+import com.ichi2.anki.AbstractFlashcardViewer.Companion.RESULT_NO_MORE_CARDS
 import com.ichi2.anki.CollectionManager
 import com.ichi2.anki.CollectionManager.withCol
 import com.ichi2.anki.Ease
@@ -81,7 +83,7 @@ class ReviewerViewModel(
         asyncIO {
             queueState.await()!!.topCard
         }
-    var isQueueFinishedFlow = MutableSharedFlow<Boolean>()
+    var finishResultFlow = MutableSharedFlow<Int>()
     val isMarkedFlow = MutableStateFlow(false)
     val flagFlow = MutableStateFlow(Flag.NONE)
     val actionFeedbackFlow = MutableSharedFlow<String>()
@@ -436,7 +438,7 @@ class ReviewerViewModel(
             }
         val state = queueState.await()
         if (state == null) {
-            isQueueFinishedFlow.emit(true)
+            finishResultFlow.emit(RESULT_NO_MORE_CARDS)
             return
         }
 
@@ -518,6 +520,7 @@ class ReviewerViewModel(
                 ViewerAction.FLIP_OR_ANSWER_EASE4 -> flipOrAnswer(Ease.EASY)
                 ViewerAction.SHOW_HINT -> eval.emit("ankidroid.showHint()")
                 ViewerAction.SHOW_ALL_HINTS -> eval.emit("ankidroid.showAllHints()")
+                ViewerAction.EXIT -> finishResultFlow.emit(AbstractFlashcardViewer.RESULT_DEFAULT)
                 ViewerAction.USER_ACTION_1 -> userAction(1)
                 ViewerAction.USER_ACTION_2 -> userAction(2)
                 ViewerAction.USER_ACTION_3 -> userAction(3)

From 4db1b213d40fc6103efa5e2ab82efd00591aa1b1 Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Fri, 4 Apr 2025 14:46:30 -0300
Subject: [PATCH 180/200] feat(new reviewer): toggle flag keybinds

---
 .../anki/preferences/reviewer/ViewerAction.kt | 42 +++++++++++++++++++
 .../ui/windows/reviewer/ReviewerViewModel.kt  | 15 +++++++
 2 files changed, 57 insertions(+)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ViewerAction.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ViewerAction.kt
index a0f38966e42d..e3c7f4c23342 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ViewerAction.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ViewerAction.kt
@@ -94,6 +94,13 @@ enum class ViewerAction(
     FLIP_OR_ANSWER_EASE2,
     FLIP_OR_ANSWER_EASE3,
     FLIP_OR_ANSWER_EASE4,
+    TOGGLE_FLAG_RED,
+    TOGGLE_FLAG_ORANGE,
+    TOGGLE_FLAG_GREEN,
+    TOGGLE_FLAG_BLUE,
+    TOGGLE_FLAG_PINK,
+    TOGGLE_FLAG_TURQUOISE,
+    TOGGLE_FLAG_PURPLE,
     SHOW_HINT,
     SHOW_ALL_HINTS,
     EXIT,
@@ -120,6 +127,41 @@ enum class ViewerAction(
             TOGGLE_AUTO_ADVANCE -> listOf(keycode(KeyEvent.KEYCODE_A, shift()))
             SHOW_HINT -> listOf(keycode(KeyEvent.KEYCODE_H))
             SHOW_ALL_HINTS -> listOf(keycode(KeyEvent.KEYCODE_G))
+            TOGGLE_FLAG_RED ->
+                listOf(
+                    keycode(KeyEvent.KEYCODE_1, ctrl()),
+                    keycode(KeyEvent.KEYCODE_NUMPAD_1, ctrl()),
+                )
+            TOGGLE_FLAG_ORANGE ->
+                listOf(
+                    keycode(KeyEvent.KEYCODE_2, ctrl()),
+                    keycode(KeyEvent.KEYCODE_NUMPAD_2, ctrl()),
+                )
+            TOGGLE_FLAG_GREEN ->
+                listOf(
+                    keycode(KeyEvent.KEYCODE_3, ctrl()),
+                    keycode(KeyEvent.KEYCODE_NUMPAD_3, ctrl()),
+                )
+            TOGGLE_FLAG_BLUE ->
+                listOf(
+                    keycode(KeyEvent.KEYCODE_4, ctrl()),
+                    keycode(KeyEvent.KEYCODE_NUMPAD_4, ctrl()),
+                )
+            TOGGLE_FLAG_PINK ->
+                listOf(
+                    keycode(KeyEvent.KEYCODE_5, ctrl()),
+                    keycode(KeyEvent.KEYCODE_NUMPAD_5, ctrl()),
+                )
+            TOGGLE_FLAG_TURQUOISE ->
+                listOf(
+                    keycode(KeyEvent.KEYCODE_6, ctrl()),
+                    keycode(KeyEvent.KEYCODE_NUMPAD_6, ctrl()),
+                )
+            TOGGLE_FLAG_PURPLE ->
+                listOf(
+                    keycode(KeyEvent.KEYCODE_7, ctrl()),
+                    keycode(KeyEvent.KEYCODE_NUMPAD_7, ctrl()),
+                )
             FLIP_OR_ANSWER_EASE1 ->
                 listOf(
                     keycode(KeyEvent.KEYCODE_BUTTON_Y),
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModel.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModel.kt
index c0048739ef04..ab63a29fe86e 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModel.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModel.kt
@@ -210,6 +210,14 @@ class ReviewerViewModel(
         flagFlow.emit(flag)
     }
 
+    private suspend fun toggleFlag(flag: Flag) {
+        if (flag == flagFlow.value) {
+            setFlag(Flag.NONE)
+        } else {
+            setFlag(flag)
+        }
+    }
+
     fun onStateMutationCallback() {
         statesMutated = true
     }
@@ -513,6 +521,13 @@ class ReviewerViewModel(
                 ViewerAction.FLAG_PINK -> setFlag(Flag.PINK)
                 ViewerAction.FLAG_TURQUOISE -> setFlag(Flag.TURQUOISE)
                 ViewerAction.FLAG_PURPLE -> setFlag(Flag.PURPLE)
+                ViewerAction.TOGGLE_FLAG_RED -> toggleFlag(Flag.RED)
+                ViewerAction.TOGGLE_FLAG_ORANGE -> toggleFlag(Flag.ORANGE)
+                ViewerAction.TOGGLE_FLAG_BLUE -> toggleFlag(Flag.BLUE)
+                ViewerAction.TOGGLE_FLAG_GREEN -> toggleFlag(Flag.GREEN)
+                ViewerAction.TOGGLE_FLAG_PINK -> toggleFlag(Flag.PINK)
+                ViewerAction.TOGGLE_FLAG_TURQUOISE -> toggleFlag(Flag.TURQUOISE)
+                ViewerAction.TOGGLE_FLAG_PURPLE -> toggleFlag(Flag.PURPLE)
                 ViewerAction.SHOW_ANSWER -> if (!showingAnswer.value) onShowAnswer()
                 ViewerAction.FLIP_OR_ANSWER_EASE1 -> flipOrAnswer(Ease.AGAIN)
                 ViewerAction.FLIP_OR_ANSWER_EASE2 -> flipOrAnswer(Ease.HARD)

From 558d135071c6650d2173955c0bb3574748e8c498 Mon Sep 17 00:00:00 2001
From: VictoriaTaiwan <77235839+VictoriaTaiwan@users.noreply.github.com>
Date: Fri, 4 Apr 2025 23:13:59 +0800
Subject: [PATCH 181/200] - Made vals punctuationAtStart, capturedWord and
 punctuationAtEnd not-nullable. - Replaced unnecessary safe calls with dot
 calls. - Replaced "get" calls with indexing operator.

---
 .../ichi2/anki/instantnoteeditor/InstantEditorViewModel.kt  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/instantnoteeditor/InstantEditorViewModel.kt b/AnkiDroid/src/main/java/com/ichi2/anki/instantnoteeditor/InstantEditorViewModel.kt
index 139b28b1ac01..56489736f0ff 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/instantnoteeditor/InstantEditorViewModel.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/instantnoteeditor/InstantEditorViewModel.kt
@@ -369,9 +369,9 @@ class InstantEditorViewModel :
             ?.toInt()
             ?.let { shouldResetClozeNumber(it) }
 
-        val punctuationAtStart: String? = matchResult?.groups?.get(1)?.value ?: ""
-        val capturedWord: String? = matchResult?.groups?.get(3)?.value ?: ""
-        val punctuationAtEnd: String? = matchResult?.groups?.get(4)?.value ?: ""
+        val punctuationAtStart: String = matchResult.groups[1]?.value ?: ""
+        val capturedWord: String = matchResult.groups[3]?.value ?: ""
+        val punctuationAtEnd: String = matchResult.groups[4]?.value ?: ""
 
         return punctuationAtStart + capturedWord + punctuationAtEnd
     }

From 7abac9e987d21a9889d98cc33921daabf3f4ead1 Mon Sep 17 00:00:00 2001
From: Hari Srinivasan <harisrini21@gmail.com>
Date: Fri, 4 Apr 2025 00:49:44 +0530
Subject: [PATCH 182/200] Refactor github-release to gh cli

---
 .github/workflows/publish.yml |  5 ---
 tools/release.sh              | 57 +++++++++++++++++++++++------------
 2 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 58f4a4ae09bc..3a50cf0fcb5e 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -39,11 +39,6 @@ jobs:
 
       - name: Install Release Utilities
         run: |
-          mkdir ~/bin/
-          curl -L -o ~/bin/github-release.bz2 https://github.com/github-release/github-release/releases/download/v0.10.0/linux-amd64-github-release.bz2
-          cd ~/bin
-          bunzip2 github-release.bz2
-          chmod 755 ~/bin/github-release
           sudo chown -R $USER /var/lib/gems/
           sudo chown -R $USER /usr/local/bin
           gem install asciidoctor
diff --git a/tools/release.sh b/tools/release.sh
index 25809eb778b1..43a4761d5378 100755
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -9,7 +9,7 @@
 
 
 # Basic expectations
-# - tools needed: sed, gawk, github-release, git
+# - tools needed: sed, gawk, gh, git
 # - authority needed: ability to commit/tag/push directly to main branch in AnkiDroid, ability to create releases
 # - ankidroiddocs checked out in a sibling directory (that is, '../ankidroiddocs' should exist with 'upstream' remote set correctly)
 
@@ -18,11 +18,11 @@ SUFFIX=""
 PUBLIC=$1
 
 # Make sure we can find our binaries
-export PATH="~/bin:$PATH"
+export PATH="$HOME/bin:$PATH"
 
 # Check basic expectations
 echo "Checking basic utility installation status..."
-for UTILITY in sed gawk github-release asciidoctor; do
+for UTILITY in sed gawk gh asciidoctor; do
   if ! command -v "$UTILITY" >/dev/null 2>&1; then echo "$UTILITY" missing; exit 1; fi
 done
 if [ "$PUBLIC" = "public" ] && ! [ -f ../ankidroiddocs/changelog.asc ]; then
@@ -129,20 +129,35 @@ for UCFLAVOR in $UCFLAVORS; do
   fi
 done
 
+# PREFIX is used to order the apks in the file list. Most users will use `arm64-v8a`.
+# variant ABIs are a source of error and confusion, so should be lower in the list
+PREFIX=""
 # Copy full ABI APKs to cwd
 ABIS='arm64-v8a x86 x86_64 armeabi-v7a'
 for ABI in $ABIS; do
-  cp AnkiDroid/build/outputs/apk/full/release/AnkiDroid-full-"$ABI"-release.apk AnkiDroid-"$VERSION"-"$ABI".apk
+  if [ "$ABI" = "arm64-v8a" ]; then
+    PREFIX=""
+  else
+    PREFIX="variant-abi-"
+  fi
+  cp AnkiDroid/build/outputs/apk/full/release/AnkiDroid-full-"$ABI"-release.apk "$PREFIX"AnkiDroid-"$VERSION"-"$ABI".apk
 done
 
 # Copy universal APKs for all flavors to cwd
 FLAVORS='full amazon play'
 for FLAVOR in $FLAVORS; do
-  cp AnkiDroid/build/outputs/apk/"$FLAVOR"/release/AnkiDroid-"$FLAVOR"-universal-release.apk AnkiDroid-"$VERSION"-"$FLAVOR"-universal.apk
+  if [ "$FLAVOR" = "full" ]; then
+    PREFIX=""
+  else
+    PREFIX="dev-"
+  fi
+  cp AnkiDroid/build/outputs/apk/"$FLAVOR"/release/AnkiDroid-"$FLAVOR"-universal-release.apk "$PREFIX"AnkiDroid-"$VERSION"-"$FLAVOR"-universal.apk
 done
 
 # Pack up our proguard mapping file for debugging in case needed
+PREFIX="z-"
 tar -zcf proguard-mappings.tar.gz AnkiDroid/build/outputs/mapping
+cp proguard-mappings.tar.gz "$PREFIX"proguard-mappings.tar.gz
 
 # Create a full universal build that disables minify, to help diagnose proguard issues
 ./gradlew --stop
@@ -153,7 +168,7 @@ then
   exit 1
 fi
 # Copy our unminified full universal release out
-cp AnkiDroid/build/outputs/apk/full/release/AnkiDroid-full-universal-release.apk AnkiDroid-"$VERSION"-full-universal-nominify.apk
+cp AnkiDroid/build/outputs/apk/full/release/AnkiDroid-full-universal-release.apk "$PREFIX"AnkiDroid-"$VERSION"-full-universal-nominify.apk
 
 # Push to Github Releases.
 GITHUB_TOKEN=$(cat ~/src/my-github-personal-access-token)
@@ -162,48 +177,49 @@ export GITHUB_USER="ankidroid"
 export GITHUB_REPO="Anki-Android"
 
 if [ "$PUBLIC" = "public" ]; then
-  PRE_RELEASE=""
+  RELEASE_TYPE="--latest"
 else
-  PRE_RELEASE="--pre-release"
+  RELEASE_TYPE="--prerelease"
 fi
 
 # Get the directory of the current script
 SCRIPT_DIR=$(dirname "$(readlink -f "$0")")
 # Read the content of the markdown file using the absolute path
-RELEASE_NOTES=$(cat "$SCRIPT_DIR/release-description.md")
+RELEASE_NOTES="$SCRIPT_DIR/release-description.md"
 echo "Creating new Github release"
-github-release release --tag v"$VERSION" --name "AnkiDroid $VERSION" --description "$RELEASE_NOTES" $PRE_RELEASE
+gh release create v"$VERSION" --title "AnkiDroid $VERSION" -F "$RELEASE_NOTES" $RELEASE_TYPE
 
 echo "Sleeping 30s to make sure the release exists, see issue 11746"
 sleep 30
 
-# PREFIX is used to order the ABIs in the file list. Most users will use `arm64-v8a`.
-# variant ABIs are a source of error and confusion, so should be lower in the list
-PREFIX=""
+# Upload full ABI APKs to GitHub release
 for ABI in $ABIS; do
   if [ "$ABI" = "arm64-v8a" ]; then
     PREFIX=""
   else
     PREFIX="variant-abi-"
   fi
-  echo "Adding full APK for $ABI to Github release"
-  github-release upload --tag v"$VERSION" --name "$PREFIX"AnkiDroid-"$VERSION"-"$ABI".apk --file AnkiDroid-"$VERSION"-"$ABI".apk
+  echo "Adding full APK for $ABI to GitHub release"
+  gh release upload v"$VERSION" "$PREFIX"AnkiDroid-"$VERSION"-"$ABI".apk
 done
+
+# Upload universal APKs for all flavors to GitHub release
 for FLAVOR in $FLAVORS; do
   if [ "$FLAVOR" = "full" ]; then
     PREFIX=""
   else
     PREFIX="dev-"
   fi
-  echo "Adding full APK for $FLAVOR to Github release"
-  github-release upload --tag v"$VERSION" --name "$PREFIX"AnkiDroid-"$VERSION"-"$FLAVOR"-universal.apk --file AnkiDroid-"$VERSION"-"$FLAVOR"-universal.apk
+  echo "Adding full APK for $FLAVOR to GitHub release"
+  gh release upload v"$VERSION" "$PREFIX"AnkiDroid-"$VERSION"-"$FLAVOR"-universal.apk
 done
+
 # Set to z- for un-minified full universal APK and proguard to ensure it is at the end of the list
 PREFIX="z-"
 echo "Adding un-minified full universal APK to GitHub release"
-github-release upload --tag v"$VERSION" --name "$PREFIX"AnkiDroid-"$VERSION"-full-universal-nominify.apk --file AnkiDroid-"$VERSION"-full-universal-nominify.apk
+gh release upload v"$VERSION" "$PREFIX"AnkiDroid-"$VERSION"-full-universal-nominify.apk
 echo "Adding proguard mappings file to Github release"
-github-release upload --tag v"$VERSION" --name "$PREFIX"proguard-mappings.tar.gz --file proguard-mappings.tar.gz
+gh release upload v"$VERSION" "$PREFIX"proguard-mappings.tar.gz
 
 # Not publishing to amazon pending: https://github.com/ankidroid/Anki-Android/issues/14161
 #if [ "$PUBLIC" = "public" ]; then
@@ -229,5 +245,6 @@ fi
 for BUILD in $BUILDNAMES; do
   PREFIX=""
   echo "Adding parallel build $BUILD to Github release"
-  github-release upload --tag v"$VERSION" --name "$PREFIX"AnkiDroid-"$VERSION".parallel."$BUILD".apk --file AnkiDroid-"$VERSION".parallel."$BUILD".apk
+  cp AnkiDroid-"$VERSION".parallel."$BUILD".apk "$PREFIX"AnkiDroid-"$VERSION".parallel."$BUILD".apk
+  gh release upload v"$VERSION" "$PREFIX"AnkiDroid-"$VERSION".parallel."$BUILD".apk
 done

From f53c80e2f31d81dedc6120db376d5db17f033d1c Mon Sep 17 00:00:00 2001
From: Alisher <alisher@prodatakey.com>
Date: Sat, 29 Mar 2025 14:13:27 +0500
Subject: [PATCH 183/200] Fixes #18174: Add mathjax block and mathjax chemistry

---
 .../java/com/ichi2/anki/noteeditor/Toolbar.kt | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/Toolbar.kt b/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/Toolbar.kt
index 376cbed6108c..28ce0f12823f 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/Toolbar.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/Toolbar.kt
@@ -48,6 +48,7 @@ import androidx.core.view.children
 import androidx.core.view.isVisible
 import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat
 import com.ichi2.anki.AnkiDroidApp
+import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.NoteEditor
 import com.ichi2.anki.R
 import com.ichi2.anki.convertDpToPixel
@@ -124,6 +125,10 @@ class Toolbar : FrameLayout {
         setupButtonWrappingText(R.id.note_editor_toolbar_button_horizontal_rule, "<hr>", "")
         findViewById<View>(R.id.note_editor_toolbar_button_font_size).setOnClickListener { displayFontSizeDialog() }
         findViewById<View>(R.id.note_editor_toolbar_button_title).setOnClickListener { displayInsertHeadingDialog() }
+        findViewById<View>(R.id.note_editor_toolbar_button_insert_mathjax).setOnLongClickListener {
+            displayInsertMathJaxEquationsDialog()
+            true
+        }
 
         val parentLayout = findViewById<LinearLayout>(R.id.editor_toolbar_internal)
         parentLayout.children.forEach { child ->
@@ -306,6 +311,31 @@ class Toolbar : FrameLayout {
         }
     }
 
+    /**
+     * Displays a dialog that allows the user to insert a MathJax equation in different formats.
+     */
+    private fun displayInsertMathJaxEquationsDialog() {
+        data class MathJaxOption(
+            val label: String,
+            val prefix: String,
+            val suffix: String,
+        ) {
+            fun toTextWrapper() = TextWrapper(prefix = this.prefix, suffix = this.suffix)
+        }
+
+        val mathjaxOptions =
+            arrayOf(
+                MathJaxOption(TR.editingMathjaxBlock(), prefix = "\\[\\", suffix = "\\]"),
+                MathJaxOption(TR.editingMathjaxChemistry(), prefix = "\\( \\ce{", suffix = "} \\)"),
+            )
+        AlertDialog.Builder(context).show {
+            setItems(mathjaxOptions.map(MathJaxOption::label).toTypedArray()) { _, index ->
+                onFormat(mathjaxOptions[index].toTextWrapper())
+            }
+            title(R.string.insert_mathjax)
+        }
+    }
+
     /** Given a string [text], generates a [Drawable] which can be used as a button icon */
     fun createDrawableForString(text: String): Drawable {
         val baseline = -stringPaint!!.ascent()

From 860e270f4c9b5e2c9b8c36a79a044d5320231cb6 Mon Sep 17 00:00:00 2001
From: iamit <iamitsbisht07@gmail.com>
Date: Wed, 5 Mar 2025 05:51:28 +0530
Subject: [PATCH 184/200] fix: managed backstack for parent fragments in app
 settings

- added compact and non-compact tests for Preference navigation.
---
 .../preferences/PreferencesNavigationTest.kt  | 105 ++++++++++++++++++
 .../com/ichi2/anki/preferences/Preferences.kt |   2 +
 2 files changed, 107 insertions(+)
 create mode 100644 AnkiDroid/src/androidTest/java/com/ichi2/anki/preferences/PreferencesNavigationTest.kt

diff --git a/AnkiDroid/src/androidTest/java/com/ichi2/anki/preferences/PreferencesNavigationTest.kt b/AnkiDroid/src/androidTest/java/com/ichi2/anki/preferences/PreferencesNavigationTest.kt
new file mode 100644
index 000000000000..ad78e5747f01
--- /dev/null
+++ b/AnkiDroid/src/androidTest/java/com/ichi2/anki/preferences/PreferencesNavigationTest.kt
@@ -0,0 +1,105 @@
+/**
+ *  Copyright (c) 2025 Amit Bisht <iamitsbisht07@gmail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify it under
+ *  the terms of the GNU General Public License as published by the Free Software
+ *  Foundation; either version 3 of the License, or (at your option) any later
+ *  version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ *  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ *  PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with
+ *  this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.ichi2.anki.preferences
+
+import android.content.Context
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.core.app.ActivityScenario
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.Espresso.pressBack
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.typeText
+import androidx.test.espresso.assertion.ViewAssertions.doesNotExist
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.contrib.DrawerActions
+import androidx.test.espresso.matcher.ViewMatchers.hasFocus
+import androidx.test.espresso.matcher.ViewMatchers.hasMinimumChildCount
+import androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withClassName
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withResourceName
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.IntentHandler
+import com.ichi2.anki.R
+import com.ichi2.anki.testutil.GrantStoragePermission
+import com.ichi2.anki.testutil.closeGetStartedScreenIfExists
+import com.ichi2.anki.testutil.grantPermissions
+import com.ichi2.anki.utils.isWindowCompact
+import org.hamcrest.Matchers.allOf
+import org.hamcrest.Matchers.endsWith
+import org.junit.Assume.assumeTrue
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class PreferencesNavigationTest {
+    @get:Rule
+    val runtimePermissionRule = grantPermissions(GrantStoragePermission.storagePermission)
+
+    /**
+     * Verifies navigation behavior when the search bar is tapped.
+     * - When the user searches for something using the search bar,the search view should close upon pressing the back button.
+     * - The back button should not close the entire preferences activity.
+     */
+    @Test
+    fun testOnCompactMode() {
+        val context = ApplicationProvider.getApplicationContext<Context>()
+        assumeTrue(context.resources.isWindowCompact())
+        ActivityScenario.launch(IntentHandler::class.java)
+        closeGetStartedScreenIfExists()
+        onView(withId(R.id.drawer_layout)).perform(DrawerActions.open())
+        onView(withId(R.id.nav_settings)).perform(click())
+        onView(withId(R.id.search)).perform(click())
+        onView(allOf(withId(R.id.search), hasFocus())).perform(typeText("Controls"))
+        pressBack()
+        // Checking the list of Settings Categories are displayed on the basis of our search "Controls"
+        onView(allOf(withResourceName("list"), isAssignableFrom(RecyclerView::class.java))).check(
+            matches(
+                hasMinimumChildCount(1),
+            ),
+        )
+        pressBack()
+        onView(withId(R.id.settings_container)).check(matches(isDisplayed()))
+    }
+
+    /**
+     * Verifies navigation behavior when multiple menus are opened.
+     * - Even after opening multiple menus, pressing the back button should
+     * close the preference activity instead of navigating back through the previously opened menus.
+     */
+    @Test
+    fun testOnNonCompactMode() {
+        fun isTablet(context: Context): Boolean = context.resources.configuration.smallestScreenWidthDp >= 600
+
+        val context = ApplicationProvider.getApplicationContext<Context>()
+        assumeTrue(isTablet(context))
+        ActivityScenario.launch(IntentHandler::class.java)
+        closeGetStartedScreenIfExists()
+        onView(withId(R.id.drawer_layout)).perform(DrawerActions.open())
+        onView(withId(R.id.nav_settings)).perform(click())
+        onView(withId(R.id.search)).perform(click())
+        onView(allOf(withId(R.id.search), hasFocus())).perform(typeText("Card"))
+        onView(withText(R.string.card_zoom)).perform(click())
+        onView(withId(R.id.settings_container)).check(matches(isDisplayed()))
+        onView(withText(R.string.notification_pref)).perform(click())
+        pressBack()
+        onView(withClassName(endsWith("PreferencesActivity"))).check(doesNotExist())
+    }
+}
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/Preferences.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/Preferences.kt
index bac505d93862..e0c8b48de531 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/Preferences.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/Preferences.kt
@@ -54,6 +54,8 @@ class PreferencesFragment :
             override fun handleOnBackPressed() {
                 if (!settingsIsSplit && childFragmentManager.backStackEntryCount > 0) {
                     childFragmentManager.popBackStack()
+                } else if (parentFragmentManager.backStackEntryCount > 0) {
+                    parentFragmentManager.popBackStack()
                 } else {
                     requireActivity().finish()
                 }

From a33be053b1f55edeb597cdf93760d5c474b51de0 Mon Sep 17 00:00:00 2001
From: dorrin-sot <dorrinsotoudeh123@gmail.com>
Date: Fri, 21 Mar 2025 22:24:30 +0330
Subject: [PATCH 185/200] Fix #17892 Duplicate Due column in Card Browser

- Added Unit test for Fix #17892 Duplicate Due column in Card Browser
---
 .../anki/browser/BrowserColumnCollection.kt   |  4 +++-
 .../java/com/ichi2/anki/CardBrowserTest.kt    | 21 +++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserColumnCollection.kt b/AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserColumnCollection.kt
index 11278ee67a22..c5c5b9a1e955 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserColumnCollection.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserColumnCollection.kt
@@ -66,7 +66,9 @@ class BrowserColumnCollection(
                     val value = mode.defaultColumns()
                     value.split(SEPARATOR_CHAR).map { CardBrowserColumn.fromColumnKey(it) }
                 }
-            return BrowserColumnCollection(columns)
+            // shared preferences had duplicate columns for unknown reasons
+            // this removes duplicates on load, any saves will be de-duplicated
+            return BrowserColumnCollection(columns.distinct())
         }
 
         class ColumnReplacement(
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt
index ed927c652fb0..e540623d517d 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt
@@ -1153,6 +1153,27 @@ class CardBrowserTest : RobolectricTest() {
         assertThat("column 2 reset to default", cardBrowser.columnHeadings[1], equalTo("Card Type"))
     }
 
+    @Test
+    fun `loading duplicate columns returns distinct`() {
+        // GIVEN: Shared preferences exists for display column selections
+        // with duplicate values
+        getSharedPrefs().edit {
+            putString(BrowserConfig.ACTIVE_CARD_COLUMNS_KEY, "question|cardDue|cardDue|deck")
+        }
+
+        // WHEN: CardBrowser is created
+        val cardBrowser: CardBrowser = getBrowserWithNotes(7)
+
+        // THEN: CardBrowser only shows distinct columns.
+        for ((i, column) in listOf("Question", "Due", "Deck").withIndex()) {
+            assertThat(
+                "column ${i + 1} reset to default",
+                cardBrowser.columnHeadings[i],
+                equalTo(column),
+            )
+        }
+    }
+
     @Test
     @Ignore("issues with launchCollectionInLifecycleScope")
     fun `column titles update when moving to notes mode`() =

From c9c58c3efb8adf535fdfb4a7237ae56a870fafef Mon Sep 17 00:00:00 2001
From: Mike Hardy <github@mikehardy.net>
Date: Sat, 5 Apr 2025 20:34:46 +0000
Subject: [PATCH 186/200] Bumped version to 2.21alpha15

---
 AnkiDroid/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AnkiDroid/build.gradle b/AnkiDroid/build.gradle
index 86c61ec85cf4..6667de718efe 100644
--- a/AnkiDroid/build.gradle
+++ b/AnkiDroid/build.gradle
@@ -85,8 +85,8 @@ android {
         //
         // This ensures the correct ordering between the various types of releases (dev < alpha < beta < release) which is
         // needed for upgrades to be offered correctly.
-        versionCode=22100114
-        versionName="2.21alpha14"
+        versionCode=22100115
+        versionName="2.21alpha15"
         minSdk libs.versions.minSdk.get().toInteger()
 
         // After #13695: change .tests_emulator.yml

From 4effaee893776411c05bc19ea4d88665b0ee71bc Mon Sep 17 00:00:00 2001
From: AnkiDroid Translations <ankidroid@ankidroid.org>
Date: Sun, 6 Apr 2025 09:32:42 +0000
Subject: [PATCH 187/200] Updated strings from Crowdin

---
 .../src/main/res/values-cs/02-strings.xml     |   8 +-
 .../src/main/res/values-cs/03-dialogs.xml     |  12 +-
 .../src/main/res/values-cs/06-statistics.xml  |   2 +-
 .../src/main/res/values-cs/07-cardbrowser.xml |   2 +-
 .../src/main/res/values-cs/08-widget.xml      |   4 +-
 .../src/main/res/values-cs/10-preferences.xml |   2 +-
 .../main/res/values-cs/17-model-manager.xml   |   2 +-
 .../src/main/res/values-de/02-strings.xml     |  14 +-
 .../src/main/res/values-de/03-dialogs.xml     |  12 +-
 .../src/main/res/values-de/07-cardbrowser.xml |   2 +-
 .../src/main/res/values-de/10-preferences.xml |   4 +-
 .../main/res/values-de/17-model-manager.xml   |   4 +-
 .../src/main/res/values-es-rAR/02-strings.xml |  18 +-
 .../src/main/res/values-es-rAR/03-dialogs.xml |  12 +-
 .../main/res/values-es-rAR/07-cardbrowser.xml |   2 +-
 .../res/values-es-rAR/17-model-manager.xml    |   4 +-
 .../src/main/res/values-es-rES/02-strings.xml |  18 +-
 .../src/main/res/values-es-rES/03-dialogs.xml |  12 +-
 .../main/res/values-es-rES/07-cardbrowser.xml |   2 +-
 .../res/values-es-rES/17-model-manager.xml    |   4 +-
 AnkiDroid/src/main/res/values-gl/01-core.xml  | 136 ++++++------
 .../src/main/res/values-gl/02-strings.xml     | 210 +++++++++---------
 .../src/main/res/values-zh-rCN/02-strings.xml |   2 +-
 .../src/main/res/values-zh-rCN/03-dialogs.xml |   2 +-
 .../main/res/values-zh-rCN/10-preferences.xml |   2 +-
 25 files changed, 246 insertions(+), 246 deletions(-)

diff --git a/AnkiDroid/src/main/res/values-cs/02-strings.xml b/AnkiDroid/src/main/res/values-cs/02-strings.xml
index e82e05cc283a..e1b6981a0518 100644
--- a/AnkiDroid/src/main/res/values-cs/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-cs/02-strings.xml
@@ -82,7 +82,7 @@
     <string name="webview_crash_loop_dialog_content">Systémovému WebView se nepodařilo vykreslit kartu „%1$s“.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Příznaky</string>
     <!-- Custom study options -->
-    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <string name="custom_study_loading_tags">Vytváří se seznam štítků&#8230;</string>
     <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d přeskočená</item>
@@ -90,7 +90,7 @@
         <item quantity="many">+%d přeskočené</item>
         <item quantity="other">+%d přeskočených</item>
     </plurals>
-    <string name="studyoptions_total_new_label">Všechny nové kartičky</string>
+    <string name="studyoptions_total_new_label">Všechny nové karty</string>
     <string name="studyoptions_total_label">Všechny karty</string>
     <!-- Card editor -->
     <string name="cardeditor_title_edit_card" maxLength="28">Upravit poznámku</string>
@@ -317,7 +317,7 @@
     <string name="browser_options_dialog_heading">Možnosti prohlížeče</string>
     <string name="audio_saved">Nahrávka uložena</string>
     <string name="deleting_selected_notes">Mažou se vybrané poznámky</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Klepněte na mikrofon pro poslech</string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Klepnutím na hlas poslechnout</string>
     <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Hlas by měl být před použitím nainstalován</string>
     <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Přesto použít</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Chyba převodu textu na řeč (%s)</string>
@@ -347,7 +347,7 @@
     <!--Keyboard shortcuts dialog-->
     <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Výběr balíčků</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Odstranit balíček bez potvrzení</string>
-    <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Editor Paznámek</string>
+    <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Editor poznámek</string>
     <string name="select_deck" comment="Description of the shortcut that opens the deck selection dialog">Vybrat balíček</string>
     <string name="select_note_type" comment="Description of the shortcut that shows the note selection spinner">Vybrat typ poznámky</string>
     <string name="tag_editor" comment="Description of the shortcut that opens the tags dialog">Editor štítků</string>
diff --git a/AnkiDroid/src/main/res/values-cs/03-dialogs.xml b/AnkiDroid/src/main/res/values-cs/03-dialogs.xml
index 7b1e6235e1c8..b73696cd1061 100644
--- a/AnkiDroid/src/main/res/values-cs/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-cs/03-dialogs.xml
@@ -68,7 +68,7 @@
     <string name="answering_error_title">Chyba databáze</string>
     <string name="answering_error_message">Zápis do kolekce se nezdařil. Databáze může být poškozena nebo nemusí být dostatek prázdného místa na disku.\n\nPokud se to děje častěji, zkuste zkontrolovat databázi, opravit kolekci nebo ji obnovit ze zálohy. Klepněte na „možnosti“.\n\nNebo to může být také chyba AnkiDroid, prosím nahlaste chybu, abychom to mohli zkontrolovat.</string>
     <string name="answering_error_report">Hlášení chyby</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
+    <string name="storage_full_message">Není dostatek volného místa v úložišti pro otevření AnkiDroid. Uvolněte nějaké místo, abyste mohli pokračovat.</string>
     <string name="repair_deck_dialog">Opravdu se chcete pokusit opravit databázi?\n\nPřed obnovou bude vytvořena kopie v podadresáři „%s“.</string>
     <string name="intent_aedict_empty">Kategorie „výchozí“ je prázdná</string>
     <string name="intent_aedict_category">Chcete-li přidat karty do AnkiDroid, odstraňte všechny kategorie Poznámkového bloku nebo přidejte jednu s názvem „default“</string>
@@ -77,7 +77,7 @@
     <string name="custom_study_forgotten">Opakovat zapomenuté karty z posledních x dnů:</string>
     <string name="custom_study_ahead">Opakovat dopředu o x dnů:</string>
     <string name="custom_study_preview">Zkoušení nových karet přidaných v posledních x dnech:</string>
-    <string name="custom_study_tags">Select x cards from the deck:</string>
+    <string name="custom_study_tags">Vybrat x karet z balíčku:</string>
     <string name="storage_full_title">Úložiště je plné</string>
     <string name="storage_almost_full_title">Úložiště téměř plné</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">Není místo</string>
@@ -219,10 +219,10 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Později</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Znovu nezobrazovat</string>
     <string name="dismiss_backup_warning_title">Varování před ztrátou dat</string>
-    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
-    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_new_user">V důsledku změn ochrany osobních údajů systému Android budou vaše data a automatické zálohy odstraněny z telefonu, pokud bude aplikace odinstalována</string>
+    <string name="dismiss_backup_warning_upgrade">V důsledku změn ochrany osobních údajů systému Android budou vaše data a automatické zálohy nedostupné, pokud bude aplikace odinstalována</string>
     <string name="deck_already_exists">Balíček již existuje</string>
-    <string name="empty_deck_name">Deck name cannot be empty</string>
+    <string name="empty_deck_name">Název balíčku nemůže být prázdný</string>
     <string name="create_deck_numeric_hint">Pokud máte problémy s pořadím balíčků (např. „10“ je před „2“), nahraďte „2“ číslem „02“</string>
     <!-- Set Due Date -->
     <string name="set_due_date_match_interval" comment="when setting a card\'s due date, this checkbox also changes the interval of the card">Nastavit interval na stejnou hodnotu</string>
@@ -248,7 +248,7 @@
     <string name="set_due_date_range_start" comment="\'Set Due Date\' may change the due date of a card to a random number of days in the future. This labels the \'minimum\' value of this range (inclusive)">Od</string>
     <string name="set_due_date_range_end" comment="\'Set Due Date\' may change the due date of a card to a random number of days in the future. This labels the \'maximum\' value of this range (inclusive)">Do</string>
     <!-- Instant Note Editor -->
-    <string name="cloze_note_required">Cloze Type Note Required</string>
+    <string name="cloze_note_required">Je vyžadována poznámka typu doplňovačka</string>
     <string name="cloze_not_found_message">No Cloze type note found, open the Note Editor or try again after adding a Cloze type note.</string>
     <string name="open">Otevřít</string>
     <string name="change_cloze_number">Change cloze number</string>
diff --git a/AnkiDroid/src/main/res/values-cs/06-statistics.xml b/AnkiDroid/src/main/res/values-cs/06-statistics.xml
index a92f88bf7059..32161cae2344 100644
--- a/AnkiDroid/src/main/res/values-cs/06-statistics.xml
+++ b/AnkiDroid/src/main/res/values-cs/06-statistics.xml
@@ -44,5 +44,5 @@
 ~ this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <resources>
-    <string name="open_statistics" comment="Description of the shortcut that opens the statistics page">Otevřít statistiku</string>
+    <string name="open_statistics" comment="Description of the shortcut that opens the statistics page">Otevřít statistiky</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-cs/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-cs/07-cardbrowser.xml
index afbb3b815d9d..ee9b0d12b0bd 100644
--- a/AnkiDroid/src/main/res/values-cs/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-cs/07-cardbrowser.xml
@@ -130,5 +130,5 @@
     <string name="user_potential_columns">Dostupné</string>
     <string name="include_column">Přidat sloupec</string>
     <string name="exclude_column">Odebrat sloupec</string>
-    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
+    <string name="browser_find_replace_loading_fields">Načítání jmen polí&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-cs/08-widget.xml b/AnkiDroid/src/main/res/values-cs/08-widget.xml
index 07579668aaf6..e7cc06c2ac24 100644
--- a/AnkiDroid/src/main/res/values-cs/08-widget.xml
+++ b/AnkiDroid/src/main/res/values-cs/08-widget.xml
@@ -80,6 +80,6 @@
         <item quantity="many">Můžete vybrat až %d balíčku.</item>
         <item quantity="other">Můžete vybrat až %d balíčků.</item>
     </plurals>
-    <string name="empty_widget_state" comment="To denote the widget is empty">Chybějící balíček. Klepněte pro nastavení</string>
-    <string name="empty_collection_state_in_widget" comment="To denote the collection is empty">Kolekce je prázdná, přidejte balíčky pomocí aplikace a poté znovu konfugurujte</string>
+    <string name="empty_widget_state" comment="To denote the widget is empty">Chybějící balíček. Klepnutím jej nastavíte.</string>
+    <string name="empty_collection_state_in_widget" comment="To denote the collection is empty">Kolekce je prázdná, přidejte balíčky pomocí aplikace, a poté znovu konfugurujte</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-cs/10-preferences.xml b/AnkiDroid/src/main/res/values-cs/10-preferences.xml
index b02c8043fab6..94da29905f15 100644
--- a/AnkiDroid/src/main/res/values-cs/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-cs/10-preferences.xml
@@ -70,7 +70,7 @@
     <string name="pref_cat_advanced" maxLength="41">Pokročilé</string>
     <string name="pref_cat_workarounds" maxLength="41">Možná zástupná řešení</string>
     <string name="pref_cat_plugins" maxLength="41">Pluginy</string>
-    <string name="pref_cat_editing" maxLength="41">Editing</string>
+    <string name="pref_cat_editing" maxLength="41">Editace</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Šířka tahu</string>
     <string name="use_input_tag" maxLength="41">Napište odpověď do karty</string>
diff --git a/AnkiDroid/src/main/res/values-cs/17-model-manager.xml b/AnkiDroid/src/main/res/values-cs/17-model-manager.xml
index b0e4c7e4f5b2..6ea937511ae3 100644
--- a/AnkiDroid/src/main/res/values-cs/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-cs/17-model-manager.xml
@@ -70,7 +70,7 @@
     <!--Model Add Suffixes-->
     <string name="model_browser_add_add">Přidat: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Kopírovat: %1$s</string>
+    <string name="model_browser_add_clone">Klonovat: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Zadejte šablonu, kterou bude prohlížeč karet používat k zobrazení vašich karet. Použijte tuto možnost, abyste zobrazili stručnější odpovědi.\n\nŠablona líce\n„Hlavní město země {{Country}} je:“\nmůže být zestručněna v prohlížeči karet na\n„Hlavní město: {{Country}}“</string>
     <string name="card_template_browser_appearance_question_format">Formát otázky</string>
diff --git a/AnkiDroid/src/main/res/values-de/02-strings.xml b/AnkiDroid/src/main/res/values-de/02-strings.xml
index 0e3c0be30fdd..69edeb73b954 100644
--- a/AnkiDroid/src/main/res/values-de/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-de/02-strings.xml
@@ -82,7 +82,7 @@
     <string name="webview_crash_loop_dialog_content">System-WebView konnte die Karte »%1$s« nicht rendern.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Flaggen</string>
     <!-- Custom study options -->
-    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <string name="custom_study_loading_tags">Erstelle Schlagwortliste&#8230;</string>
     <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d aufgeschoben</item>
@@ -188,7 +188,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Hintergrund</string>
     <string name="choose_an_image" maxLength="41">Bild auswählen</string>
-    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Hintergrund entfernen</string>
     <string name="remove_background_image">Hintergrund entfernen?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Standard wiederherstellen</string>
@@ -234,7 +234,7 @@
     <string name="note_editor_image_too_large">Das Bild ist zu groß, bitte fügen Sie das Bild manuell ein</string>
     <string name="note_editor_video_too_large">Die Videodatei ist zu groß, bitte fügen Sie das Video manuell ein</string>
     <string name="note_editor_audio_too_large">Die Audiodatei ist zu groß, bitte fügen Sie das Audio manuell ein</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android-Backup im Gange. Bitte versuchen Sie es erneut</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">Bitte verwenden Sie iManager, um AnkiDroid das Hinzufügen von Verknüpfungen zu erlauben</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Ihr Startbildschirm erlaubt AnkiDroid nicht, Verknüpfungen hinzuzufügen</string>
     <string name="create_shortcut_error">Fehler beim Hinzufügen der Verknüpfung: %s</string>
@@ -307,13 +307,13 @@
     <string name="browser_options_dialog_heading">Browser Einstellungen</string>
     <string name="audio_saved">Aufnahme gespeichert</string>
     <string name="deleting_selected_notes">Lösche ausgewählte Notizen</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tippen Sie auf eine Stimme, um sie anzuhören</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Stimme sollte vor der Verwendung installiert sein</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Trotzdem verwenden</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Fehler in der Sprachausgabe (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Installieren</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Die Text-zu-Sprache Einstellungen konnten nicht geöffnet werden</string>
     <string name="shared_decks_login_required">Bitte melde dich an, um weitere Stapel herunterzuladen</string>
     <string name="deck_description_field_hint">Beschreibung</string>
diff --git a/AnkiDroid/src/main/res/values-de/03-dialogs.xml b/AnkiDroid/src/main/res/values-de/03-dialogs.xml
index 4b74d41029c6..f1998049d2eb 100644
--- a/AnkiDroid/src/main/res/values-de/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-de/03-dialogs.xml
@@ -50,7 +50,7 @@
     <string name="delete_deck_title">Stapel löschen?</string>
     <plurals name="delete_deck_message">
         <item quantity="one">Alle karten in %1$s löschen? Es enthält %2$d karte</item>
-        <item quantity="other">Alle karten in %1$s löschen? Es enthält %2$d karten</item>
+        <item quantity="other">Alle Karten in %1$s löschen? Es enthält %2$d Karten</item>
     </plurals>
     <string name="delete_cram_deck_message">Gefilterten Stapel „%s“ löschen und alle Karten zurück in ihre ursprünglichen Stapel senden?</string>
     <string name="no_tts_available_message">Keine Vorlesesprache verfügbar</string>
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Datenbankfehler</string>
     <string name="answering_error_message">Es konnte nicht in die Sammlung geschrieben werden. Dies kann an einer beschädigten Datenbank oder an unzureichendem Speicherplatz liegen.\n\nFalls dies häufiger vorkommt, versuchen Sie bitte, die Datenbank zu überprüfen, die Sammlung zu reparieren oder sie von einer Sicherung wiederherzustellen. Tippen Sie hierfür auf »Optionen«.\n\nEs könnte aber auch ein Fehler in AnkiDroid vorliegen. Damit wird dies überprüfen können, bitten wir Sie, den Fehler zu melden.</string>
     <string name="answering_error_report">Fehler melden</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
+    <string name="storage_full_message">Es gibt nicht genug freien Speicherplatz, um AnkiDroid zu öffnen. Geben Sie ein wenig Speicherplatz frei, um fortzufahren.</string>
     <string name="repair_deck_dialog">Möchten Sie wirklich versuchen, die Datenbank zu reparieren?\n\nBevor der Versuch startet, wird eine Kopie im Unterordner »%s« angelegt.</string>
     <string name="intent_aedict_empty">Kategorie »Standard« ist leer</string>
     <string name="intent_aedict_category">Entfernen Sie alle Notepad-Kategorien um Karten zu AnkiDroid hinzuzufügen oder fügen Sie die Kategorie »Standard« hinzu</string>
@@ -73,7 +73,7 @@
     <string name="custom_study_forgotten">Karten wiederholen, die in den letzten x Tagen vergessen wurden:</string>
     <string name="custom_study_ahead">x Tage im Voraus lernen:</string>
     <string name="custom_study_preview">Vorschau auf neue Karten, die in den letzten x Tagen hinzugefügt wurden:</string>
-    <string name="custom_study_tags">Select x cards from the deck:</string>
+    <string name="custom_study_tags">Wählen Sie x Karten aus dem Stapel aus:</string>
     <string name="storage_full_title">Speicher voll</string>
     <string name="storage_almost_full_title">Speicher fast voll</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">Kein Speicherplatz</string>
@@ -105,8 +105,8 @@
     <string name="check_media_title">Medien überprüfen?</string>
     <string name="check_media_warning">Bei großen Mediensammlungen kann dies lange dauern</string>
     <string name="check_media_message">Medien werden überprüft &#8230;</string>
-    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
-    <string name="check_media_tags_added">Tags added</string>
+    <string name="check_media_adding_missing_tag">Schlagworte werden hinzugefügt&#8230;</string>
+    <string name="check_media_tags_added">Schlagworte hinzugefügt</string>
     <string name="delete_media_message">Medien werden gelöscht &#8230;</string>
     <string name="delete_media_result_title">Löschergebnis</string>
     <plurals name="delete_media_result_message">
@@ -211,7 +211,7 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Später</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Nicht erneut anzeigen</string>
     <string name="dismiss_backup_warning_title">Warnung wegen Datenverlust</string>
-    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_new_user">Aufgrund von Änderungen in den Datenschutzeinstellungen von Android werden deine Daten und automatische Backups gelöscht, sobald du die App deinstallierst.</string>
     <string name="dismiss_backup_warning_upgrade">Aufgrund von Android-Datenschutzänderungen sind Ihre Daten und automatischen Backups nicht mehr zugänglich, wenn die App deinstalliert wird</string>
     <string name="deck_already_exists">Stapel bereits vorhanden</string>
     <string name="empty_deck_name">Stapelname darf nicht leer sein</string>
diff --git a/AnkiDroid/src/main/res/values-de/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-de/07-cardbrowser.xml
index 6a19ff082315..7286fcee06d1 100644
--- a/AnkiDroid/src/main/res/values-de/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-de/07-cardbrowser.xml
@@ -118,5 +118,5 @@
     <string name="user_potential_columns">Verfügbar</string>
     <string name="include_column">Spalte einbeziehen</string>
     <string name="exclude_column">Spalte ausschließen</string>
-    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
+    <string name="browser_find_replace_loading_fields">Abrufen der Feldnamen&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-de/10-preferences.xml b/AnkiDroid/src/main/res/values-de/10-preferences.xml
index 28ab439abd97..292a681c5210 100644
--- a/AnkiDroid/src/main/res/values-de/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-de/10-preferences.xml
@@ -68,7 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Erweitert</string>
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plug-Ins</string>
-    <string name="pref_cat_editing" maxLength="41">Editing</string>
+    <string name="pref_cat_editing" maxLength="41">Bearbeitung</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Pinselbreite</string>
     <string name="use_input_tag" maxLength="41">Antwort in Karte eintippen</string>
@@ -296,7 +296,7 @@
     <string name="pref_cat_dev_options" maxLength="41">Entwicklermodus</string>
     <string name="dev_options_enabled_pref" maxLength="41">Entwicklermodus aktivieren</string>
     <string name="disable_dev_options">Entwicklermodus deaktivieren</string>
-    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
+    <string name="dev_options_warning">Bevor Sie den Entwicklermodus aktivieren, beachten Sie bitte, dass Sie damit die App oder Ihre Sammlung beschädigen können.\n\nBeachten Sie außerdem, dass diese Einstellungen für die meisten Benutzer nicht geeignet sind und deshalb nicht übersetzt werden und daher nur auf Englisch verfügbar sind.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
diff --git a/AnkiDroid/src/main/res/values-de/17-model-manager.xml b/AnkiDroid/src/main/res/values-de/17-model-manager.xml
index fa5352aa4f28..df2c69a0e48b 100644
--- a/AnkiDroid/src/main/res/values-de/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-de/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">Möchten Sie diesen Notiztyp wirklich löschen?</string>
     <string name="field_delete_warning">Möchten Sie dieses Feld wirklich löschen?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s</string>
+    <string name="model_browser_add_add">Hinzufügen: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s</string>
+    <string name="model_browser_add_clone">Klonen: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Geben Sie die Vorlage ein, die die Kartenübersicht zum Anzeigen Ihrer Karten verwendet, um eine kürzere Antwort anzuzeigen.\n\nEine Vorderseitenvorlage von\n»Die Hauptstadt von {{Country}} ist:«\nkönnte in der Kartenübersicht komprimiert werden zu\n»Hauptstadt: {{Country}}«</string>
     <string name="card_template_browser_appearance_question_format">Frageformat</string>
diff --git a/AnkiDroid/src/main/res/values-es-rAR/02-strings.xml b/AnkiDroid/src/main/res/values-es-rAR/02-strings.xml
index 12424cb39be6..2ad02dcdca5d 100644
--- a/AnkiDroid/src/main/res/values-es-rAR/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-es-rAR/02-strings.xml
@@ -82,7 +82,7 @@
     <string name="webview_crash_loop_dialog_content">WebView del sistema no pudo procesar la tarjeta \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Banderas</string>
     <!-- Custom study options -->
-    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <string name="custom_study_loading_tags">Creando lista de etiquetas&#8230;</string>
     <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d enterrada</item>
@@ -188,7 +188,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Fondo</string>
     <string name="choose_an_image" maxLength="41">Elige una imagen</string>
-    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Eliminar fondo</string>
     <string name="remove_background_image">¿Quitar fondo?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restablecer Predefinidos</string>
@@ -234,7 +234,7 @@
     <string name="note_editor_image_too_large">La imagen es demasiado grande, por favor inserta la imagen manualmente</string>
     <string name="note_editor_video_too_large">El archivo de vídeo es demasiado grande, por favor inserta el vídeo manualmente</string>
     <string name="note_editor_audio_too_large">El archivo de audio es demasiado grande, por favor inserta el audio manualmente</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Copia de seguridad de Android en progreso. Por favor, inténtalo de nuevo</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">Puede que necesite usar iManager para permitir que AnkiDroid añada accesos directos</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Tu pantalla de inicio no permite que AnkiDroid añada accesos directos</string>
     <string name="create_shortcut_error">Error al añadir acceso directo: %s</string>
@@ -250,7 +250,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Descargar mazo</string>
-    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Abrir en el navegador</string>
     <string name="try_again">Inténtalo de nuevo</string>
     <string name="cancel_download">Cancelar descarga</string>
     <string name="cancel_download_question_title">¿Cancelar descarga?</string>
@@ -307,14 +307,14 @@
     <string name="browser_options_dialog_heading">Opciones del explorador</string>
     <string name="audio_saved">Grabación guardada</string>
     <string name="deleting_selected_notes">Eliminando notas seleccionadas</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Toca una voz para escucharla</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">La voz debe estar instalada antes de usarse</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Utilizar de todos modos</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Error de conversión de texto a voz (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Instalar</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Error al abrir la configuración de texto a voz</string>
     <string name="shared_decks_login_required">Por favor, inicia sesión para descargar más mazos</string>
     <string name="deck_description_field_hint">Descripción</string>
     <string name="failed_to_copy">Error al copiar</string>
diff --git a/AnkiDroid/src/main/res/values-es-rAR/03-dialogs.xml b/AnkiDroid/src/main/res/values-es-rAR/03-dialogs.xml
index 62d24f4e4739..4ed4e325db46 100644
--- a/AnkiDroid/src/main/res/values-es-rAR/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-es-rAR/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Error en base de datos</string>
     <string name="answering_error_message">Se ha producido un error al escribir en la colección. Esto podría estar relacionado con una base de datos dañada o con un espacio en disco insuficiente.\n\nSi esto ocurre con más frecuencia, intenta verificar la base de datos, reparar la colección o restaurar desde una copia de seguridad. Para ello, presiona \"Opciones\".\n\nDe todos modos, podría ser un error de AnkiDroid; por favor, informa del error para que podamos comprobarlo.</string>
     <string name="answering_error_report">Reportar un error</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
+    <string name="storage_full_message">No hay suficiente espacio de almacenamiento libre para abrir AnkiDroid. Libera algo de espacio para continuar.</string>
     <string name="repair_deck_dialog">¿Desea realmente intentar reparar la base de datos?\n\nAntes de comenzar con el intento, una copia será creada en el subdirectorio \'%s\'.</string>
     <string name="intent_aedict_empty">La categoría \'predeterminado\' está vacía</string>
     <string name="intent_aedict_category">Para añadir tarjetas a AnkiDroid elimine todas las categorías de los blocks de notas y agregue una llamada \'predeterminado\'</string>
@@ -73,7 +73,7 @@
     <string name="custom_study_forgotten">Repasar tarjetas olvidadas en los últimos x días:</string>
     <string name="custom_study_ahead">Revisar anticipadamente en x días:</string>
     <string name="custom_study_preview">Previsualizar nuevas tarjetas añadidas en los últimos x días:</string>
-    <string name="custom_study_tags">Select x cards from the deck:</string>
+    <string name="custom_study_tags">Selecciona x tarjetas del mazo:</string>
     <string name="storage_full_title">Almacenamiento lleno</string>
     <string name="storage_almost_full_title">Almacenamiento casi lleno</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">Sin spacio</string>
@@ -105,8 +105,8 @@
     <string name="check_media_title">¿Comprobar archivos multimedia?</string>
     <string name="check_media_warning">Esto podría tardar mucho tiempo con colecciones de grandes archivos multimedia</string>
     <string name="check_media_message">Comprobando archivos multimedia&#8230;</string>
-    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
-    <string name="check_media_tags_added">Tags added</string>
+    <string name="check_media_adding_missing_tag">Añadiendo etiquetas&#8230;</string>
+    <string name="check_media_tags_added">Etiquetas añadidas</string>
     <string name="delete_media_message">Eliminando multimedia&#8230;</string>
     <string name="delete_media_result_title">Resultado de la eliminación</string>
     <plurals name="delete_media_result_message">
@@ -211,8 +211,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Más tarde</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">No mostrar de nuevo</string>
     <string name="dismiss_backup_warning_title">Aviso de pérdida de datos</string>
-    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
-    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_new_user">Debido a cambios en la privacidad de Android, tus datos y copias de seguridad automatizadas se eliminarán de tu teléfono si la aplicación es desinstalada</string>
+    <string name="dismiss_backup_warning_upgrade">Debido a cambios en la privacidad de Android, tus datos y copias de seguridad automatizadas serán inaccesibles si la aplicación es desinstalada</string>
     <string name="deck_already_exists">El mazo ya existe.</string>
     <string name="empty_deck_name">El nombre del mazo no puede estar vacío</string>
     <string name="create_deck_numeric_hint">Si tienes problemas de ordenamiento de mazos (por ejemplo ‘10’ aparece antes de ‘2’), reemplaza ‘2’ con ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-es-rAR/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-es-rAR/07-cardbrowser.xml
index 67606f36f7cb..40e900887b19 100644
--- a/AnkiDroid/src/main/res/values-es-rAR/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-es-rAR/07-cardbrowser.xml
@@ -118,5 +118,5 @@
     <string name="user_potential_columns">Disponible</string>
     <string name="include_column">Incluir columna</string>
     <string name="exclude_column">Excluir columna</string>
-    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
+    <string name="browser_find_replace_loading_fields">Recuperando nombres de campos&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-es-rAR/17-model-manager.xml b/AnkiDroid/src/main/res/values-es-rAR/17-model-manager.xml
index 92fa41fc40dd..6acdbf864c73 100644
--- a/AnkiDroid/src/main/res/values-es-rAR/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-es-rAR/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">¿Está seguro que desea eliminar este tipo de nota?</string>
     <string name="field_delete_warning">¿Seguro que deseas eliminar este campo?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s</string>
+    <string name="model_browser_add_add">Añadir: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s</string>
+    <string name="model_browser_add_clone">Clonar: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Introduce la plantilla que utilizará el navegador de la tarjeta para mostrar tus tarjetas. Utiliza esto para mostrar una respuesta más concisa.\n\nUna plantilla del anverso de\n“La capital de {{Country}} es:”\npodría comprimirse en el navegador de la tarjeta a\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Formato de Pregunta</string>
diff --git a/AnkiDroid/src/main/res/values-es-rES/02-strings.xml b/AnkiDroid/src/main/res/values-es-rES/02-strings.xml
index 49b477c02c1e..656b49c9a50a 100644
--- a/AnkiDroid/src/main/res/values-es-rES/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-es-rES/02-strings.xml
@@ -82,7 +82,7 @@
     <string name="webview_crash_loop_dialog_content">WebView del sistema no pudo procesar la tarjeta \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Banderas</string>
     <!-- Custom study options -->
-    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <string name="custom_study_loading_tags">Creando lista de etiquetas&#8230;</string>
     <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d enterrada</item>
@@ -188,7 +188,7 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Fondo</string>
     <string name="choose_an_image" maxLength="41">Elige una imagen</string>
-    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
+    <string name="remove_wallpaper_image" maxLength="41">Eliminar fondo</string>
     <string name="remove_background_image">¿Quitar fondo?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restablecer Predefinidos</string>
@@ -234,7 +234,7 @@
     <string name="note_editor_image_too_large">La imagen es demasiado grande, por favor inserta la imagen manualmente</string>
     <string name="note_editor_video_too_large">El archivo de vídeo es demasiado grande, por favor inserta el vídeo manualmente</string>
     <string name="note_editor_audio_too_large">El archivo de audio es demasiado grande, por favor inserta el audio manualmente</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Copia de seguridad de Android en progreso. Por favor, inténtalo de nuevo</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">Puede que necesite usar iManager para permitir que AnkiDroid añada accesos directos</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Tu pantalla de inicio no permite que AnkiDroid añada accesos directos</string>
     <string name="create_shortcut_error">Error al añadir acceso directo: %s</string>
@@ -250,7 +250,7 @@
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Descargar mazo</string>
-    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Abrir en el navegador</string>
     <string name="try_again">Inténtalo de nuevo</string>
     <string name="cancel_download">Cancelar descarga</string>
     <string name="cancel_download_question_title">¿Cancelar descarga?</string>
@@ -307,14 +307,14 @@
     <string name="browser_options_dialog_heading">Opciones del explorador</string>
     <string name="audio_saved">Grabación guardada</string>
     <string name="deleting_selected_notes">Eliminando notas seleccionadas</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Toca una voz para escucharla</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">La voz debe estar instalada antes de usarse</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Utilizar de todos modos</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Error de conversión de texto a voz (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Instalar</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Error al abrir la configuración de texto a voz</string>
     <string name="shared_decks_login_required">Por favor, inicia sesión para descargar más mazos</string>
     <string name="deck_description_field_hint">Descripción</string>
     <string name="failed_to_copy">Error al copiar</string>
diff --git a/AnkiDroid/src/main/res/values-es-rES/03-dialogs.xml b/AnkiDroid/src/main/res/values-es-rES/03-dialogs.xml
index eebae194b3ca..bbf321b3b8ac 100644
--- a/AnkiDroid/src/main/res/values-es-rES/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-es-rES/03-dialogs.xml
@@ -64,7 +64,7 @@
     <string name="answering_error_title">Error en la base de datos</string>
     <string name="answering_error_message">Se ha producido un error al escribir en la colección. Esto podría estar relacionado con una base de datos dañada o con un espacio en disco insuficiente.\n\nSi esto ocurre con más frecuencia, intenta verificar la base de datos, reparar la colección o restaurar desde una copia de seguridad. Para ello, presiona \"Opciones\".\n\nDe todos modos, podría ser un error de AnkiDroid; por favor, informa del error para que podamos comprobarlo.</string>
     <string name="answering_error_report">Reportar error</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
+    <string name="storage_full_message">No hay suficiente espacio de almacenamiento libre para abrir AnkiDroid. Libera algo de espacio para continuar.</string>
     <string name="repair_deck_dialog">¿Realmente deseas intentar reparar la base de datos?\n\nAntes de iniciar el intento, se creará una copia en la subcarpeta \'%s\'.</string>
     <string name="intent_aedict_empty">La categoría \'por defecto\' está vacía</string>
     <string name="intent_aedict_category">Para añadir tarjetas AnkiDroid borra todas las categorías del Bloc de notas o agrega una llamada \'por defecto\'</string>
@@ -73,7 +73,7 @@
     <string name="custom_study_forgotten">Revisar tarjetas olvidadas en los últimos x días:</string>
     <string name="custom_study_ahead">Revisar con x días de adelanto:</string>
     <string name="custom_study_preview">Previsualizar nuevas tarjetas añadidas en los últimos x días:</string>
-    <string name="custom_study_tags">Select x cards from the deck:</string>
+    <string name="custom_study_tags">Selecciona x tarjetas del mazo:</string>
     <string name="storage_full_title">Almacenamiento lleno</string>
     <string name="storage_almost_full_title">Almacenamiento casi lleno</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">Sin spacio</string>
@@ -105,8 +105,8 @@
     <string name="check_media_title">¿Comprobar archivos multimedia?</string>
     <string name="check_media_warning">Esto puede tardar mucho con las colecciones de grandes archivos multimedia</string>
     <string name="check_media_message">Comprobando archivos multimedia&#8230;</string>
-    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
-    <string name="check_media_tags_added">Tags added</string>
+    <string name="check_media_adding_missing_tag">Añadiendo etiquetas&#8230;</string>
+    <string name="check_media_tags_added">Etiquetas añadidas</string>
     <string name="delete_media_message">Eliminando multimedia&#8230;</string>
     <string name="delete_media_result_title">Resultado de la eliminación</string>
     <plurals name="delete_media_result_message">
@@ -211,8 +211,8 @@
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Más tarde</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">No mostrar de nuevo</string>
     <string name="dismiss_backup_warning_title">Aviso de pérdida de datos</string>
-    <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
-    <string name="dismiss_backup_warning_upgrade">Due to Android privacy changes, your data and automated backups will be inaccessible if the app is uninstalled</string>
+    <string name="dismiss_backup_warning_new_user">Debido a cambios en la privacidad de Android, tus datos y copias de seguridad automatizadas se eliminarán de tu teléfono si la aplicación es desinstalada</string>
+    <string name="dismiss_backup_warning_upgrade">Debido a cambios en la privacidad de Android, tus datos y copias de seguridad automatizadas serán inaccesibles si la aplicación es desinstalada</string>
     <string name="deck_already_exists">El mazo ya existe.</string>
     <string name="empty_deck_name">El nombre del mazo no puede estar vacío</string>
     <string name="create_deck_numeric_hint">Si tienes problemas de ordenamiento de mazos (por ejemplo ‘10’ aparece antes de ‘2’), reemplaza ‘2’ con ‘02’</string>
diff --git a/AnkiDroid/src/main/res/values-es-rES/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-es-rES/07-cardbrowser.xml
index 0bf54e366416..ed81b5309d5c 100644
--- a/AnkiDroid/src/main/res/values-es-rES/07-cardbrowser.xml
+++ b/AnkiDroid/src/main/res/values-es-rES/07-cardbrowser.xml
@@ -118,5 +118,5 @@
     <string name="user_potential_columns">Disponibles</string>
     <string name="include_column">Incluir columna</string>
     <string name="exclude_column">Excluir columna</string>
-    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
+    <string name="browser_find_replace_loading_fields">Recuperando nombres de campos&#8230;</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-es-rES/17-model-manager.xml b/AnkiDroid/src/main/res/values-es-rES/17-model-manager.xml
index ca705ec24b58..0a8374d4b43b 100644
--- a/AnkiDroid/src/main/res/values-es-rES/17-model-manager.xml
+++ b/AnkiDroid/src/main/res/values-es-rES/17-model-manager.xml
@@ -64,9 +64,9 @@
     <string name="model_delete_warning">¿Está seguro que desea eliminar este tipo de nota?</string>
     <string name="field_delete_warning">¿Seguro que deseas eliminar este campo?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s</string>
+    <string name="model_browser_add_add">Añadir: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s</string>
+    <string name="model_browser_add_clone">Clonar: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Introduce la plantilla que utilizará el navegador de la tarjeta para mostrar tus tarjetas. Utiliza esto para mostrar una respuesta más concisa.\n\nUna plantilla del anverso de\n“La capital de {{Country}} es:”\npodría comprimirse en el navegador de la tarjeta a\n“Capital: {{Country}}”</string>
     <string name="card_template_browser_appearance_question_format">Formato de Pregunta</string>
diff --git a/AnkiDroid/src/main/res/values-gl/01-core.xml b/AnkiDroid/src/main/res/values-gl/01-core.xml
index 6f6372aaac66..9e0704765112 100644
--- a/AnkiDroid/src/main/res/values-gl/01-core.xml
+++ b/AnkiDroid/src/main/res/values-gl/01-core.xml
@@ -50,26 +50,26 @@
     <string name="statistics" maxLength="28">Estatísticas</string>
     <string name="settings" maxLength="28">Axustes</string>
     <string name="help" maxLength="28">Axuda</string>
-    <string name="drawing">Drawing</string>
+    <string name="drawing">Debuxo</string>
     <string name="send_feedback">Enviar suxestións</string>
     <string name="studyoptions_start">Estudar</string>
     <!-- DeckPicker.kt -->
     <string name="expand">Expandir</string>
     <string name="collapse">Contraer</string>
     <plurals name="reviewer_window_title">
-        <item quantity="one">%d minute left</item>
-        <item quantity="other">%d minutes left</item>
+        <item quantity="one">Queda %d minuto</item>
+        <item quantity="other">Quedan %d minutos</item>
     </plurals>
     <plurals name="reviewer_window_title_hours_new">
-        <item quantity="one">%1$d hour %2$d left</item>
-        <item quantity="other">%1$d hours %2$d left</item>
+        <item quantity="one">Queda %1$d hora e %2$d min</item>
+        <item quantity="other">Quedan %1$d horas e %2$d min</item>
     </plurals>
     <plurals name="reviewer_window_title_days_new">
-        <item quantity="one">%1$d day %2$dh left</item>
-        <item quantity="other">%1$d days %2$dh left</item>
+        <item quantity="one">Queda %1$d día e %2$dh</item>
+        <item quantity="other">Quedan %1$d días e %2$dh</item>
     </plurals>
     <string name="no_cards_placeholder_title">A colección está baleira</string>
-    <string name="no_cards_placeholder_description">Start adding cards\nusing the + icon.</string>
+    <string name="no_cards_placeholder_description">Comeza a engadir tarxetas\ncoa icona +.</string>
     <!-- The deck picker via AnkiStatsTaskHandler.java -->
     <!-- flashcard_portrait.xml -->
     <string name="type_answer_hint">Escribir resposta</string>
@@ -81,14 +81,14 @@
     <string name="ease_button_easy">Doado</string>
     <string name="menu_import" maxLength="28">Importar</string>
     <string name="undo" maxLength="28" comment="When tapping on this text, the last action is undone.">Desfacer</string>
-    <string name="redo" maxLength="28">Redo</string>
-    <string name="undo_action_whiteboard_last_stroke" comment="One of the display patterns of \'Undo\' item on the action menu in Reviewer. It is shown as the title of the item when the whiteboard (handwriting) feature is enabled and visible and has any strokes (handwritten lines)" maxLength="28">Undo stroke</string>
+    <string name="redo" maxLength="28">Refacer</string>
+    <string name="undo_action_whiteboard_last_stroke" comment="One of the display patterns of \'Undo\' item on the action menu in Reviewer. It is shown as the title of the item when the whiteboard (handwriting) feature is enabled and visible and has any strokes (handwritten lines)" maxLength="28">Desfacer trazo</string>
     <string name="move_all_to_deck">Mover todos para a barallla</string>
     <string name="unbury" maxLength="28">Desenterrar</string>
     <string name="rename_deck" maxLength="28">Renomear baralla</string>
-    <string name="create_shortcut">Create shortcut</string>
-    <string name="browse_cards">Browse cards</string>
-    <string name="edit_deck_description" comment="edit the deck description">Edit description</string>
+    <string name="create_shortcut">Crear atallo</string>
+    <string name="browse_cards">Explorar tarxetas</string>
+    <string name="edit_deck_description" comment="edit the deck description">Editar descrición</string>
     <string name="menu_add" comment="A generic add button. Please inform us if you need more specific strings" maxLength="28">Engadir</string>
     <string name="menu_add_note" maxLength="28">Engadir nota</string>
     <string name="menu_my_account" comment="Label of the window in which the user should enter their account. This text can\'t be found in AnkiDroid directly.">Sincronizar conta</string>
@@ -101,15 +101,15 @@
     <string name="menu_suspend" maxLength="28">Suspender</string>
     <string name="menu_delete_note" maxLength="28">Eliminar nota</string>
     <string name="menu_flag" maxLength="41">Marca</string>
-    <string name="rename_flag">Rename flags</string>
+    <string name="rename_flag">Renomear bandeiras</string>
     <string name="menu_flag_card" maxLength="28">Tarxeta marcada</string>
-    <string name="menu_edit_tags" maxLength="28">Edit tags</string>
+    <string name="menu_edit_tags" maxLength="28">Editar etiquetas</string>
     <string name="delete_note_message">Tes a certeza de querer eliminar esta nota e todos os seus cartóns?\n%s</string>
     <string name="menu_search" maxLength="28">Procurar en %1$s</string>
     <string name="menu_mark_note" maxLength="28">Marcar nota</string>
     <string name="menu_unmark_note">Desmarcar nota</string>
-    <string name="menu_enable_voice_playback" maxLength="28">Enable voice playback</string>
-    <string name="menu_disable_voice_playback">Disable voice playback</string>
+    <string name="menu_enable_voice_playback" maxLength="28">Activar reprodución de voz</string>
+    <string name="menu_disable_voice_playback">Desactivar reprodución de voz</string>
     <string name="new_deck">Crear baralla</string>
     <string name="new_dynamic_deck">Crear baralla filtrada</string>
     <string name="directory_inaccessible">O directorio AnkiDroid non está accesible</string>
@@ -117,18 +117,18 @@
     The user is taken to the "App Info" screen, and needs to click "Permissions" and
     grant AnkiDroid the \'Storage\' permission. This needs to be a fairly generic message as implementations
     of the permissions/app info screen will differ between devices. -->
-    <string name="startup_no_storage_permission">Por favor garantice a Ankidroid o permiso de almaceamento para continuar</string>
-    <string name="rebuild_filtered_deck">refacer mazo filtrado</string>
+    <string name="startup_no_storage_permission">Por favor, conceda a Ankidroid o permiso de almacenamento para continuar</string>
+    <string name="rebuild_filtered_deck">Reconstruíndo baralla filtrada&#8230;</string>
     <string name="rebuild_cram_label" maxLength="28">Reconstruír</string>
     <string name="empty_cram_label" maxLength="28">Baleirar</string>
-    <string name="create_subdeck">crear submazo</string>
-    <string name="empty_filtered_deck">baleirar mazo filtrado</string>
-    <string name="search_deck" comment="Deck search for selecting it">Deck Search</string>
+    <string name="create_subdeck">Crear subbaralla</string>
+    <string name="empty_filtered_deck">Baleirando baralla filtrada&#8230;</string>
+    <string name="search_deck" comment="Deck search for selecting it">Buscar baralla</string>
     <string name="empty_deck">Esta baralla está baleira</string>
-    <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Deck Search</string>
-    <string name="invalid_deck_name">Invalid deck name</string>
-    <string name="studyoptions_congrats_finished">Congratulations! You have finished for today.</string>
-    <string name="studyoptions_congrats_next_due_in" comment="The param will be replaced with \'The next card will be ready in X time\'">Deck finished for now! %s</string>
+    <string name="search_for_download_deck" comment="Deck search value for downloading deck" maxLength="28">Buscar baralla</string>
+    <string name="invalid_deck_name">O nome da baralla non é valido</string>
+    <string name="studyoptions_congrats_finished">Parabéns! Remataches por hoxe.</string>
+    <string name="studyoptions_congrats_next_due_in" comment="The param will be replaced with \'The next card will be ready in X time\'">Baralla rematada por agora! %s</string>
     <string name="studyoptions_no_cards_due">Aínda non hai cartóns pendentes</string>
     <string name="sd_card_not_mounted">Almacenamento do dispositivo non montado</string>
     <string name="button_sync" comment="Text of the sync button" maxLength="28">Sincronizar</string>
@@ -136,66 +136,66 @@
     <string name="continue_sync" tools:ignore="UnusedResources">Continuar a sincronización</string>
     <string name="sync_cancelled" tools:ignore="UnusedResources">Sincronización cancelada</string>
     <string name="sync_cancel_message" tools:ignore="UnusedResources">Cancelando&#8230;\nPode levar algo de tempo.</string>
-    <string name="syncing_media">Syncing media</string>
+    <string name="syncing_media">Sincronizando ficheiros multimedia</string>
     <string name="export_deck" maxLength="28">Exportar a baralla</string>
-    <string name="export_collection">Export collection</string>
+    <string name="export_collection">Exportar colección</string>
     <string name="nothing">Nada</string>
     <!-- Card template editor -->
-    <string name="title_activity_template_editor">Tipo de cartóns</string>
+    <string name="title_activity_template_editor">Tipos de tarxetas</string>
     <string name="card_template_editor_front">Modelo frontal</string>
     <string name="card_template_editor_back">Modelo posterior</string>
     <string name="card_template_editor_styling" maxLength="28">Estilo</string>
-    <string name="card_template_editor_menu_card_browser_appearance" maxLength="28">Card Browser Appearance</string>
-    <string name="card_template_editor_deck_override" maxLength="28">Deck override</string>
-    <string name="card_template_editor_insert_field" maxLength="28">Insert field</string>
-    <string name="card_template_editor_select_field">Select field</string>
-    <string name="card_template_editor_cant_delete">Cando menos un tipo de cartón é obrigatorio.</string>
+    <string name="card_template_editor_menu_card_browser_appearance" maxLength="28">Aparencia do explorador</string>
+    <string name="card_template_editor_deck_override" maxLength="28">Baralla por defecto</string>
+    <string name="card_template_editor_insert_field" maxLength="28">Inserir campo</string>
+    <string name="card_template_editor_select_field">Seleccionar campo</string>
+    <string name="card_template_editor_cant_delete">Cómpre como mínimo un tipo de tarxeta</string>
     <plurals name="card_template_editor_confirm_add">
-        <item quantity="one">This will create %1$d card. Proceed?</item>
-        <item quantity="other">This will create %1$d cards. Proceed?</item>
+        <item quantity="one">Isto creará %1$d tarxeta. Continuar?</item>
+        <item quantity="other">Isto creará %1$d tarxetas. Continuar?</item>
     </plurals>
     <plurals name="card_template_editor_confirm_delete">
-        <item quantity="one">Eliminar o tipo de cartón “%2$s” e o seu %1$d cartón?</item>
-        <item quantity="other">Eliminar o tipo de cartón “%2$s” e os seus %1$d cartóns?</item>
+        <item quantity="one">Eliminar o tipo de tarxeta “%2$s” e a súa %1$d tarxeta?</item>
+        <item quantity="other">Eliminar o tipo de tarxeta “%2$s” e as súas %1$d tarxetas?</item>
     </plurals>
-    <string name="card_template_editor_save_error">Unable to save card template changes: %s</string>
-    <string name="template_for_current_card_deleted">The card type for the current card was deleted.</string>
+    <string name="card_template_editor_save_error">Non se puideron gardar os cambios no modelo de tarxetas: %s</string>
+    <string name="template_for_current_card_deleted">Eliminouse o modelo de tarxeta desta tarxeta.</string>
     <!-- Card Browser Appearance -->
-    <string name="card_template_browser_appearance_title">Browser appearance</string>
+    <string name="card_template_browser_appearance_title">Aparencia do explorador</string>
     <!-- card Info -->
-    <string name="card_info_title" maxLength="28">Card info</string>
+    <string name="card_info_title" maxLength="28">Información da tarxeta</string>
     <!-- Permissions -->
-    <string name="read_write_permission_label">Ler e escribir na bases de datos do AnkiDroid</string>
-    <string name="read_write_permission_description">acceder as notas, cartóns, tipos de notas e barallas existentes así como crear novos</string>
+    <string name="read_write_permission_label">Ler e escribir na base de datos do AnkiDroid</string>
+    <string name="read_write_permission_description">acceder ás notas, tarxetas, tipos de notas e barallas existentes, así como crear novas</string>
     <!-- Context Menu -->
-    <string name="card_browser_context_menu" comment="The value which appears in the system context menu. Note the casing difference">Card Browser</string>
-    <string name="context_menu_anki_card_label">Anki Card</string>
+    <string name="card_browser_context_menu" comment="The value which appears in the system context menu. Note the casing difference">Explorador de tarxetas</string>
+    <string name="context_menu_anki_card_label">Tarxeta Anki</string>
     <!-- Sync conflict -->
-    <string name="sync_conflict_message_new">The collections can’t be combined.\nWhich collection do you want to keep?</string>
+    <string name="sync_conflict_message_new">Non se poden combinar as coleccións.\nQue colección queres manter?</string>
     <string name="sync_conflict_keep_local_new" comment="Select AnkiDroid files to keep while syncing">AnkiDroid</string>
     <string name="sync_conflict_keep_remote_new" comment="Select AnkiWeb files to keep while syncing">AnkiWeb</string>
-    <string name="sync_conflict_remote_confirm_new">Replace your collection on AnkiDroid with your collection from AnkiWeb?</string>
-    <string name="sync_conflict_local_confirm_new">Replace your collection on AnkiWeb with your collection from AnkiDroid?</string>
-    <string name="sync_conflict_title_new">Select collection to keep</string>
-    <string name="sync_conflict_replace_title">Replace collection</string>
+    <string name="sync_conflict_remote_confirm_new">Queres substituír a túa colección de AnkiDroid pola túa colección de AnkiWeb?</string>
+    <string name="sync_conflict_local_confirm_new">Queres substituír a túa colección de AnkiDroid pola túa colección de AnkiWeb?</string>
+    <string name="sync_conflict_title_new">Selecciona que colección manter</string>
+    <string name="sync_conflict_replace_title">Substituír colección</string>
     <!-- Generic errors -->
-    <string name="error__etc__cannot_write_to_or_create_file">Cannot write to or create file %s</string>
-    <string name="directory_inaccessible_after_uninstall" comment="Dialog title if AnkiDroid can\'t access the collection once the app is installed">Inaccessible collection</string>
-    <string name="directory_inaccessible_after_uninstall_summary" comment="the parameter is the path to the AnkiDroid folder. Typically /storage/emulated/0/AnkiDroid">We are unable to access your collection after AnkiDroid is uninstalled due to a change in Play Store Policy\n\nYour data is safe and can be restored. It is located at\n%s\n\nSelect an option below to restore:</string>
-    <string name="directory_revoked_after_inactivity" comment="the first parameter is WRITE_EXTERNAL_STORAGE the second parameter is the path to the AnkiDroid folder. Typically /storage/emulated/0/AnkiDroid">Android has removed AnkiDroid\'s %1$s permission due to app inactivity.\n\nYour data is safe and can be restored. It is located at\n%2$s\n\nSelect an option below to restore:</string>
-    <string name="restore_data_from_ankiweb">Restore from AnkiWeb (recommended)</string>
-    <string name="install_non_play_store_ankidroid_recommended">Restore folder access (recommended)</string>
-    <string name="install_non_play_store_ankidroid">Restore folder access (advanced)</string>
-    <string name="restore_data_from_backup">Restore from .colpkg backup (advanced)</string>
-    <string name="create_new_collection">Create a new collection</string>
-    <string name="new_unsafe_collection">The new collection will be deleted from your phone if you uninstall AnkiDroid</string>
+    <string name="error__etc__cannot_write_to_or_create_file">Non se puido editar ou crear o ficheiro %s</string>
+    <string name="directory_inaccessible_after_uninstall" comment="Dialog title if AnkiDroid can\'t access the collection once the app is installed">Colección inaccesíbel</string>
+    <string name="directory_inaccessible_after_uninstall_summary" comment="the parameter is the path to the AnkiDroid folder. Typically /storage/emulated/0/AnkiDroid">Non se puido acceder á túa colección tras desinstalar AnkiDroid debido a un cambio na política da Play Store\n\nOs teus datos están seguros e pódense restaurar. Están situados en\n%s\n\nSelecciona unha opción para restaurar:</string>
+    <string name="directory_revoked_after_inactivity" comment="the first parameter is WRITE_EXTERNAL_STORAGE the second parameter is the path to the AnkiDroid folder. Typically /storage/emulated/0/AnkiDroid">Android retirou o permiso %1$s de AnkiDroid debido á inactividade da aplicación.\n\nOs teus datos están seguros e pódense restaurar. Están situados en\n%2$s\n\nSelecciona unha opción para restaurar:</string>
+    <string name="restore_data_from_ankiweb">Restaurar desde AnkiWeb (recomendado)</string>
+    <string name="install_non_play_store_ankidroid_recommended">Restaurar acceso ao cartafol (recomendado)</string>
+    <string name="install_non_play_store_ankidroid">Restaurar acceso ao cartafol (avanzado)</string>
+    <string name="restore_data_from_backup">Restaurar a partir da copia de seguranza .colpkg (avanzado)</string>
+    <string name="create_new_collection">Crear unha nova colección</string>
+    <string name="new_unsafe_collection">Se desinstalas AnkiDroid, a nova colección eliminarase do teu teléfono</string>
     <!-- Permissions screen -->
-    <string name="permissions_screen_headline">AnkiDroid needs some permissions to work</string>
-    <string name="storage_access_title">Storage access</string>
-    <string name="storage_access_summary">Saves your collection in a safe place that will not be deleted if the app is uninstalled</string>
-    <string name="all_files_access_title" comment="Name of the “All files access” permission from Android 10 and after">All files access</string>
-    <string name="image_occlusion">Image Occlusion</string>
-    <string name="remove_account" comment="open a website to start the deletion of an AnkiWeb account">Remove account</string>
+    <string name="permissions_screen_headline">AnkiDroid precisa algúns permisos para funcionar</string>
+    <string name="storage_access_title">Acceso ao almacenamento</string>
+    <string name="storage_access_summary">Garda a túa colección nun lugar seguro que non se eliminará se desinstalas a aplicación</string>
+    <string name="all_files_access_title" comment="Name of the “All files access” permission from Android 10 and after">Acceso a todos os ficheiros</string>
+    <string name="image_occlusion">Oclusión de imaxe</string>
+    <string name="remove_account" comment="open a website to start the deletion of an AnkiWeb account">Eliminar conta</string>
     <!-- Instant Note Editor -->
-    <string name="instant_card" comment="This does not need to be translated literally, translate the concept of quickly adding a Cloze note with a popup. Used in the Android system context menu/share dialog.">Instant card</string>
+    <string name="instant_card" comment="This does not need to be translated literally, translate the concept of quickly adding a Cloze note with a popup. Used in the Android system context menu/share dialog.">Tarxeta instantánea</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-gl/02-strings.xml b/AnkiDroid/src/main/res/values-gl/02-strings.xml
index dc6a642372fb..941618fa0112 100644
--- a/AnkiDroid/src/main/res/values-gl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-gl/02-strings.xml
@@ -52,101 +52,101 @@
     <string name="CardEditorModel">Tipo:</string>
     <string name="CardEditorTags">Etiquetas: %1$s</string>
     <string name="CardEditorCards">Cartóns: %1$s</string>
-    <string name="edit_occlusions">Edit Occlusions</string>
+    <string name="edit_occlusions">Editar oclusións</string>
     <string name="tag_name">Nome da etiqueta</string>
     <string name="add_new_filter_tags">Engadir/Filtrar etiquetas</string>
     <string name="add_tag" maxLength="28">Engadir etiqueta</string>
     <string name="check_all_tags" maxLength="28">Des/Marcar todas as etiquetas</string>
     <string name="filter_tags" maxLength="28">Filtrar etiquetas</string>
-    <string name="no_tags">Aínda non engadiches ningunha etiqueta.</string>
+    <string name="no_tags">Aínda non engadiches ningunha etiqueta</string>
     <string name="updated_version">Actualizado á versión %s</string>
     <!-- Reviewer.kt -->
-    <string name="save_whiteboard" maxLength="28">Save whiteboard</string>
-    <string name="enable_stylus" maxLength="28">Enable stylus writing</string>
-    <string name="disable_stylus">Disable stylus writing</string>
+    <string name="save_whiteboard" maxLength="28">Gardar encerado</string>
+    <string name="enable_stylus" maxLength="28">Activar escritura con lapis</string>
+    <string name="disable_stylus">Desactivar escritura con lapis</string>
     <string name="enable_whiteboard" maxLength="28">Activar encerado</string>
     <string name="disable_whiteboard">Desactivar encerado</string>
     <string name="show_whiteboard">Amosar encerado</string>
     <string name="hide_whiteboard" maxLength="28">Agochar encerado</string>
     <string name="clear_whiteboard" maxLength="28">Limpar encerado</string>
     <string name="replay_audio" maxLength="28">Repetir audio</string>
-    <string name="leech_suspend_notification">Cartón marcado como sambesuga e suspendido</string>
-    <string name="leech_notification">Cartón marcado como sambesuga</string>
-    <string name="webview_crash_unknown">Unknown error</string>
-    <string name="webview_crash_unknwon_detailed">This was caused by an internal error in the WebView</string>
-    <string name="webview_crash_oom">Out of Memory</string>
+    <string name="leech_suspend_notification">Tarxeta marcada como sambesuga e suspendida</string>
+    <string name="leech_notification">Tarxeta marcada como sambesuga</string>
+    <string name="webview_crash_unknown">Erro descoñecido</string>
+    <string name="webview_crash_unknwon_detailed">Isto foi causado por un erro interno na WebView</string>
+    <string name="webview_crash_oom">Memoria insuficiente</string>
     <string name="webview_crash_oom_details">The WebView was terminated by the system. This typically happens when the application runs out of memory, often due to large fonts or media.</string>
     <string name="webview_crash_nonfatal">WebView renderer crashed. Cause: %s</string>
     <string name="webview_crash_fatal">Fatal Error: WebView renderer crashed. Cause: %s</string>
     <string name="webview_crash_loop_dialog_title">System WebView Rendering Failure</string>
     <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
-    <string name="filter_by_flags" maxLength="41">Flags</string>
+    <string name="filter_by_flags" maxLength="41">Bandeiras</string>
     <!-- Custom study options -->
-    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <string name="custom_study_loading_tags">Creando lista de etiquetas&#8230;</string>
     <!-- Study options -->
     <plurals name="studyoptions_buried_count">
-        <item quantity="one">+%d buried</item>
-        <item quantity="other">+%d buried</item>
+        <item quantity="one">+%d soterrada</item>
+        <item quantity="other">+%d soterradas</item>
     </plurals>
-    <string name="studyoptions_total_new_label">Total new cards</string>
-    <string name="studyoptions_total_label">Total cards</string>
+    <string name="studyoptions_total_new_label">Tarxetas novas totais</string>
+    <string name="studyoptions_total_label">Tarxetas totais</string>
     <!-- Card editor -->
     <string name="cardeditor_title_edit_card" maxLength="28">Editar nota</string>
-    <string name="discard">Discard</string>
-    <string name="note_editor_no_cards_created">No cards created. Please fill in more fields</string>
-    <string name="note_editor_no_cards_created_all_fields">The current note type did not produce any cards.\nPlease choose another note type, or click ‘Cards’ and add a field substitution</string>
+    <string name="discard">Descartar</string>
+    <string name="note_editor_no_cards_created">Non se crearon tarxetas. Por favor, enche máis campos.</string>
+    <string name="note_editor_no_cards_created_all_fields">O tipo de nota actual non produciu ningunha tarxeta.\nEscolle outro tipo de nota, ou selecciona \'Tarxetas\' e engade un campo de substitución</string>
     <string name="note_editor_insert_cloze_no_cloze_note_type">Cloze deletions will only work on a Cloze note type</string>
     <string name="saving_facts">Gardando a nota</string>
-    <string name="saving_model">Saving note type</string>
+    <string name="saving_model">Gardando tipo de nota</string>
     <string name="save" maxLength="28">Gardar</string>
     <string name="close">Pechar</string>
     <string name="select">Seleccionar</string>
     <string name="field_remapping">%1$s (de “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Eliminaranse os cartóns asignados a ren. Se unha nota non ten cartóns restantes, perderase. Tes a certeza de querer continuar?</string>
-    <string name="missing_note_type">No note type found</string>
+    <string name="missing_note_type">Non se encontrou o tipo de nota</string>
     <!-- Timebox -->
-    <string name="timebox_reached_title">Timebox reached</string>
+    <string name="timebox_reached_title">Límite de tempo acadado</string>
     <plurals name="timebox_reached">
         <item quantity="one">%1$d cartón estudado en %2$s</item>
         <item quantity="other">%1$d cartóns estudados en %2$s</item>
     </plurals>
     <!-- minutes used in \'[studied in] x minutes\' context, causing inflexion in some languages -->
     <plurals name="in_minutes">
-        <item quantity="one">%1$d minute</item>
-        <item quantity="other">%1$d minutes</item>
+        <item quantity="one">%1$d minuto</item>
+        <item quantity="other">%1$d minutos</item>
     </plurals>
     <string name="fact_adder_intent_title" comment="Label of the \'Add Note\' window. This title can\'t be seen in AnkiDroid directly.">Cartón AnkiDroid</string>
-    <string name="note_editor_copy_note" maxLength="28">Copy note</string>
+    <string name="note_editor_copy_note" maxLength="28">Copiar nota</string>
     <string name="card_editor_reposition_card" comment="reposition a card in the new queue" maxLength="28">Reposicionar</string>
     <string name="card_editor_reset_card" maxLength="28">Reiniciar progreso</string>
-    <string name="card_editor_reschedule_card" comment="Action to reschedule a card" maxLength="28">Reschedule</string>
+    <string name="card_editor_reschedule_card" comment="Action to reschedule a card" maxLength="28">Reprogramar</string>
     <string name="card_editor_preview_card" comment="Button offering to preview some card(s)" maxLength="28">Vista previa</string>
-    <string name="copy_as_markdown" comment="Copies text to the clipboard as Markdown" maxLength="28">Copy as Markdown</string>
-    <string name="preview_progress_bar_text" comment="What card we are on out of how many in card previewer progress bar">%1$d of %2$d</string>
+    <string name="copy_as_markdown" comment="Copies text to the clipboard as Markdown" maxLength="28">Copiar como Markdown</string>
+    <string name="preview_progress_bar_text" comment="What card we are on out of how many in card previewer progress bar">%1$d de %2$d</string>
     <string name="rename" comment="Confirm that the renaming action should be processed." maxLength="28">Renomear</string>
-    <string name="checks_action" maxLength="28">Check</string>
-    <string name="check_db" maxLength="28">Verificar a base de datos</string>
+    <string name="checks_action" maxLength="28">Comprobar</string>
+    <string name="check_db" maxLength="28">Comprobar a base de datos</string>
     <string name="check_media" maxLength="28">Verificar multimedia</string>
     <string name="empty_cards" maxLength="28">Cartóns baleiros</string>
     <string name="unknown_type_field_warning">Escribe a resposta: campo descoñecido %s</string>
     <string name="delete_deck">Eliminando a baralla&#8230;</string>
     <string name="info_rate">Valora AnkiDroid</string>
     <string name="import_title">Importando</string>
-    <string name="import_preparing_file">Preparing file for import&#8230;</string>
+    <string name="import_preparing_file">Preparando a importación do ficheiro&#8230;</string>
     <string name="import_message_add" comment="Adding a new deck to the collection (import)">Engadir</string>
     <string name="import_message_replace_confirm">Isto eliminará a túa colección actual e a substituirá cos datos do ficheiro %s</string>
-    <string name="import_dialog_message_add">Add “%s” to collection? This may take a long time</string>
-    <string name="import_log_no_apkg">This isn’t a valid Anki package file</string>
-    <string name="import_title_error" comment="Title of error dialog">Error</string>
-    <string name="import_error_handle_exception">Failed to import file\n\n%s</string>
-    <string name="import_error_not_apkg_extension">Filename “%s” doesn’t have .apkg or .colpkg extension</string>
-    <string name="import_error_load_imported_database">Anki Database (.anki2) replacements are not yet supported. Please see the manual for replacement instructions.</string>
-    <string name="import_error_content_provider">O ficheiro seleccionado non se puido importar automaticamente. Por favor, revisa o manual do usuario para saber como importar manualmente ficheiros anki: \n%s</string>
-    <string name="import_error_copy_to_cache">Failed to cache file (possibly out of storage space)</string>
-    <string name="import_interrupted">Import interrupted: AnkiDroid was closed</string>
-    <string name="export_preparation_in_progress">Preparing export&#8230;</string>
-    <string name="export_ready_title">Export ready</string>
-    <string name="export_send_no_handlers">No applications available to handle apkg. Saving&#8230;</string>
+    <string name="import_dialog_message_add">Engadir \"%s\" á colección? Isto pode levar moito tempo</string>
+    <string name="import_log_no_apkg">Este ficheiro non é un paquete de Anki válido</string>
+    <string name="import_title_error" comment="Title of error dialog">Erro</string>
+    <string name="import_error_handle_exception">Non se puido importar o ficheiro\n\n%s</string>
+    <string name="import_error_not_apkg_extension">O ficheiro \"%s\" non ten extensión .apkg ou .colpkg</string>
+    <string name="import_error_load_imported_database">As substitucións da base de datos Anki (.anki2) aínda non son compatíbeis. Consulta o manual para obter instrucións de substitución.</string>
+    <string name="import_error_content_provider">O ficheiro seleccionado non se puido importar automaticamente. Consulta o manual do usuario para ver como importar manualmente ficheiros anki: \n%s</string>
+    <string name="import_error_copy_to_cache">Non se puido gardar o ficheiro na caché (posibelmente falta espazo)</string>
+    <string name="import_interrupted">Importación interrompida: pechouse AnkiDroid</string>
+    <string name="export_preparation_in_progress">Preparando exportación&#8230;</string>
+    <string name="export_ready_title">Listo para exportar</string>
+    <string name="export_send_no_handlers">Non hai aplicacións dispoñíbeis para manexar apkg. Gardando&#8230;</string>
     <string name="export_save_apkg_successful">Successfully saved Anki package</string>
     <string name="export_save_apkg_unsuccessful">Save Anki package failed</string>
     <string name="export_share_title">Send Anki package using</string>
@@ -158,15 +158,15 @@
         [1] %1$s<br/>
         [2] %2$s
         ]]></string>
-    <string name="export_choice_share">Share</string>
-    <string name="export_choice_save_to">Save to</string>
-    <string name="export_saving_exported_collection">Saving exported file&#8230;</string>
-    <string name="study_options" comment="Name for a preference category in Filtered deck (aka Cram deck, aka Custom study) options" maxLength="28">Options</string>
-    <string name="menu__deck_options" maxLength="28">Deck options</string>
-    <string name="menu__study_options" comment="Menu item that opens options for a Filtered deck (aka Cram deck, aka Custom study)">Study options</string>
+    <string name="export_choice_share">Compartir</string>
+    <string name="export_choice_save_to">Gardar en</string>
+    <string name="export_saving_exported_collection">Gardando ficheiro exportado&#8230;</string>
+    <string name="study_options" comment="Name for a preference category in Filtered deck (aka Cram deck, aka Custom study) options" maxLength="28">Opcións</string>
+    <string name="menu__deck_options" maxLength="28">Opcións da baralla</string>
+    <string name="menu__study_options" comment="Menu item that opens options for a Filtered deck (aka Cram deck, aka Custom study)">Opcións de estudo</string>
     <string name="select_tts" maxLength="28">Definir idioma TTS</string>
     <string name="custom_study" maxLength="28">Estudo personalizado</string>
-    <string name="dyn_deck_desc">Esta é unha baralla especial para estudar fora da programación normal. Os cartóns devolveranse ás súas barallas despois de revisalos. Eliminando esta baralla da listaxe devólvense os cartóns restantes á súa baralla orixinal.</string>
+    <string name="dyn_deck_desc">Esta é unha baralla especial para estudar fóra da programación normal. As tarxetas devolveranse ás súas barallas despois de revisalas. Eliminando esta baralla da listaxe devólvense as tarxetas restantes á súa baralla orixinal.</string>
     <string name="steps_error">Os pasos teñen que ser números maiores de 0</string>
     <string name="steps_min_error">É preciso polo menos un paso</string>
     <string name="tag_editor_add_feedback">Toca sobre \"%2$s\" para confirmar a adición de \"%1$s\"</string>
@@ -174,11 +174,11 @@
     <!-- Time spans -->
     <string name="reminder_title">Non esquezas estudar hoxe!</string>
     <plurals name="reminder_text">
-        <item quantity="one">%2$d card to review in %1$s</item>
-        <item quantity="other">%2$d cards to review in %1$s</item>
+        <item quantity="one">Queda %2$d tarxeta por repasar en %1$s</item>
+        <item quantity="other">Quedan %2$d tarxetas por repasar en %1$s</item>
     </plurals>
     <!-- Currently only used if exporting APKG fails -->
-    <string name="apk_share_error">Produciuse un erro compartindo o ficheiro apkg</string>
+    <string name="apk_share_error">Produciuse un erro ao compartir o ficheiro apkg</string>
     <!-- Import and export v2 feedback -->
     <string name="activity_start_failed">The system does not have an app installed that can perform this action.</string>
     <string name="multimedia_editor_image_compression_failed"><![CDATA[Camera images may be large. You may wish to compress & resize images in the media directory]]></string>
@@ -186,10 +186,10 @@
     <string name="web_page_error">Error loading page: %s</string>
     <!-- The name of the deck which corrupt cards will be moved to -->
     <!-- Deckpicker Background -->
-    <string name="background_image_title" maxLength="41">Background</string>
-    <string name="choose_an_image" maxLength="41">Select image</string>
-    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
-    <string name="remove_background_image">Remove background?</string>
+    <string name="background_image_title" maxLength="41">Fondo</string>
+    <string name="choose_an_image" maxLength="41">Seleccionar imaxe</string>
+    <string name="remove_wallpaper_image" maxLength="41">Retirar fondo</string>
+    <string name="remove_background_image">Retirar fondo?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore Default</string>
     <string name="reviewer_tts_cloze_spoken_replacement">Blank</string>
@@ -204,15 +204,15 @@
     <string name="valid_js_api_version">Invalid AnkiDroid JS API version. Contact developer %s, or view wiki</string>
     <string name="update_js_api_version">AnkiDroid JS API update available. Contact developer %s, or view wiki</string>
     <string name="reviewer_invalid_api_version_visit_documentation">View</string>
-    <string name="anki_js_error_code">(Error Code: %d)</string>
+    <string name="anki_js_error_code">(Código de erro: %d)</string>
     <!-- About AnkiDroid screen -->
-    <string name="about_ankidroid_successfully_copied_debug_info">Copied to clipboard</string>
+    <string name="about_ankidroid_successfully_copied_debug_info">Copiado ao portapapeis</string>
     <string name="about_ankidroid_error_copy_debug_info">Error copying debug information to clipboard</string>
     <!-- Card Viewer -->
     <string name="card_viewer_could_not_find_image">Card Content Error: Failed to load ‘%s’</string>
     <!-- Deck Picker -->
-    <string name="search_decks" maxLength="28">Search decks</string>
-    <string name="ankidroid_init_failed_webview_title">Fatal Error</string>
+    <string name="search_decks" maxLength="28">Buscar barallas</string>
+    <string name="ankidroid_init_failed_webview_title">Erro fatal</string>
     <string name="ankidroid_init_failed_webview">AnkiDroid relies on the System WebView which is unavailable. This can happen if the system is installing updates. Please try again in a few minutes.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Font size</string>
@@ -265,7 +265,7 @@
     <string name="home" maxLength="28">Home</string>
     <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
-    <string name="card_buried">Card buried.</string>
+    <string name="card_buried">Tarxeta soterrada.</string>
     <plurals name="note_suspended">
         <item quantity="one">%d card suspended.</item>
         <item quantity="other">%d cards suspended.</item>
@@ -292,59 +292,59 @@
     <string name="intro_get_started" comment="Action to start AnkiDroid for the first time without syncing from AnkiWeb">Get Started</string>
     <string name="intro_sync_from_ankiweb">Sync from AnkiWeb</string>
     <!-- IntentHandler -->
-    <string name="app_not_initialized_new">AnkiDroid is not initialized yet. Please open AnkiDroid and try again</string>
-    <string name="already_logged_in">Already logged in</string>
+    <string name="app_not_initialized_new">AnkiDroid aínda non está inicializado. Abre AnkiDroid e téntao de novo</string>
+    <string name="already_logged_in">Xa iniciaches sesión</string>
     <!-- Deck Creation -->
-    <string name="deck_created">Deck created</string>
-    <string name="deck_renamed">Deck renamed</string>
+    <string name="deck_created">Baralla creada</string>
+    <string name="deck_renamed">Renomeouse a baralla</string>
     <!-- Deck Deletion -->
-    <string name="deck_shortcut_doesnt_exist">Deck deleted. Please remove the shortcut</string>
+    <string name="deck_shortcut_doesnt_exist">Eliminouse a baralla. Retira o atallo</string>
     <!-- Browser Options Dialog -->
-    <string name="show_cards" comment="Label for toggle cards button in BrowserOptionsDialog">Cards</string>
-    <string name="show_notes" comment="Label for toggle notes button in BrowserOptionsDialog">Notes</string>
-    <string name="toggle_cards_notes">Toggle Cards/Notes</string>
+    <string name="show_cards" comment="Label for toggle cards button in BrowserOptionsDialog">Tarxetas</string>
+    <string name="show_notes" comment="Label for toggle notes button in BrowserOptionsDialog">Notas</string>
+    <string name="toggle_cards_notes">Alternar tarxetas/notas</string>
     <string name="truncate_content_help">Truncate the height of each row of the Browser to show only first 3 lines of content</string>
-    <string name="browser_options_dialog_heading">Browser options</string>
-    <string name="audio_saved">Recording saved</string>
-    <string name="deleting_selected_notes">Deleting selected notes</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Use anyway</string>
-    <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Text to speech error (%s)</string>
+    <string name="browser_options_dialog_heading">Opcións do explorador</string>
+    <string name="audio_saved">Gravación gardada</string>
+    <string name="deleting_selected_notes">Eliminando as notas seleccionadas</string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Preme nunha voz para escoitar</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">A voz debe ser instalada antes de usarse</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Usar de todos modos</string>
+    <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Erro de conversión de texto a voz (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">Please log in to download more decks</string>
-    <string name="deck_description_field_hint">Description</string>
-    <string name="failed_to_copy">Failed to copy</string>
-    <string name="card_browser_unavailable_when_notes_mode">Unavailable in ‘Notes’ mode</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Instalar</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Non se puido abrir a configuración de texto a voz</string>
+    <string name="shared_decks_login_required">Inicia sesión para descargar máis barallas</string>
+    <string name="deck_description_field_hint">Descrición</string>
+    <string name="failed_to_copy">Non se puido copiar</string>
+    <string name="card_browser_unavailable_when_notes_mode">Non dispoñíbel en modo \'Notas\'</string>
     <plurals name="unbury_cards_feedback">
-        <item quantity="one">%d card unburied</item>
-        <item quantity="other">%d cards unburied</item>
+        <item quantity="one">%d tarxeta desenterrada</item>
+        <item quantity="other">%d tarxetas desenterradas</item>
     </plurals>
-    <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
-    <string name="start_recording">Record</string>
-    <string name="stop_recording">Stop</string>
-    <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposicionar</string>
+    <string name="start_recording">Gravar</string>
+    <string name="stop_recording">Deter</string>
+    <string name="play_recording">Reproducir</string>
+    <string name="next_recording">Seguinte</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
-    <string name="orphan_note_title">Cannot Delete Card Type</string>
-    <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
-    <string name="voice_not_supported">Voice not supported. Try another or install a voice engine.</string>
+    <string name="orphan_note_title">Non se puido eliminar o tipo de tarxeta</string>
+    <string name="orphan_note_message">Eliminando este tipo de tarxeta deixarás algunhas notas sen tarxetas</string>
+    <string name="voice_not_supported">A voz non é compatíbel. Proba outra ou instala un motor de voz.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck Picker</string>
-    <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Delete deck without confirmation</string>
-    <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note Editor</string>
-    <string name="select_deck" comment="Description of the shortcut that opens the deck selection dialog">Select deck</string>
-    <string name="select_note_type" comment="Description of the shortcut that shows the note selection spinner">Select note type</string>
-    <string name="tag_editor" comment="Description of the shortcut that opens the tags dialog">Tag editor</string>
-    <string name="card_template_editor_group" comment="Label for the group of shortcuts related to the card template editor">Card Template Editor</string>
-    <string name="edit_front_template" comment="Description of the shortcut that shows the question side of the card template">Edit front template</string>
-    <string name="edit_back_template" comment="Description of the shortcut that shows the answer side of the card template">Edit back template</string>
-    <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Edit styling</string>
-    <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copy template as markdown</string>
-    <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Edit browser appearance</string>
+    <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Selector de barallas</string>
+    <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Eliminar baralla sen confirmación</string>
+    <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Editor de notas</string>
+    <string name="select_deck" comment="Description of the shortcut that opens the deck selection dialog">Seleccionar baralla</string>
+    <string name="select_note_type" comment="Description of the shortcut that shows the note selection spinner">Seleccionar tipo de nota</string>
+    <string name="tag_editor" comment="Description of the shortcut that opens the tags dialog">Editor de etiquetas</string>
+    <string name="card_template_editor_group" comment="Label for the group of shortcuts related to the card template editor">Editor de modelos de tarxetas</string>
+    <string name="edit_front_template" comment="Description of the shortcut that shows the question side of the card template">Editar o modelo frontal</string>
+    <string name="edit_back_template" comment="Description of the shortcut that shows the answer side of the card template">Editar o modelo posterior</string>
+    <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Editar estilo</string>
+    <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copiar modelo como markdown</string>
+    <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Editar aparencia do explorador</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
     <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml b/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml
index 42d879975fca..236265707b74 100644
--- a/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml
@@ -82,7 +82,7 @@
     <string name="webview_crash_loop_dialog_content">系统 WebView 渲染卡片 “%1$s” 失败。\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">旗标</string>
     <!-- Custom study options -->
-    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <string name="custom_study_loading_tags">构建标签列表&#8230;</string>
     <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="other">+%d 被隐藏</item>
diff --git a/AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml b/AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml
index 80d2c9beaaf0..662c67734cc8 100644
--- a/AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml
@@ -71,7 +71,7 @@
     <string name="custom_study_forgotten">复习过去 x 天中忘记的卡片：</string>
     <string name="custom_study_ahead">提前 x 天复习：</string>
     <string name="custom_study_preview">预览过去 x 天中新增的卡片：</string>
-    <string name="custom_study_tags">Select x cards from the deck:</string>
+    <string name="custom_study_tags">从牌组中选择 x 张卡片：</string>
     <string name="storage_full_title">存储空间已满</string>
     <string name="storage_almost_full_title">存储空间几乎满了</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">没有空间</string>
diff --git a/AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml b/AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml
index 41212a2cf4cd..fe1de8f707f9 100644
--- a/AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml
@@ -67,7 +67,7 @@
     <string name="pref_cat_advanced" maxLength="41">高级设置</string>
     <string name="pref_cat_workarounds" maxLength="41">变通方法</string>
     <string name="pref_cat_plugins" maxLength="41">插件</string>
-    <string name="pref_cat_editing" maxLength="41">Editing</string>
+    <string name="pref_cat_editing" maxLength="41">正在编辑</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">笔画粗细</string>
     <string name="use_input_tag" maxLength="41">在卡片中输入答案</string>

From f535a089ab3716f57df261a49f5632f663aeb3cd Mon Sep 17 00:00:00 2001
From: Song Eric Yu Li <ericli3690@gmail.com>
Date: Sat, 5 Apr 2025 16:38:46 -0400
Subject: [PATCH 188/200] Converted previewer empty front indicator to text
 When a card's front is empty, the previewer tab now indicates this by
 appending (empty) to the tab title rather than using an overly-urgent looking
 red badge. Creates a new string resource and appends it in
 [TemplatePreviewerPage].

---
 .../ichi2/anki/previewer/TemplatePreviewerPage.kt    | 12 +++++++-----
 AnkiDroid/src/main/res/values/02-strings.xml         |  1 +
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/previewer/TemplatePreviewerPage.kt b/AnkiDroid/src/main/java/com/ichi2/anki/previewer/TemplatePreviewerPage.kt
index a002adfd7721..9cc6b35d2189 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/previewer/TemplatePreviewerPage.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/previewer/TemplatePreviewerPage.kt
@@ -57,11 +57,13 @@ class TemplatePreviewerPage : Fragment(R.layout.template_previewer_container) {
         lifecycleScope.launch {
             val cardsWithEmptyFronts = viewModel.cardsWithEmptyFronts?.await()
             for ((index, templateName) in viewModel.getTemplateNames().withIndex()) {
-                val newTab = tabLayout.newTab().setText(templateName)
-                if (cardsWithEmptyFronts?.get(index) == true) {
-                    val badge = newTab.getOrCreateBadge()
-                    badge.horizontalOffset = -4
-                }
+                val tabTitle =
+                    if (cardsWithEmptyFronts?.get(index) == true) {
+                        getString(R.string.card_previewer_empty_front_indicator, templateName)
+                    } else {
+                        templateName
+                    }
+                val newTab = tabLayout.newTab().setText(tabTitle)
                 tabLayout.addTab(newTab)
             }
             tabLayout.selectTab(tabLayout.getTabAt(viewModel.getCurrentTabIndex()))
diff --git a/AnkiDroid/src/main/res/values/02-strings.xml b/AnkiDroid/src/main/res/values/02-strings.xml
index 38ba77b4fd44..71cdc03fb3c0 100644
--- a/AnkiDroid/src/main/res/values/02-strings.xml
+++ b/AnkiDroid/src/main/res/values/02-strings.xml
@@ -84,6 +84,7 @@
     <string name="field_remapping">%1$s (from “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Any cards mapped to nothing will be deleted. If a note has no remaining cards, it will be lost. Are you sure you want to continue?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
 
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>

From e8342dee89289b1f71addbaa58508c7e4c3b2550 Mon Sep 17 00:00:00 2001
From: lukstbit <52494258+lukstbit@users.noreply.github.com>
Date: Sat, 22 Mar 2025 12:30:44 +0200
Subject: [PATCH 189/200] Refactor LocaleSelectionDialog

Changes:
- improve interaction between LocaleSelectionDialog and ModelFieldEditor
by using fragments results apis
- improve ui of the dialog to be more consistent with the rest of the dialogs
- fix some ux issues like tap touch target size, touch feedback
---
 .idea/dictionaries/davidallison.xml           |   1 +
 .../java/com/ichi2/anki/ModelFieldEditor.kt   |  34 ++--
 .../anki/dialogs/LocaleSelectionDialog.kt     | 182 +++++++-----------
 .../ichi2/ui/RecyclerSingleTouchAdapter.kt    |  72 -------
 .../locale_dialog_fragment_textview.xml       |  12 +-
 .../res/layout/locale_selection_dialog.xml    |  17 +-
 6 files changed, 102 insertions(+), 216 deletions(-)
 delete mode 100644 AnkiDroid/src/main/java/com/ichi2/ui/RecyclerSingleTouchAdapter.kt

diff --git a/.idea/dictionaries/davidallison.xml b/.idea/dictionaries/davidallison.xml
index 30c71a62da41..bb3e83d437da 100644
--- a/.idea/dictionaries/davidallison.xml
+++ b/.idea/dictionaries/davidallison.xml
@@ -52,6 +52,7 @@
       <w>filepaths</w>
       <w>fixme</w>
       <w>fixmes</w>
+      <w>fonipa</w>
       <w>foobaz</w>
       <w>freqs</w>
       <w>furigana</w>
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ModelFieldEditor.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ModelFieldEditor.kt
index d492789a27b3..3f7d756589b2 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ModelFieldEditor.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ModelFieldEditor.kt
@@ -26,19 +26,21 @@ import android.widget.EditText
 import android.widget.ListView
 import androidx.annotation.VisibleForTesting
 import androidx.appcompat.app.AlertDialog
-import androidx.fragment.app.DialogFragment
+import androidx.core.os.BundleCompat
 import androidx.fragment.app.FragmentManager
 import com.google.android.material.snackbar.Snackbar
 import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.CollectionManager.withCol
 import com.ichi2.anki.dialogs.ConfirmationDialog
 import com.ichi2.anki.dialogs.LocaleSelectionDialog
-import com.ichi2.anki.dialogs.LocaleSelectionDialog.LocaleSelectionDialogHandler
+import com.ichi2.anki.dialogs.LocaleSelectionDialog.Companion.KEY_SELECTED_LOCALE
+import com.ichi2.anki.dialogs.LocaleSelectionDialog.Companion.REQUEST_HINT_LOCALE_SELECTION
 import com.ichi2.anki.dialogs.NoteTypeEditorContextMenu.Companion.newInstance
 import com.ichi2.anki.dialogs.NoteTypeEditorContextMenu.NoteTypeEditorContextMenuAction
 import com.ichi2.anki.servicelayer.LanguageHintService.setLanguageHintForField
 import com.ichi2.anki.snackbar.showSnackbar
 import com.ichi2.anki.utils.ext.dismissAllDialogFragments
+import com.ichi2.anki.utils.ext.setFragmentResultListener
 import com.ichi2.anki.utils.ext.showDialogFragment
 import com.ichi2.libanki.Collection
 import com.ichi2.libanki.Fields
@@ -58,9 +60,7 @@ import org.json.JSONException
 import timber.log.Timber
 import java.util.Locale
 
-class ModelFieldEditor :
-    AnkiActivity(),
-    LocaleSelectionDialogHandler {
+class ModelFieldEditor : AnkiActivity() {
     // Position of the current field selected
     private var currentPos = 0
     private lateinit var fieldsListView: ListView
@@ -86,6 +86,18 @@ class ModelFieldEditor :
             subtitle = intent.getStringExtra("title")
         }
         startLoadingCollection()
+        setFragmentResultListener(REQUEST_HINT_LOCALE_SELECTION) { _, bundle ->
+            val selectedLocale =
+                BundleCompat.getSerializable(
+                    bundle,
+                    KEY_SELECTED_LOCALE,
+                    Locale::class.java,
+                )
+            if (selectedLocale != null) {
+                addFieldLocaleHint(selectedLocale)
+            }
+            dismissAllDialogFragments()
+        }
     }
 
     override fun onStop() {
@@ -515,8 +527,7 @@ class ModelFieldEditor :
     private fun localeHintDialog() {
         Timber.i("displaying locale hint dialog")
         // We don't currently show the current value, but we may want to in the future
-        val dialogFragment: DialogFragment = LocaleSelectionDialog.newInstance(this)
-        showDialogFragment(dialogFragment)
+        showDialogFragment(LocaleSelectionDialog())
     }
 
     /*
@@ -529,15 +540,6 @@ class ModelFieldEditor :
         showSnackbar(format, Snackbar.LENGTH_SHORT)
     }
 
-    override fun onSelectedLocale(selectedLocale: Locale) {
-        addFieldLocaleHint(selectedLocale)
-        dismissAllDialogFragments()
-    }
-
-    override fun onLocaleSelectionCancelled() {
-        dismissAllDialogFragments()
-    }
-
     @VisibleForTesting(otherwise = VisibleForTesting.NONE)
     @Throws(ConfirmModSchemaException::class)
     fun addField(fieldNameInput: EditText) {
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/LocaleSelectionDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/LocaleSelectionDialog.kt
index 0eb77b5bb6ea..40ea0b5402be 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/LocaleSelectionDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/LocaleSelectionDialog.kt
@@ -15,70 +15,55 @@
  */
 package com.ichi2.anki.dialogs
 
-import android.app.Activity
 import android.app.Dialog
-import android.content.Context
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo
 import android.widget.Filter
 import android.widget.Filterable
 import android.widget.TextView
+import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.SearchView
 import androidx.appcompat.widget.Toolbar
-import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.core.os.bundleOf
 import androidx.recyclerview.widget.RecyclerView
 import com.ichi2.anki.R
 import com.ichi2.anki.analytics.AnalyticsDialogFragment
 import com.ichi2.anki.dialogs.LocaleSelectionDialog.LocaleListAdapter.TextViewHolder
+import com.ichi2.anki.servicelayer.LanguageHintService
 import com.ichi2.ui.AccessibleSearchView
-import com.ichi2.ui.RecyclerSingleTouchAdapter
 import com.ichi2.utils.DisplayUtils.resizeWhenSoftInputShown
 import com.ichi2.utils.TypedFilter
+import com.ichi2.utils.cancelable
+import com.ichi2.utils.customView
+import com.ichi2.utils.show
 import java.util.Locale
 
-/** Locale selection dialog. Note: this must be dismissed onDestroy if not called from an activity implementing LocaleSelectionDialogHandler  */
+/**
+ * Shows a list of [Locale] from which the user can set one as the keyboard hint for that field.
+ * Currently supported only by Gboard.
+ * @see LanguageHintService
+ */
 class LocaleSelectionDialog : AnalyticsDialogFragment() {
-    private var dialogHandler: LocaleSelectionDialogHandler? = null
-
-    interface LocaleSelectionDialogHandler {
-        fun onSelectedLocale(selectedLocale: Locale)
-
-        fun onLocaleSelectionCancelled()
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        isCancelable = true
-    }
-
-    override fun onAttach(context: Context) {
-        super.onAttach(context)
-        if (context is Activity) {
-            if (dialogHandler == null) {
-                require(context is LocaleSelectionDialogHandler) { "Calling activity must implement LocaleSelectionDialogHandler" }
-                dialogHandler = context
-            }
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val localeAdapter =
+            LocaleListAdapter(
+                Locale.getAvailableLocales() + IPALanguage,
+                ::sendSelectionResult,
+            )
+        val dialogView = layoutInflater.inflate(R.layout.locale_selection_dialog, null)
+        dialogView
+            .findViewById<RecyclerView>(R.id.locale_dialog_selection_list)
+            .adapter = localeAdapter
+        dialogView
+            .findViewById<Toolbar>(R.id.locale_dialog_selection_toolbar)
+            .setupMenuWith(localeAdapter)
+        return AlertDialog.Builder(requireContext()).show {
+            cancelable(true)
+            customView(dialogView)
         }
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?,
-    ): View? = inflater.inflate(R.layout.locale_selection_dialog, container, false)
-
-    override fun onViewCreated(
-        view: View,
-        savedInstanceState: Bundle?,
-    ) {
-        val adapter = LocaleListAdapter(Locale.getAvailableLocales() + IPALanguage)
-        setupRecyclerView(requireActivity(), view, adapter)
-        inflateMenu(view, adapter)
-    }
-
     override fun setupDialog(
         dialog: Dialog,
         style: Int,
@@ -87,88 +72,63 @@ class LocaleSelectionDialog : AnalyticsDialogFragment() {
         dialog.window?.let { resizeWhenSoftInputShown(it) }
     }
 
-    private fun setupRecyclerView(
-        activity: Activity,
-        tagsDialogView: View,
-        adapter: LocaleListAdapter,
-    ) {
-        tagsDialogView.findViewById<RecyclerView>(R.id.locale_dialog_selection_list).apply {
-            requestFocus()
-            this.adapter = adapter
-            layoutManager = LinearLayoutManager(activity)
-            addOnItemTouchListener(
-                RecyclerSingleTouchAdapter(activity) { _, position ->
-                    dialogHandler!!.onSelectedLocale(adapter.getLocaleAtPosition(position))
+    private fun Toolbar.setupMenuWith(adapter: LocaleListAdapter) {
+        inflateMenu(R.menu.locale_dialog_search_bar)
+        setNavigationOnClickListener { sendSelectionResult() }
+        (menu.findItem(R.id.locale_dialog_action_search).actionView as AccessibleSearchView).apply {
+            imeOptions = EditorInfo.IME_ACTION_DONE
+            setOnQueryTextListener(
+                object : SearchView.OnQueryTextListener {
+                    override fun onQueryTextSubmit(query: String): Boolean = false
+
+                    override fun onQueryTextChange(newText: String): Boolean {
+                        adapter.filter.filter(newText)
+                        return false
+                    }
                 },
             )
         }
     }
 
-    private fun inflateMenu(
-        tagsDialogView: View,
-        adapter: LocaleListAdapter,
-    ) {
-        tagsDialogView.findViewById<Toolbar>(R.id.locale_dialog_selection_toolbar).apply {
-            inflateMenu(R.menu.locale_dialog_search_bar)
-            setNavigationOnClickListener { dialogHandler!!.onLocaleSelectionCancelled() }
-            (menu.findItem(R.id.locale_dialog_action_search).actionView as AccessibleSearchView).apply {
-                imeOptions = EditorInfo.IME_ACTION_DONE
-                setOnQueryTextListener(
-                    object : SearchView.OnQueryTextListener {
-                        override fun onQueryTextSubmit(query: String): Boolean = false
-
-                        override fun onQueryTextChange(newText: String): Boolean {
-                            adapter.filter.filter(newText)
-                            return false
-                        }
-                    },
-                )
-            }
-        }
+    private fun sendSelectionResult(locale: Locale? = null) {
+        parentFragmentManager.setFragmentResult(
+            REQUEST_HINT_LOCALE_SELECTION,
+            bundleOf(KEY_SELECTED_LOCALE to locale),
+        )
     }
 
-    class LocaleListAdapter(
-        locales: Array<Locale>,
+    private inner class LocaleListAdapter(
+        private val locales: Array<Locale>,
+        private val onLocaleSelected: (Locale) -> Unit,
     ) : RecyclerView.Adapter<TextViewHolder>(),
         Filterable {
-        private val currentlyVisibleLocales: MutableList<Locale> = locales.toMutableList()
-        private val selectableLocales: List<Locale> = locales.toList()
-
-        class TextViewHolder(
-            private val textView: TextView,
-        ) : RecyclerView.ViewHolder(textView) {
-            fun setText(text: String) {
-                textView.text = text
-            }
+        private val filteredLocales: MutableList<Locale> = locales.toMutableList()
 
-            fun setLocale(locale: Locale) {
-                val displayValue = locale.displayName
-                textView.text = displayValue
-            }
-        }
+        inner class TextViewHolder(
+            val textView: TextView,
+        ) : RecyclerView.ViewHolder(textView)
 
         override fun onCreateViewHolder(
             parent: ViewGroup,
             viewType: Int,
-        ): TextViewHolder {
-            val v =
-                LayoutInflater
-                    .from(parent.context)
-                    .inflate(R.layout.locale_dialog_fragment_textview, parent, false) as TextView
-            return TextViewHolder(v)
-        }
+        ) = TextViewHolder(
+            layoutInflater
+                .inflate(R.layout.locale_dialog_fragment_textview, parent, false) as TextView,
+        )
 
         override fun onBindViewHolder(
             holder: TextViewHolder,
             position: Int,
-        ) = holder.setLocale(currentlyVisibleLocales[position])
-
-        override fun getItemCount(): Int = currentlyVisibleLocales.size
+        ) {
+            val locale = filteredLocales[position]
+            holder.textView.text = locale.displayName
+            holder.textView.setOnClickListener { onLocaleSelected(locale) }
+        }
 
-        fun getLocaleAtPosition(position: Int): Locale = currentlyVisibleLocales[position]
+        override fun getItemCount(): Int = filteredLocales.size
 
         override fun getFilter(): Filter {
-            return object : TypedFilter<Locale>(selectableLocales) {
+            return object : TypedFilter<Locale>({ locales.toList() }) {
                 override fun filterResults(
                     constraint: CharSequence,
                     items: List<Locale>,
@@ -183,8 +143,8 @@ class LocaleSelectionDialog : AnalyticsDialogFragment() {
                     constraint: CharSequence?,
                     results: List<Locale>,
                 ) {
-                    currentlyVisibleLocales.clear()
-                    currentlyVisibleLocales.addAll(results)
+                    filteredLocales.clear()
+                    filteredLocales.addAll(results)
                     notifyDataSetChanged()
                 }
             }
@@ -192,6 +152,9 @@ class LocaleSelectionDialog : AnalyticsDialogFragment() {
     }
 
     companion object {
+        const val REQUEST_HINT_LOCALE_SELECTION = "request_hint_locale_selection"
+        const val KEY_SELECTED_LOCALE = "key_selected_locale"
+
         /**
          * Language identifier for International Phonetic Alphabet. This isn't available from [Locale.getAvailableLocales], but
          * GBoard seems to understand this as a language code.
@@ -200,14 +163,5 @@ class LocaleSelectionDialog : AnalyticsDialogFragment() {
          * See https://en.wikipedia.org/wiki/International_Phonetic_Alphabet#IETF_language_tags
          */
         private val IPALanguage = Locale.Builder().setLanguageTag("und-fonipa").build()
-
-        /**
-         * @param handler Marker interface to enforce the convention the caller implementing LocaleSelectionDialogHandler
-         */
-        fun newInstance(handler: LocaleSelectionDialogHandler): LocaleSelectionDialog =
-            LocaleSelectionDialog().apply {
-                dialogHandler = handler
-                arguments = Bundle()
-            }
     }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/ui/RecyclerSingleTouchAdapter.kt b/AnkiDroid/src/main/java/com/ichi2/ui/RecyclerSingleTouchAdapter.kt
deleted file mode 100644
index 65174dd6eb05..000000000000
--- a/AnkiDroid/src/main/java/com/ichi2/ui/RecyclerSingleTouchAdapter.kt
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- Copyright (c) 2020 David Allison <davidallisongithub@gmail.com>
-
- This program is free software; you can redistribute it and/or modify it under
- the terms of the GNU General Public License as published by the Free Software
- Foundation; either version 3 of the License, or (at your option) any later
- version.
-
- This program is distributed in the hope that it will be useful, but WITHOUT ANY
- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along with
- this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.ichi2.ui
-
-import android.content.Context
-import android.view.GestureDetector
-import android.view.GestureDetector.SimpleOnGestureListener
-import android.view.MotionEvent
-import android.view.View
-import androidx.recyclerview.widget.RecyclerView
-import androidx.recyclerview.widget.RecyclerView.OnItemTouchListener
-
-/** Adapts a RecyclerView.OnItemTouchListener to provide a click listener  */
-
-class RecyclerSingleTouchAdapter(
-    val context: Context,
-    val listener: OnItemClickListener,
-) : OnItemTouchListener {
-    private val gestureDetector =
-        GestureDetector(
-            context,
-            object : SimpleOnGestureListener() {
-                override fun onSingleTapUp(e: MotionEvent): Boolean {
-                    // onDown was too fast
-                    return true
-                }
-            },
-        )
-
-    fun interface OnItemClickListener {
-        fun onItemClick(
-            view: View,
-            position: Int,
-        )
-    }
-
-    override fun onInterceptTouchEvent(
-        view: RecyclerView,
-        e: MotionEvent,
-    ): Boolean {
-        val childView = view.findChildViewUnder(e.x, e.y)
-        if (childView != null && gestureDetector.onTouchEvent(e)) {
-            listener.onItemClick(childView, view.getChildAdapterPosition(childView))
-            return true
-        }
-        return false
-    }
-
-    override fun onTouchEvent(
-        view: RecyclerView,
-        motionEvent: MotionEvent,
-    ) {
-        // intentionally empty
-    }
-
-    override fun onRequestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {
-        // intentionally empty
-    }
-}
diff --git a/AnkiDroid/src/main/res/layout/locale_dialog_fragment_textview.xml b/AnkiDroid/src/main/res/layout/locale_dialog_fragment_textview.xml
index 16d0a9fafe9e..2aec88078592 100644
--- a/AnkiDroid/src/main/res/layout/locale_dialog_fragment_textview.xml
+++ b/AnkiDroid/src/main/res/layout/locale_dialog_fragment_textview.xml
@@ -16,10 +16,14 @@
   -->
 <androidx.appcompat.widget.AppCompatTextView
     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/locale_dialog_fragment_text_view"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:textSize="@dimen/content_textsize"
-    android:padding="@dimen/content_vertical_padding"
-    />
\ No newline at end of file
+    android:minHeight="48dp"
+    android:background="?attr/selectableItemBackground"
+    android:textAppearance="?attr/textAppearanceListItemSmall"
+    android:gravity="center_vertical"
+    android:paddingHorizontal="20dp"
+    tools:text="English"
+    />
diff --git a/AnkiDroid/src/main/res/layout/locale_selection_dialog.xml b/AnkiDroid/src/main/res/layout/locale_selection_dialog.xml
index 2b193a254872..ef353426cf38 100644
--- a/AnkiDroid/src/main/res/layout/locale_selection_dialog.xml
+++ b/AnkiDroid/src/main/res/layout/locale_selection_dialog.xml
@@ -15,14 +15,14 @@
   this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:paddingBottom="8dp">
 
-    <androidx.appcompat.widget.Toolbar xmlns:app="http://schemas.android.com/apk/res-auto"
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/locale_dialog_selection_toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -36,7 +36,6 @@
         app:navigationIcon="@drawable/close_icon"
         />
 
-
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/locale_dialog_selection_list"
         android:scrollbars="vertical"
@@ -45,19 +44,17 @@
         android:layout_below="@+id/locale_dialog_selection_toolbar"
         android:layout_above="@+id/locale_dialog_summary"
         android:fadeScrollbars="false"
-        android:paddingStart="8dp"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         />
 
     <com.ichi2.ui.FixedTextView
         android:id="@+id/locale_dialog_summary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
         android:text="@string/locale_selection_dialog_summary"
-        android:padding="@dimen/content_vertical_padding"
+        android:paddingVertical="@dimen/content_vertical_padding"
         android:layout_alignParentBottom="true"
-        android:paddingStart="8dp"
-        android:paddingEnd="8dp"
+        android:paddingHorizontal="20dp"
         />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>

From d5904758d35847479d89d99496d057f5d2b28577 Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Fri, 7 Feb 2025 10:20:56 -0300
Subject: [PATCH 190/200] feat: add screen selector in controls settings

it allows to add new screens with mappable controls

currently there is only the reviewer, but the previewer is going to be added in the next commits.

this change is being split to make the reviewing process easier
---
 .../preferences/ControlsSettingsFragment.kt   |  93 ++++-
 AnkiDroid/src/main/res/layout/tab_layout.xml  |   8 +
 .../src/main/res/values/10-preferences.xml    |   2 +
 AnkiDroid/src/main/res/values/preferences.xml |   2 +
 .../src/main/res/xml/preferences_controls.xml | 331 ++----------------
 .../res/xml/preferences_reviewer_controls.xml | 279 +++++++++++++++
 .../analytics/PreferencesAnalyticsTest.kt     |   3 +-
 .../anki/preferences/PreferenceTestUtils.kt   |   3 +-
 8 files changed, 403 insertions(+), 318 deletions(-)
 create mode 100644 AnkiDroid/src/main/res/layout/tab_layout.xml
 create mode 100644 AnkiDroid/src/main/res/xml/preferences_reviewer_controls.xml

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/ControlsSettingsFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/ControlsSettingsFragment.kt
index 0af409ed4e6f..f3d88441d824 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/ControlsSettingsFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/ControlsSettingsFragment.kt
@@ -16,41 +16,36 @@
 package com.ichi2.anki.preferences
 
 import android.content.res.Configuration
+import android.os.Bundle
+import android.view.View
 import androidx.annotation.StringRes
+import androidx.annotation.XmlRes
 import androidx.preference.Preference
+import androidx.preference.children
+import com.google.android.material.tabs.TabLayout
 import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.R
 import com.ichi2.anki.cardviewer.ViewerCommand
+import com.ichi2.anki.reviewer.MappableAction
 import com.ichi2.anki.reviewer.MappableBinding.Companion.toPreferenceString
 import com.ichi2.anki.ui.internationalization.toSentenceCase
+import com.ichi2.anki.utils.ext.sharedPrefs
 import com.ichi2.annotations.NeedsTest
 import com.ichi2.preferences.ControlPreference
-import com.ichi2.preferences.ReviewerControlPreference
+import timber.log.Timber
 
-class ControlsSettingsFragment : SettingsFragment() {
+class ControlsSettingsFragment :
+    SettingsFragment(),
+    TabLayout.OnTabSelectedListener {
     override val preferenceResource: Int
         get() = R.xml.preferences_controls
     override val analyticsScreenNameConstant: String
         get() = "prefs.controls"
 
-    @NeedsTest("Keys and titles in the XML layout are the same of the ViewerCommands")
     override fun initSubscreen() {
-        val commands = ViewerCommand.entries.associateBy { it.preferenceKey }
-        // set defaultValue in the prefs creation.
-        // if a preference is empty, it has a value like "1/"
-        preferenceScreen
-            .allPreferences()
-            .filterIsInstance<ReviewerControlPreference>()
-            .filter { pref -> pref.value == null }
-            .forEach { pref ->
-                commands[pref.key]
-                    ?.defaultValue
-                    ?.toPreferenceString()
-                    ?.let { pref.value = it }
-            }
-
-        setDynamicTitle()
-
+        requirePreference<Preference>(R.string.pref_controls_tab_layout_key).setViewId(R.id.tab_layout)
+        val initialScreen = ControlPreferenceScreen.entries.first()
+        addPreferencesFromResource(initialScreen.xmlRes)
         // TODO replace the preference with something dismissible. This is meant only to improve
         //  the discoverability of the system shortcut for the shortcuts dialog.
         requirePreference<Preference>(R.string.pref_keyboard_shortcuts_key).apply {
@@ -60,8 +55,55 @@ class ControlsSettingsFragment : SettingsFragment() {
                 true
             }
         }
+        setControlPreferencesDefaultValues(initialScreen)
+        setDynamicTitle()
     }
 
+    private fun setControlPreferencesDefaultValues(screen: ControlPreferenceScreen) {
+        val commands = screen.getActions().associateBy { it.preferenceKey }
+        val prefs = sharedPrefs()
+        preferenceScreen
+            .allPreferences()
+            .filterIsInstance<ControlPreference>()
+            .filter { pref -> pref.value == null }
+            .forEach { pref -> commands[pref.key]?.getBindings(prefs)?.toPreferenceString()?.let { pref.value = it } }
+    }
+
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
+        super.onViewCreated(view, savedInstanceState)
+
+        listView.post {
+            val tabLayout = listView.findViewById<TabLayout>(R.id.tab_layout)
+            for (screen in ControlPreferenceScreen.entries) {
+                val tab = tabLayout.newTab().setText(screen.titleRes)
+                tabLayout.addTab(tab)
+            }
+            tabLayout.addOnTabSelectedListener(this)
+        }
+    }
+
+    override fun onTabSelected(tab: TabLayout.Tab) {
+        val screen = ControlPreferenceScreen.entries[tab.position]
+        Timber.v("Selected tab %d - %s", tab.position, screen.name)
+        addPreferencesFromResource(screen.xmlRes)
+        setControlPreferencesDefaultValues(screen)
+        setDynamicTitle()
+    }
+
+    @NeedsTest("General category is kept and the other elements are removed")
+    override fun onTabUnselected(tab: TabLayout.Tab?) {
+        val preferences = preferenceScreen.children.toList()
+        // 0 is the `General` category, which should be kept
+        for (pref in preferences.subList(1, preferences.size)) {
+            preferenceScreen.removePreference(pref)
+        }
+    }
+
+    override fun onTabReselected(tab: TabLayout.Tab?) = Unit
+
     private fun setDynamicTitle() {
         findPreference<ControlPreference>(getString(R.string.reschedule_command_key))?.let {
             val preferenceTitle = TR.actionsSetDueDate().toSentenceCase(R.string.sentence_set_due_date)
@@ -104,3 +146,16 @@ class ControlsSettingsFragment : SettingsFragment() {
         @StringRes resId: Int,
     ): String = this.toSentenceCase(this@ControlsSettingsFragment, resId)
 }
+
+enum class ControlPreferenceScreen(
+    @XmlRes val xmlRes: Int,
+    @StringRes val titleRes: Int,
+) {
+    REVIEWER(R.xml.preferences_reviewer_controls, R.string.pref_controls_reviews_tab),
+    ;
+
+    fun getActions(): List<MappableAction<*>> =
+        when (this) {
+            REVIEWER -> ViewerCommand.entries
+        }
+}
diff --git a/AnkiDroid/src/main/res/layout/tab_layout.xml b/AnkiDroid/src/main/res/layout/tab_layout.xml
new file mode 100644
index 000000000000..f2221a4291bd
--- /dev/null
+++ b/AnkiDroid/src/main/res/layout/tab_layout.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.tabs.TabLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    style="@style/Widget.Material3.TabLayout"
+    app:tabMode="fixed"
+    />
\ No newline at end of file
diff --git a/AnkiDroid/src/main/res/values/10-preferences.xml b/AnkiDroid/src/main/res/values/10-preferences.xml
index f6c7c43240ef..76f818b30f29 100644
--- a/AnkiDroid/src/main/res/values/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values/10-preferences.xml
@@ -176,6 +176,8 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen"
+        >Reviews</string>
 
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
diff --git a/AnkiDroid/src/main/res/values/preferences.xml b/AnkiDroid/src/main/res/values/preferences.xml
index a2342235b220..491e7dc6a165 100644
--- a/AnkiDroid/src/main/res/values/preferences.xml
+++ b/AnkiDroid/src/main/res/values/preferences.xml
@@ -88,6 +88,8 @@
     <string name="nav_drawer_gesture_key">gestureFullScreenNavigationDrawer</string>
     <string name="pref_keyboard_shortcuts_key">showKeyboardShortcuts</string>
     <string name="pref_swipe_sensitivity_key">swipeSensitivity</string>
+    <string name="pref_controls_tab_layout_key">controlsTabLayout</string>
+    <string name="pref_cat_controls_general_key">controlsGeneral</string>
     <string name="show_answer_command_key">binding_SHOW_ANSWER</string>
     <string name="answer_again_command_key">binding_FLIP_OR_ANSWER_EASE1</string>
     <string name="answer_hard_command_key">binding_FLIP_OR_ANSWER_EASE2</string>
diff --git a/AnkiDroid/src/main/res/xml/preferences_controls.xml b/AnkiDroid/src/main/res/xml/preferences_controls.xml
index 13a20aa91f3e..0ae380776a21 100644
--- a/AnkiDroid/src/main/res/xml/preferences_controls.xml
+++ b/AnkiDroid/src/main/res/xml/preferences_controls.xml
@@ -14,8 +14,6 @@
   ~  You should have received a copy of the GNU General Public License along with
   ~  this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
-
-<!-- Key com.ichi2.ui.BindingPreferences -->
 <PreferenceScreen 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"
@@ -23,33 +21,37 @@
     android:key="@string/pref_controls_screen_key"
     tools:context=".preferences.ControlsSettingsFragment">
 
-    <SwitchPreferenceCompat
-        android:defaultValue="false"
-        android:disableDependentsState="false"
-        android:key="@string/gestures_preference"
-        android:summary="@string/gestures_summ"
-        android:title="@string/gestures" />
-    <SwitchPreferenceCompat
-        android:defaultValue="false"
-        android:dependency="@string/gestures_preference"
-        android:key="@string/gestures_corner_touch_preference"
-        android:summary="@string/gestures_corner_touch_summary"
-        android:title="@string/gestures_corner_touch" />
-    <SwitchPreferenceCompat
-        android:defaultValue="false"
-        android:dependency="@string/gestures_preference"
-        android:disableDependentsState="false"
-        android:key="@string/nav_drawer_gesture_key"
-        android:summary="@string/gestures_fullscreen_nav_drawer_summary"
-        android:title="@string/gestures_full_screen_nav_drawer" />
-    <com.ichi2.preferences.SliderPreference
-        android:key="@string/pref_swipe_sensitivity_key"
-        android:dependency="@string/gestures_preference"
-        android:title="@string/swipe_sensitivity"
-        android:defaultValue="100"
-        android:valueFrom="20"
-        android:valueTo="180"
-        app:displayValue="true" />
+    <PreferenceCategory
+        android:key="@string/pref_cat_controls_general_key"
+        android:title="@string/pref_cat_general">
+
+        <SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:disableDependentsState="false"
+            android:key="@string/gestures_preference"
+            android:summary="@string/gestures_summ"
+            android:title="@string/gestures" />
+        <SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:dependency="@string/gestures_preference"
+            android:key="@string/gestures_corner_touch_preference"
+            android:summary="@string/gestures_corner_touch_summary"
+            android:title="@string/gestures_corner_touch" />
+        <SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:dependency="@string/gestures_preference"
+            android:disableDependentsState="false"
+            android:key="@string/nav_drawer_gesture_key"
+            android:summary="@string/gestures_fullscreen_nav_drawer_summary"
+            android:title="@string/gestures_full_screen_nav_drawer" />
+        <com.ichi2.preferences.SliderPreference
+            android:key="@string/pref_swipe_sensitivity_key"
+            android:dependency="@string/gestures_preference"
+            android:title="@string/swipe_sensitivity"
+            android:defaultValue="100"
+            android:valueFrom="20"
+            android:valueTo="180"
+            app:displayValue="true"/>
 
     <Preference
         android:key="@string/pref_keyboard_shortcuts_key"
@@ -57,274 +59,9 @@
         android:icon="@drawable/ic_keyboard"
         />
 
-    <PreferenceCategory android:title="@string/answer_buttons">
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/show_answer_command_key"
-            android:title="@string/show_answer"
-            />
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/answer_again_command_key"
-            android:title="@string/answer_again"
-            />
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/answer_hard_command_key"
-            android:title="@string/answer_hard"
-            />
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/answer_good_command_key"
-            android:title="@string/answer_good"
-            />
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/answer_easy_command_key"
-            android:title="@string/answer_easy"
+        <Preference
+            android:key="@string/pref_controls_tab_layout_key"
+            android:layout="@layout/tab_layout"
             />
     </PreferenceCategory>
-
-    <PreferenceCategory android:title="@string/filter_by_flags">
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/flag_red_command_key"
-            android:title="@string/gesture_flag_red"
-            android:icon="@drawable/ic_flag_red"
-            />
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/flag_orange_command_key"
-            android:title="@string/gesture_flag_orange"
-            android:icon="@drawable/ic_flag_orange"
-            />
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/flag_green_command_key"
-            android:title="@string/gesture_flag_green"
-            android:icon="@drawable/ic_flag_green"
-            />
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/flag_blue_command_key"
-            android:title="@string/gesture_flag_blue"
-            android:icon="@drawable/ic_flag_blue"
-            />
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/flag_pink_command_key"
-            android:title="@string/gesture_flag_pink"
-            android:icon="@drawable/ic_flag_pink"
-            />
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/flag_turquoise_command_key"
-            android:title="@string/gesture_flag_turquoise"
-            android:icon="@drawable/ic_flag_turquoise"
-            />
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/flag_purple_command_key"
-            android:title="@string/gesture_flag_purple"
-            android:icon="@drawable/ic_flag_purple"
-            />
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/remove_flag_command_key"
-            android:title="@string/gesture_flag_remove"
-            android:icon="@drawable/ic_flag_transparent"
-            />
-    </PreferenceCategory>
-
-    <PreferenceCategory android:title="@string/card">
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/bury_card_command_key"
-            android:title="@string/menu_bury_card"
-            android:icon="@drawable/ic_flip_to_back_white"
-            />
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/suspend_card_command_key"
-            android:title="@string/menu_suspend_card"
-            android:icon="@drawable/ic_suspend"
-            />
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/reschedule_command_key"
-            tools:title="Set due date"
-            android:icon="@drawable/ic_reschedule"
-            />
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/card_info_command_key"
-            android:title="@string/card_info_title"
-            android:icon="@drawable/ic_outline_info_24"
-            />
-    </PreferenceCategory>
-
-    <PreferenceCategory android:title="@string/note">
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/bury_note_command_key"
-            android:title="@string/menu_bury_note"
-            android:icon="@drawable/ic_flip_to_back_white"
-            />
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/suspend_note_command_key"
-            android:title="@string/menu_suspend_note"
-            android:icon="@drawable/ic_suspend"
-            />
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/delete_command_key"
-            android:title="@string/menu_delete_note"
-            android:icon="@drawable/ic_delete_white"
-            />
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/mark_command_key"
-            android:title="@string/menu_mark_note"
-            android:icon="@drawable/ic_star_border_white"
-            />
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/edit_command_key"
-            android:title="@string/cardeditor_title_edit_card"
-            android:icon="@drawable/ic_popup_menu_item_editor"
-            />
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/tag_command_key"
-            android:title="@string/menu_edit_tags"
-            android:icon="@drawable/ic_tag"
-            />
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/add_note_command_key"
-            android:title="@string/menu_add_note"
-            android:icon="@drawable/ic_add"
-            />
-    </PreferenceCategory>
-
-    <PreferenceCategory android:title="@string/navigation">
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/page_up_command_key"
-            android:title="@string/gesture_page_up"
-            android:icon="@drawable/ic_double_arrow_up"
-            />
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/page_down_command_key"
-            android:title="@string/gesture_page_down"
-            android:icon="@drawable/ic_double_arrow_down"
-            />
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/abort_command_key"
-            android:title="@string/gesture_abort_learning"
-            android:icon="@drawable/close_icon"
-            />
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/abort_and_sync_command_key"
-            android:title="@string/gesture_abort_sync"
-            android:icon="@drawable/ic_sync"
-            />
-    </PreferenceCategory>
-
-    <PreferenceCategory android:title="@string/media">
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/play_media_command_key"
-            android:title="@string/gesture_play"
-            android:icon="@drawable/ic_play_circle_white"
-            />
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/record_voice_command_key"
-            android:title="@string/record_voice"
-            android:icon="@drawable/ic_action_mic"
-            />
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/replay_voice_command_key"
-            android:title="@string/replay_voice"
-            app:icon="@drawable/ic_replay"
-            />
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/save_voice_command_key"
-            android:title="@string/save_voice"
-            app:icon="@drawable/round_done_24"/>
-    </PreferenceCategory>
-
-    <PreferenceCategory android:title="@string/pref_cat_whiteboard">
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/toggle_whiteboard_command_key"
-            android:title="@string/gesture_toggle_whiteboard"
-            android:icon="@drawable/ic_enable_whiteboard"
-            />
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/clear_whiteboard_command_key"
-            android:title="@string/clear_whiteboard"
-            android:icon="@drawable/ic_clear_white"
-            />
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/change_whiteboard_pen_color_command_key"
-            android:title="@string/title_whiteboard_editor"
-            android:icon="@drawable/ic_color_lens_white_24dp"
-            />
-    </PreferenceCategory>
-
-    <PreferenceCategory android:title="@string/misc">
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/undo_command_key"
-            android:title="@string/undo"
-            android:icon="@drawable/ic_undo_white"
-            />
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/redo_command_key"
-            android:title="@string/redo"
-            android:icon="@drawable/ic_redo"
-            />
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/toggle_auto_advance_command_key"
-            android:title="@string/toggle_auto_advance"
-            android:icon="@drawable/ic_fast_forward"
-            />
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/show_hint_command_key"
-            android:title="@string/gesture_show_hint"
-            android:icon="@drawable/ic_lightbulb"
-            />
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/show_all_hints_command_key"
-            android:title="@string/gesture_show_all_hints"
-            android:icon="@drawable/ic_lightbulb_stars"
-            />
-    </PreferenceCategory>
-
-    <com.ichi2.anki.preferences.ExtendedPreferenceCategory
-        android:key="@string/user_actions_controls_category_key"
-        android:title="@string/user_actions"
-        android:summary="@string/user_actions_summary"
-        app:helpLink="@string/link_user_actions_help">
-
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/user_action_1_key"
-            android:title="@string/user_action_1"
-            android:icon="@drawable/user_action_1"
-            />
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/user_action_2_key"
-            android:title="@string/user_action_2"
-            android:icon="@drawable/user_action_2"
-            />
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/user_action_3_key"
-            android:title="@string/user_action_3"
-            android:icon="@drawable/user_action_3"
-            />
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/user_action_4_key"
-            android:title="@string/user_action_4"
-            android:icon="@drawable/user_action_4"
-            />
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/user_action_5_key"
-            android:title="@string/user_action_5"
-            android:icon="@drawable/user_action_5"
-            />
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/user_action_6_key"
-            android:title="@string/user_action_6"
-            android:icon="@drawable/user_action_6"
-            />
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/user_action_7_key"
-            android:title="@string/user_action_7"
-            android:icon="@drawable/user_action_7"
-            />
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/user_action_8_key"
-            android:title="@string/user_action_8"
-            android:icon="@drawable/user_action_8"
-            />
-        <com.ichi2.preferences.ReviewerControlPreference
-            android:key="@string/user_action_9_key"
-            android:title="@string/user_action_9"
-            android:icon="@drawable/user_action_9"
-            />
-    </com.ichi2.anki.preferences.ExtendedPreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/AnkiDroid/src/main/res/xml/preferences_reviewer_controls.xml b/AnkiDroid/src/main/res/xml/preferences_reviewer_controls.xml
new file mode 100644
index 000000000000..dce242400e7a
--- /dev/null
+++ b/AnkiDroid/src/main/res/xml/preferences_reviewer_controls.xml
@@ -0,0 +1,279 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen 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">
+
+    <!-- Divider removed because the above tab layout already has one -->
+    <PreferenceCategory android:title="@string/answer_buttons"
+        app:allowDividerAbove="false">
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/show_answer_command_key"
+            android:title="@string/show_answer"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/answer_again_command_key"
+            android:title="@string/answer_again"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/answer_hard_command_key"
+            android:title="@string/answer_hard"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/answer_good_command_key"
+            android:title="@string/answer_good"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/answer_easy_command_key"
+            android:title="@string/answer_easy"
+            />
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/filter_by_flags">
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/flag_red_command_key"
+            android:title="@string/gesture_flag_red"
+            android:icon="@drawable/ic_flag_red"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/flag_orange_command_key"
+            android:title="@string/gesture_flag_orange"
+            android:icon="@drawable/ic_flag_orange"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/flag_green_command_key"
+            android:title="@string/gesture_flag_green"
+            android:icon="@drawable/ic_flag_green"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/flag_blue_command_key"
+            android:title="@string/gesture_flag_blue"
+            android:icon="@drawable/ic_flag_blue"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/flag_pink_command_key"
+            android:title="@string/gesture_flag_pink"
+            android:icon="@drawable/ic_flag_pink"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/flag_turquoise_command_key"
+            android:title="@string/gesture_flag_turquoise"
+            android:icon="@drawable/ic_flag_turquoise"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/flag_purple_command_key"
+            android:title="@string/gesture_flag_purple"
+            android:icon="@drawable/ic_flag_purple"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/remove_flag_command_key"
+            android:title="@string/gesture_flag_remove"
+            android:icon="@drawable/ic_flag_transparent"
+            />
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/card">
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/bury_card_command_key"
+            android:title="@string/menu_bury_card"
+            android:icon="@drawable/ic_flip_to_back_white"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/suspend_card_command_key"
+            android:title="@string/menu_suspend_card"
+            android:icon="@drawable/ic_suspend"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/reschedule_command_key"
+            tools:title="Set due date"
+            android:icon="@drawable/ic_reschedule"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/card_info_command_key"
+            android:title="@string/card_info_title"
+            android:icon="@drawable/ic_outline_info_24"
+            />
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/note">
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/bury_note_command_key"
+            android:title="@string/menu_bury_note"
+            android:icon="@drawable/ic_flip_to_back_white"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/suspend_note_command_key"
+            android:title="@string/menu_suspend_note"
+            android:icon="@drawable/ic_suspend"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/delete_command_key"
+            android:title="@string/menu_delete_note"
+            android:icon="@drawable/ic_delete_white"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/mark_command_key"
+            android:title="@string/menu_mark_note"
+            android:icon="@drawable/ic_star_border_white"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/edit_command_key"
+            android:title="@string/cardeditor_title_edit_card"
+            android:icon="@drawable/ic_popup_menu_item_editor"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/tag_command_key"
+            android:title="@string/menu_edit_tags"
+            android:icon="@drawable/ic_tag"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/add_note_command_key"
+            android:title="@string/menu_add_note"
+            android:icon="@drawable/ic_add"
+            />
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/navigation">
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/page_up_command_key"
+            android:title="@string/gesture_page_up"
+            android:icon="@drawable/ic_double_arrow_up"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/page_down_command_key"
+            android:title="@string/gesture_page_down"
+            android:icon="@drawable/ic_double_arrow_down"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/abort_command_key"
+            android:title="@string/gesture_abort_learning"
+            android:icon="@drawable/close_icon"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/abort_and_sync_command_key"
+            android:title="@string/gesture_abort_sync"
+            android:icon="@drawable/ic_sync"
+            />
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/media">
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/play_media_command_key"
+            android:title="@string/gesture_play"
+            android:icon="@drawable/ic_play_circle_white"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/record_voice_command_key"
+            android:title="@string/record_voice"
+            android:icon="@drawable/ic_action_mic"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/replay_voice_command_key"
+            android:title="@string/replay_voice"
+            app:icon="@drawable/ic_replay"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/save_voice_command_key"
+            android:title="@string/save_voice"
+            app:icon="@drawable/round_done_24"/>
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/pref_cat_whiteboard">
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/toggle_whiteboard_command_key"
+            android:title="@string/gesture_toggle_whiteboard"
+            android:icon="@drawable/ic_enable_whiteboard"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/clear_whiteboard_command_key"
+            android:title="@string/clear_whiteboard"
+            android:icon="@drawable/ic_clear_white"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/change_whiteboard_pen_color_command_key"
+            android:title="@string/title_whiteboard_editor"
+            android:icon="@drawable/ic_color_lens_white_24dp"
+            />
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/misc">
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/undo_command_key"
+            android:title="@string/undo"
+            android:icon="@drawable/ic_undo_white"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/redo_command_key"
+            android:title="@string/redo"
+            android:icon="@drawable/ic_redo"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/toggle_auto_advance_command_key"
+            android:title="@string/toggle_auto_advance"
+            android:icon="@drawable/ic_fast_forward"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/show_hint_command_key"
+            android:title="@string/gesture_show_hint"
+            android:icon="@drawable/ic_lightbulb"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/show_all_hints_command_key"
+            android:title="@string/gesture_show_all_hints"
+            android:icon="@drawable/ic_lightbulb_stars"
+            />
+    </PreferenceCategory>
+
+    <com.ichi2.anki.preferences.ExtendedPreferenceCategory
+        android:key="@string/user_actions_controls_category_key"
+        android:title="@string/user_actions"
+        android:summary="@string/user_actions_summary"
+        app:helpLink="@string/link_user_actions_help">
+
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/user_action_1_key"
+            android:title="@string/user_action_1"
+            android:icon="@drawable/user_action_1"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/user_action_2_key"
+            android:title="@string/user_action_2"
+            android:icon="@drawable/user_action_2"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/user_action_3_key"
+            android:title="@string/user_action_3"
+            android:icon="@drawable/user_action_3"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/user_action_4_key"
+            android:title="@string/user_action_4"
+            android:icon="@drawable/user_action_4"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/user_action_5_key"
+            android:title="@string/user_action_5"
+            android:icon="@drawable/user_action_5"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/user_action_6_key"
+            android:title="@string/user_action_6"
+            android:icon="@drawable/user_action_6"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/user_action_7_key"
+            android:title="@string/user_action_7"
+            android:icon="@drawable/user_action_7"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/user_action_8_key"
+            android:title="@string/user_action_8"
+            android:icon="@drawable/user_action_8"
+            />
+        <com.ichi2.preferences.ReviewerControlPreference
+            android:key="@string/user_action_9_key"
+            android:title="@string/user_action_9"
+            android:icon="@drawable/user_action_9"
+            />
+    </com.ichi2.anki.preferences.ExtendedPreferenceCategory>
+
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/analytics/PreferencesAnalyticsTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/analytics/PreferencesAnalyticsTest.kt
index 94d5e1227fc9..7c636178d0e3 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/analytics/PreferencesAnalyticsTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/analytics/PreferencesAnalyticsTest.kt
@@ -62,7 +62,8 @@ class PreferencesAnalyticsTest : RobolectricTest() {
             R.string.pref_appearance_screen_key, // appearance_preference_group
             R.string.pref_cat_plugins_key, // category_plugins
             R.string.pref_cat_workarounds_key, // category_workarounds
-            R.string.user_actions_controls_category_key, // userActionsControls
+            R.string.pref_cat_controls_general_key, // controlsGeneral
+            R.string.pref_controls_tab_layout_key, // controlsTabLayout
             // Preferences that only click: don't have a value
             R.string.tts_key, // tts
             R.string.pref_reset_languages_key, // resetLanguages
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/preferences/PreferenceTestUtils.kt b/AnkiDroid/src/test/java/com/ichi2/anki/preferences/PreferenceTestUtils.kt
index 9ae683b0870c..b2c5e76bf329 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/preferences/PreferenceTestUtils.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/preferences/PreferenceTestUtils.kt
@@ -20,6 +20,7 @@ import androidx.annotation.XmlRes
 import androidx.fragment.app.Fragment
 import com.ichi2.anki.AnkiDroidApp
 import com.ichi2.anki.R
+import com.ichi2.anki.cardviewer.ViewerCommand
 import com.ichi2.testutils.getInstanceFromClassName
 import org.xmlpull.v1.XmlPullParser
 
@@ -117,7 +118,7 @@ object PreferenceTestUtils {
         getAllPreferencesFragments(context)
             .filterIsInstance<PreferenceXmlSource>()
             .map { it.preferenceResource }
-            .flatMapTo(hashSetOf()) { getKeysFromXml(context, it) }
+            .flatMapTo(hashSetOf()) { getKeysFromXml(context, it) } + ViewerCommand.entries.map { it.preferenceKey }
 
     fun getAllCustomButtonKeys(context: Context): Set<String> {
         val keys = getKeysFromXml(context, R.xml.preferences_custom_buttons).toMutableSet()

From 88cddfd89791d8cd2303a526449c57c9038da16b Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Fri, 7 Feb 2025 11:05:11 -0300
Subject: [PATCH 191/200] feat(previewer): keybinds

---
 .../preferences/ControlsSettingsFragment.kt   |  3 +
 .../ichi2/anki/previewer/PreviewerAction.kt   | 70 ++++++++++++++++
 .../ichi2/anki/previewer/PreviewerFragment.kt | 71 ++++++++--------
 AnkiDroid/src/main/res/values/02-strings.xml  |  4 +-
 .../src/main/res/values/10-preferences.xml    |  4 +
 .../main/res/values/18-standard-models.xml    |  2 +-
 AnkiDroid/src/main/res/values/preferences.xml | 15 ++++
 .../xml/preferences_previewer_controls.xml    | 81 +++++++++++++++++++
 8 files changed, 214 insertions(+), 36 deletions(-)
 create mode 100644 AnkiDroid/src/main/java/com/ichi2/anki/previewer/PreviewerAction.kt
 create mode 100644 AnkiDroid/src/main/res/xml/preferences_previewer_controls.xml

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/ControlsSettingsFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/ControlsSettingsFragment.kt
index f3d88441d824..8cf0495f990d 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/ControlsSettingsFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/ControlsSettingsFragment.kt
@@ -26,6 +26,7 @@ import com.google.android.material.tabs.TabLayout
 import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.R
 import com.ichi2.anki.cardviewer.ViewerCommand
+import com.ichi2.anki.previewer.PreviewerAction
 import com.ichi2.anki.reviewer.MappableAction
 import com.ichi2.anki.reviewer.MappableBinding.Companion.toPreferenceString
 import com.ichi2.anki.ui.internationalization.toSentenceCase
@@ -152,10 +153,12 @@ enum class ControlPreferenceScreen(
     @StringRes val titleRes: Int,
 ) {
     REVIEWER(R.xml.preferences_reviewer_controls, R.string.pref_controls_reviews_tab),
+    PREVIEWER(R.xml.preferences_previewer_controls, R.string.pref_controls_previews_tab),
     ;
 
     fun getActions(): List<MappableAction<*>> =
         when (this) {
             REVIEWER -> ViewerCommand.entries
+            PREVIEWER -> PreviewerAction.entries
         }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/previewer/PreviewerAction.kt b/AnkiDroid/src/main/java/com/ichi2/anki/previewer/PreviewerAction.kt
new file mode 100644
index 000000000000..20b43d1b2988
--- /dev/null
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/previewer/PreviewerAction.kt
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2025 Brayan Oliveira <brayandso.dev@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.ichi2.anki.previewer
+
+import android.content.SharedPreferences
+import android.view.KeyEvent
+import com.ichi2.anki.reviewer.Binding.Companion.keyCode
+import com.ichi2.anki.reviewer.Binding.Companion.unicode
+import com.ichi2.anki.reviewer.Binding.ModifierKeys.Companion.ctrl
+import com.ichi2.anki.reviewer.MappableAction
+import com.ichi2.anki.reviewer.MappableBinding
+
+enum class PreviewerAction : MappableAction<MappableBinding> {
+    BACK,
+    NEXT,
+    MARK,
+    EDIT,
+    TOGGLE_BACKSIDE_ONLY,
+    REPLAY_AUDIO,
+    TOGGLE_FLAG_RED,
+    TOGGLE_FLAG_ORANGE,
+    TOGGLE_FLAG_GREEN,
+    TOGGLE_FLAG_BLUE,
+    TOGGLE_FLAG_PINK,
+    TOGGLE_FLAG_TURQUOISE,
+    TOGGLE_FLAG_PURPLE,
+    UNSET_FLAG,
+    ;
+
+    override val preferenceKey = "previewer_$name"
+
+    override fun getBindings(prefs: SharedPreferences): List<MappableBinding> {
+        val prefValue = prefs.getString(preferenceKey, null) ?: return defaultBindings
+        return MappableBinding.fromPreferenceString(prefValue)
+    }
+
+    private val defaultBindings: List<MappableBinding> get() {
+        val binding =
+            when (this) {
+                BACK -> keyCode(KeyEvent.KEYCODE_DPAD_LEFT)
+                NEXT -> keyCode(KeyEvent.KEYCODE_DPAD_RIGHT)
+                MARK -> unicode('*')
+                REPLAY_AUDIO -> keyCode(KeyEvent.KEYCODE_R)
+                EDIT -> keyCode(KeyEvent.KEYCODE_E)
+                TOGGLE_BACKSIDE_ONLY -> keyCode(KeyEvent.KEYCODE_B)
+                TOGGLE_FLAG_RED -> keyCode(KeyEvent.KEYCODE_1, ctrl())
+                TOGGLE_FLAG_ORANGE -> keyCode(KeyEvent.KEYCODE_2, ctrl())
+                TOGGLE_FLAG_GREEN -> keyCode(KeyEvent.KEYCODE_3, ctrl())
+                TOGGLE_FLAG_BLUE -> keyCode(KeyEvent.KEYCODE_4, ctrl())
+                TOGGLE_FLAG_PINK -> keyCode(KeyEvent.KEYCODE_5, ctrl())
+                TOGGLE_FLAG_TURQUOISE -> keyCode(KeyEvent.KEYCODE_6, ctrl())
+                TOGGLE_FLAG_PURPLE -> keyCode(KeyEvent.KEYCODE_7, ctrl())
+                UNSET_FLAG -> return emptyList()
+            }
+        return listOf(MappableBinding(binding))
+    }
+}
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/previewer/PreviewerFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/previewer/PreviewerFragment.kt
index 955800a7bc36..7b863b095bc0 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/previewer/PreviewerFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/previewer/PreviewerFragment.kt
@@ -41,6 +41,9 @@ import com.ichi2.anki.Flag
 import com.ichi2.anki.R
 import com.ichi2.anki.browser.PreviewerIdsFile
 import com.ichi2.anki.cardviewer.CardMediaPlayer
+import com.ichi2.anki.reviewer.BindingProcessor
+import com.ichi2.anki.reviewer.MappableBinding
+import com.ichi2.anki.reviewer.PeripheralKeymap
 import com.ichi2.anki.snackbar.BaseSnackbarBuilderProvider
 import com.ichi2.anki.snackbar.SnackbarBuilder
 import com.ichi2.anki.utils.ext.sharedPrefs
@@ -53,7 +56,8 @@ class PreviewerFragment :
     CardViewerFragment(R.layout.previewer),
     Toolbar.OnMenuItemClickListener,
     BaseSnackbarBuilderProvider,
-    DispatchKeyEventListener {
+    DispatchKeyEventListener,
+    BindingProcessor<MappableBinding, PreviewerAction> {
     override val viewModel: PreviewerViewModel by viewModels {
         val previewerIdsFile =
             requireNotNull(BundleCompat.getParcelable(requireArguments(), CARD_IDS_FILE_ARG, PreviewerIdsFile::class.java)) {
@@ -76,6 +80,8 @@ class PreviewerFragment :
                 }
         }
 
+    private lateinit var keyMap: PeripheralKeymap<MappableBinding, PreviewerAction>
+
     override fun onViewCreated(
         view: View,
         savedInstanceState: Bundle?,
@@ -181,6 +187,8 @@ class PreviewerFragment :
         if (sharedPrefs().getBoolean("safeDisplay", false)) {
             view.findViewById<MaterialCardView>(R.id.webview_container).elevation = 0F
         }
+
+        keyMap = PeripheralKeymap(sharedPrefs(), PreviewerAction.entries, this)
     }
 
     private fun setupFlagMenu(menu: Menu) {
@@ -211,6 +219,33 @@ class PreviewerFragment :
         return true
     }
 
+    override fun processAction(
+        action: PreviewerAction,
+        binding: MappableBinding,
+    ): Boolean {
+        when (action) {
+            PreviewerAction.MARK -> viewModel.toggleMark()
+            PreviewerAction.EDIT -> editCard()
+            PreviewerAction.TOGGLE_BACKSIDE_ONLY -> viewModel.toggleBackSideOnly()
+            PreviewerAction.REPLAY_AUDIO -> viewModel.replayAudios()
+            PreviewerAction.TOGGLE_FLAG_RED -> viewModel.toggleFlag(Flag.RED)
+            PreviewerAction.TOGGLE_FLAG_ORANGE -> viewModel.toggleFlag(Flag.ORANGE)
+            PreviewerAction.TOGGLE_FLAG_GREEN -> viewModel.toggleFlag(Flag.GREEN)
+            PreviewerAction.TOGGLE_FLAG_BLUE -> viewModel.toggleFlag(Flag.BLUE)
+            PreviewerAction.TOGGLE_FLAG_PINK -> viewModel.toggleFlag(Flag.PINK)
+            PreviewerAction.TOGGLE_FLAG_TURQUOISE -> viewModel.toggleFlag(Flag.TURQUOISE)
+            PreviewerAction.TOGGLE_FLAG_PURPLE -> viewModel.toggleFlag(Flag.PURPLE)
+            PreviewerAction.UNSET_FLAG -> viewModel.setFlag(Flag.NONE)
+            PreviewerAction.BACK -> {
+                requireView().findViewById<MaterialButton>(R.id.show_previous).performClickIfEnabled()
+            }
+            PreviewerAction.NEXT -> {
+                requireView().findViewById<MaterialButton>(R.id.show_next).performClickIfEnabled()
+            }
+        }
+        return true
+    }
+
     private fun setBackSideOnlyButtonIcon(
         menu: Menu,
         isBackSideOnly: Boolean,
@@ -240,39 +275,7 @@ class PreviewerFragment :
 
     override fun dispatchKeyEvent(event: KeyEvent): Boolean {
         if (event.action != KeyEvent.ACTION_DOWN) return false
-
-        if (event.isCtrlPressed) {
-            when (event.keyCode) {
-                KeyEvent.KEYCODE_1 -> viewModel.toggleFlag(Flag.RED)
-                KeyEvent.KEYCODE_2 -> viewModel.toggleFlag(Flag.ORANGE)
-                KeyEvent.KEYCODE_3 -> viewModel.toggleFlag(Flag.GREEN)
-                KeyEvent.KEYCODE_4 -> viewModel.toggleFlag(Flag.BLUE)
-                KeyEvent.KEYCODE_5 -> viewModel.toggleFlag(Flag.PINK)
-                KeyEvent.KEYCODE_6 -> viewModel.toggleFlag(Flag.TURQUOISE)
-                KeyEvent.KEYCODE_7 -> viewModel.toggleFlag(Flag.PURPLE)
-                else -> return false
-            }
-            return true
-        }
-
-        when (event.unicodeChar.toChar()) {
-            '*' -> {
-                viewModel.toggleMark()
-                return true
-            }
-        }
-
-        when (event.keyCode) {
-            KeyEvent.KEYCODE_DPAD_LEFT -> {
-                requireView().findViewById<MaterialButton>(R.id.show_previous).performClickIfEnabled()
-            }
-            KeyEvent.KEYCODE_DPAD_RIGHT -> {
-                requireView().findViewById<MaterialButton>(R.id.show_next).performClickIfEnabled()
-            }
-            KeyEvent.KEYCODE_R -> viewModel.replayAudios()
-            else -> return false
-        }
-        return true
+        return keyMap.onKeyDown(event)
     }
 
     companion object {
diff --git a/AnkiDroid/src/main/res/values/02-strings.xml b/AnkiDroid/src/main/res/values/02-strings.xml
index 71cdc03fb3c0..90625e9c20ad 100644
--- a/AnkiDroid/src/main/res/values/02-strings.xml
+++ b/AnkiDroid/src/main/res/values/02-strings.xml
@@ -377,11 +377,13 @@ opening the system text to speech settings fails">Failed to open text to speech
     </plurals>
 
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
 
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
 
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
diff --git a/AnkiDroid/src/main/res/values/10-preferences.xml b/AnkiDroid/src/main/res/values/10-preferences.xml
index 76f818b30f29..e809dc139bd1 100644
--- a/AnkiDroid/src/main/res/values/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values/10-preferences.xml
@@ -178,6 +178,10 @@
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
     <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen"
         >Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen"
+        >Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles 'Backside only' in the previews screen"
+        >Toggle backside only</string>
 
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
diff --git a/AnkiDroid/src/main/res/values/18-standard-models.xml b/AnkiDroid/src/main/res/values/18-standard-models.xml
index 9f4fe8d83be1..1053822f0720 100644
--- a/AnkiDroid/src/main/res/values/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values/18-standard-models.xml
@@ -3,5 +3,5 @@
 
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Front</string>
-    <string name="back_field_name" maxLength="28">Back</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Back</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values/preferences.xml b/AnkiDroid/src/main/res/values/preferences.xml
index 491e7dc6a165..3379eaf53b9b 100644
--- a/AnkiDroid/src/main/res/values/preferences.xml
+++ b/AnkiDroid/src/main/res/values/preferences.xml
@@ -140,6 +140,21 @@
     <string name="user_action_8_key">binding_USER_ACTION_8</string>
     <string name="user_action_9_key">binding_USER_ACTION_9</string>
     <string name="toggle_auto_advance_command_key">binding_TOGGLE_AUTO_ADVANCE</string>
+    <!-- Previewer controls -->
+    <string name="previewer_next_key">previewer_NEXT</string>
+    <string name="previewer_back_key">previewer_BACK</string>
+    <string name="previewer_mark_key">previewer_MARK</string>
+    <string name="previewer_edit_key">previewer_EDIT</string>
+    <string name="previewer_replay_audio_key">previewer_REPLAY_AUDIO</string>
+    <string name="previewer_backside_only_action_key">previewer_BACKSIDE_ONLY</string>
+    <string name="previewer_flag_red_key">previewer_TOGGLE_FLAG_RED</string>
+    <string name="previewer_flag_orange_key">previewer_TOGGLE_FLAG_ORANGE</string>
+    <string name="previewer_flag_green_key">previewer_TOGGLE_FLAG_GREEN</string>
+    <string name="previewer_flag_blue_key">previewer_TOGGLE_FLAG_BLUE</string>
+    <string name="previewer_flag_pink_key">previewer_TOGGLE_FLAG_PINK</string>
+    <string name="previewer_flag_turquoise_key">previewer_TOGGLE_FLAG_TURQUOISE</string>
+    <string name="previewer_flag_purple_key">previewer_TOGGLE_FLAG_PURPLE</string>
+    <string name="previewer_unset_flag_key">previewer_UNSET_FLAG</string>
     <!-- Accessibility -->
     <string name="pref_accessibility_screen_key">accessibilityScreen</string>
     <string name="card_zoom_preference">cardZoom</string>
diff --git a/AnkiDroid/src/main/res/xml/preferences_previewer_controls.xml b/AnkiDroid/src/main/res/xml/preferences_previewer_controls.xml
new file mode 100644
index 000000000000..40ab8f991655
--- /dev/null
+++ b/AnkiDroid/src/main/res/xml/preferences_previewer_controls.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen 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">
+
+
+    <com.ichi2.preferences.ControlPreference
+        android:key="@string/previewer_back_key"
+        android:title="@string/previewer_back"
+        android:icon="@drawable/ic_baseline_chevron_left_24"
+        />
+    <com.ichi2.preferences.ControlPreference
+        android:key="@string/previewer_next_key"
+        android:title="@string/previewer_next"
+        android:icon="@drawable/ic_baseline_chevron_right_24"
+        />
+    <com.ichi2.preferences.ControlPreference
+        android:key="@string/previewer_mark_key"
+        android:title="@string/menu_mark_note"
+        android:icon="@drawable/ic_star_border_white"
+        />
+    <com.ichi2.preferences.ControlPreference
+        android:key="@string/previewer_edit_key"
+        android:title="@string/cardeditor_title_edit_card"
+        android:icon="@drawable/ic_popup_menu_item_editor"
+        />
+    <com.ichi2.preferences.ControlPreference
+        android:key="@string/previewer_replay_audio_key"
+        android:title="@string/replay_audio"
+        android:icon="@drawable/ic_replay"
+        />
+    <com.ichi2.preferences.ControlPreference
+        android:key="@string/previewer_backside_only_action_key"
+        android:title="@string/toggle_backside_only"
+        android:icon="@drawable/ic_card_answer"
+        />
+
+    <PreferenceCategory android:title="@string/filter_by_flags">
+        <com.ichi2.preferences.ControlPreference
+            android:key="@string/previewer_flag_red_key"
+            android:title="@string/gesture_flag_red"
+            android:icon="@drawable/ic_flag_red"
+            />
+        <com.ichi2.preferences.ControlPreference
+            android:key="@string/previewer_flag_orange_key"
+            android:title="@string/gesture_flag_orange"
+            android:icon="@drawable/ic_flag_orange"
+            />
+        <com.ichi2.preferences.ControlPreference
+            android:key="@string/previewer_flag_green_key"
+            android:title="@string/gesture_flag_green"
+            android:icon="@drawable/ic_flag_green"
+            />
+        <com.ichi2.preferences.ControlPreference
+            android:key="@string/previewer_flag_blue_key"
+            android:title="@string/gesture_flag_blue"
+            android:icon="@drawable/ic_flag_blue"
+            />
+        <com.ichi2.preferences.ControlPreference
+            android:key="@string/previewer_flag_pink_key"
+            android:title="@string/gesture_flag_pink"
+            android:icon="@drawable/ic_flag_pink"
+            />
+        <com.ichi2.preferences.ControlPreference
+            android:key="@string/previewer_flag_turquoise_key"
+            android:title="@string/gesture_flag_turquoise"
+            android:icon="@drawable/ic_flag_turquoise"
+            />
+        <com.ichi2.preferences.ControlPreference
+            android:key="@string/previewer_flag_purple_key"
+            android:title="@string/gesture_flag_purple"
+            android:icon="@drawable/ic_flag_purple"
+            />
+        <com.ichi2.preferences.ControlPreference
+            android:key="@string/previewer_unset_flag_key"
+            android:title="@string/gesture_flag_remove"
+            android:icon="@drawable/ic_flag_transparent"
+            />
+    </PreferenceCategory>
+
+</androidx.preference.PreferenceScreen>
\ No newline at end of file

From df011c535f06639d39238effee66ba823528693d Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Sat, 5 Apr 2025 17:36:04 -0300
Subject: [PATCH 192/200] Revert "fix: axis picker layout is not displaying
 correctly in landscape mode"

This reverts commit 3d6ac8345bd08d5585ac6bee6b1b5a930cf74004.
---
 .../main/res/layout/dialog_axis_picker.xml    | 41 +++++++------------
 1 file changed, 15 insertions(+), 26 deletions(-)

diff --git a/AnkiDroid/src/main/res/layout/dialog_axis_picker.xml b/AnkiDroid/src/main/res/layout/dialog_axis_picker.xml
index c47dcfef0d59..c507afecac75 100644
--- a/AnkiDroid/src/main/res/layout/dialog_axis_picker.xml
+++ b/AnkiDroid/src/main/res/layout/dialog_axis_picker.xml
@@ -15,49 +15,38 @@
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <LinearLayout
+
+    <com.ichi2.ui.FixedTextView
+        android:id="@+id/axis_picker_selected_axis"
+        app:layout_constraintDimensionRatio="w,1:1"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:gravity="center"
-        android:orientation="vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintDimensionRatio="w,1:1"
-        app:layout_constraintWidth_max="320dp"
+        android:textSize="24sp"
+        android:textAlignment="center"
+        android:text="@string/axis_picker_move_joystick"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintTop_toTopOf="parent" />
 
-        <com.ichi2.ui.FixedTextView
-            android:id="@+id/axis_picker_selected_axis"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:text="@string/axis_picker_move_joystick"
-            android:textAlignment="center"
-            android:textSize="24sp" />
-
-    </LinearLayout>
 
     <ScrollView
         android:id="@+id/axis_picker_scrollview"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:visibility="gone"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
+        >
         <LinearLayout
             android:id="@+id/axis_picker_available_axes"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical" />
+            android:orientation="vertical"
+            android:layout_height="0dp"/>
     </ScrollView>
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 05e65188215e3136dc00e71bf61edf32961ba5cd Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Sat, 5 Apr 2025 17:39:12 -0300
Subject: [PATCH 193/200] fix: axis picker in landscape mode

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

diff --git a/AnkiDroid/src/main/res/layout/dialog_axis_picker.xml b/AnkiDroid/src/main/res/layout/dialog_axis_picker.xml
index c507afecac75..1319336f151e 100644
--- a/AnkiDroid/src/main/res/layout/dialog_axis_picker.xml
+++ b/AnkiDroid/src/main/res/layout/dialog_axis_picker.xml
@@ -22,7 +22,7 @@
 
     <com.ichi2.ui.FixedTextView
         android:id="@+id/axis_picker_selected_axis"
-        app:layout_constraintDimensionRatio="w,1:1"
+        app:layout_constraintDimensionRatio="1:1"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:gravity="center"
@@ -33,6 +33,7 @@
         android:focusableInTouchMode="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
 

From ce5434c07f3dcdf38185583d9865c7c8f3180bf6 Mon Sep 17 00:00:00 2001
From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
Date: Sat, 5 Apr 2025 21:34:02 -0300
Subject: [PATCH 194/200] fix: dismiss axis dialog after selecting

before, the dialog would be kept open

this also uses a dialog instead of a toast to alert about the binding being already used

that way, the user can see that the control is already being used before confirming
---
 .../ichi2/preferences/ControlPreference.kt    | 46 +++++++++++--------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/preferences/ControlPreference.kt b/AnkiDroid/src/main/java/com/ichi2/preferences/ControlPreference.kt
index 9608f81aec4d..bc06803b288a 100644
--- a/AnkiDroid/src/main/java/com/ichi2/preferences/ControlPreference.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/preferences/ControlPreference.kt
@@ -39,7 +39,6 @@ import com.ichi2.anki.preferences.requirePreference
 import com.ichi2.anki.reviewer.Binding
 import com.ichi2.anki.reviewer.MappableBinding
 import com.ichi2.anki.reviewer.MappableBinding.Companion.toPreferenceString
-import com.ichi2.anki.showThemedToast
 import com.ichi2.ui.AxisPicker
 import com.ichi2.ui.KeyPicker
 import com.ichi2.utils.create
@@ -87,17 +86,13 @@ open class ControlPreference :
     /** @return whether the binding is used in another action */
     open fun warnIfUsed(
         binding: Binding,
-        warningDisplay: WarningDisplay?,
+        warningDisplay: WarningDisplay,
     ): Boolean {
         val bindingPreference = getPreferenceAssignedTo(binding) ?: return false
         if (bindingPreference == this) return false
         val actionTitle = bindingPreference.title ?: ""
         val warning = context.getString(R.string.bindings_already_bound, actionTitle)
-        if (warningDisplay != null) {
-            warningDisplay.setWarning(warning)
-        } else {
-            showThemedToast(context, warning, true)
-        }
+        warningDisplay.setWarning(warning)
         return true
     }
 
@@ -155,27 +150,40 @@ open class ControlPreference :
     }
 
     fun showAddAxisDialog() {
-        val axisPicker =
-            AxisPicker.inflate(context).apply {
-                setBindingChangedListener { binding ->
-                    warnIfUsedOrClearWarning(binding, warningDisplay = null)
-                    onAxisSelected(binding)
+        val axisPicker = AxisPicker.inflate(context)
+        val dialog =
+            AlertDialog.Builder(context).create {
+                customView(view = axisPicker.rootLayout)
+                setTitle(title)
+                setIcon(icon)
+                negativeButton(R.string.dialog_cancel) { it.dismiss() }
+            }
+        axisPicker.setBindingChangedListener { binding ->
+            dialog.dismiss()
+            val bindingPref = getPreferenceAssignedTo(binding)
+            if (bindingPref != null && bindingPref != this) {
+                AlertDialog.Builder(context).show {
+                    val warning = context.getString(R.string.bindings_already_bound, bindingPref.title)
+                    setTitle(binding.toDisplayString(context))
+                    setMessage(warning)
+                    setPositiveButton(R.string.dialog_positive_replace) { _, _ ->
+                        onAxisSelected(binding)
+                    }
+                    setNegativeButton(R.string.dialog_cancel) { _, _ -> }
                 }
+            } else {
+                onAxisSelected(binding)
             }
-        AlertDialog.Builder(context).show {
-            customView(view = axisPicker.rootLayout)
-            setTitle(title)
-            setIcon(icon)
-            negativeButton(R.string.dialog_cancel) { it.dismiss() }
         }
+        dialog.show()
     }
 
     private fun warnIfUsedOrClearWarning(
         binding: Binding,
-        warningDisplay: WarningDisplay?,
+        warningDisplay: WarningDisplay,
     ) {
         if (!warnIfUsed(binding, warningDisplay)) {
-            warningDisplay?.clearWarning()
+            warningDisplay.clearWarning()
         }
     }
 

From f8462e89fab6039a723350b362f77b58fae46872 Mon Sep 17 00:00:00 2001
From: Tushar4059x <69426317+Tushar4059x@users.noreply.github.com>
Date: Wed, 9 Apr 2025 20:37:31 +0530
Subject: [PATCH 195/200] Fix background image visibility based on collection
 state #18073

---
 AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt b/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
index 823287d39fec..aa7a54bc306c 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
@@ -2258,6 +2258,9 @@ open class DeckPicker :
 
         // Check if default deck is the only available and there are no cards
         val isEmpty = tree.children.size == 1 && tree.children[0].did == 1L && collectionIsEmpty
+        // Hide the background when there are no cards to improve text readability.
+        val backgroundView = findViewById<ImageView>(R.id.background)
+        backgroundView.visibility = if (isEmpty) View.GONE else View.VISIBLE
         if (animationDisabled()) {
             deckPickerContent.visibility = if (isEmpty) View.GONE else View.VISIBLE
             noDecksPlaceholder.visibility = if (isEmpty) View.VISIBLE else View.GONE

From fce8376a2188f1a1b94896dcecc0de0fb57b79f8 Mon Sep 17 00:00:00 2001
From: Arthur Milchior <arthur@milchior.fr>
Date: Sun, 16 Mar 2025 23:36:15 +0100
Subject: [PATCH 196/200] NF: follow upstream implementation for
 Card.template()

https://github.com/ankitects/anki/blob/d52889f45c3f7999a45fd2dde367f79f3bc3bad4/pylib/anki/cards.py#L173-L179
---
 AnkiDroid/src/main/java/com/ichi2/libanki/Card.kt | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/Card.kt b/AnkiDroid/src/main/java/com/ichi2/libanki/Card.kt
index 20ee0a2cb122..ebf162f5d34c 100644
--- a/AnkiDroid/src/main/java/com/ichi2/libanki/Card.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/libanki/Card.kt
@@ -212,11 +212,12 @@ open class Card : Cloneable {
 
     @LibAnkiAlias("template")
     fun template(col: Collection): CardTemplate {
-        val m = noteType(col)
-        return if (m.isStd) {
-            m.tmpls[ord]
+        val notetype = noteType(col)
+        val templates = notetype.tmpls
+        return if (notetype.isStd) {
+            templates[ord]
         } else {
-            noteType(col).tmpls[0]
+            templates[0]
         }
     }
 

From db8d29b590ae80d893bf3f3a5ff76f98dbabd0d3 Mon Sep 17 00:00:00 2001
From: Arthur Milchior <arthur@milchior.fr>
Date: Sun, 16 Mar 2025 15:47:12 +0100
Subject: [PATCH 197/200] NF: rename `m` to `noteType` in DeckPicker

---
 AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt b/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
index aa7a54bc306c..a5c2de63091f 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
@@ -1684,13 +1684,13 @@ open class DeckPicker :
             if (previous < 20600123) {
                 Timber.i("Fixing font-family definition in templates")
                 try {
-                    val models = getColUnsafe.notetypes
-                    for (m in models.all()) {
-                        val css = m.getString("css")
+                    val notetypes = getColUnsafe.notetypes
+                    for (noteType in notetypes.all()) {
+                        val css = noteType.getString("css")
                         @Suppress("SpellCheckingInspection")
                         if (css.contains("font-familiy")) {
-                            m.put("css", css.replace("font-familiy", "font-family"))
-                            models.save(m)
+                            noteType.put("css", css.replace("font-familiy", "font-family"))
+                            notetypes.save(noteType)
                         }
                     }
                 } catch (e: JSONException) {

From 812c2380ff06c936ed9857726f1b32bbdd172b65 Mon Sep 17 00:00:00 2001
From: AnkiDroid Translations <ankidroid@ankidroid.org>
Date: Thu, 10 Apr 2025 16:20:51 +0000
Subject: [PATCH 198/200] Updated strings from Crowdin

---
 .../src/main/res/values-af/02-strings.xml     |   5 +-
 .../src/main/res/values-af/10-preferences.xml |   3 +
 .../main/res/values-af/18-standard-models.xml |   2 +-
 .../src/main/res/values-am/02-strings.xml     |   5 +-
 .../src/main/res/values-am/10-preferences.xml |   3 +
 .../main/res/values-am/18-standard-models.xml |   2 +-
 .../src/main/res/values-ar/02-strings.xml     |   5 +-
 .../src/main/res/values-ar/10-preferences.xml |   3 +
 .../main/res/values-ar/18-standard-models.xml |   2 +-
 .../src/main/res/values-az/02-strings.xml     |   5 +-
 .../src/main/res/values-az/10-preferences.xml |   3 +
 .../main/res/values-az/18-standard-models.xml |   2 +-
 .../src/main/res/values-be/02-strings.xml     |   5 +-
 .../src/main/res/values-be/10-preferences.xml |   3 +
 .../main/res/values-be/18-standard-models.xml |   2 +-
 .../src/main/res/values-bg/02-strings.xml     |   5 +-
 .../src/main/res/values-bg/10-preferences.xml |   3 +
 .../main/res/values-bg/18-standard-models.xml |   2 +-
 .../src/main/res/values-bn/02-strings.xml     |   5 +-
 .../src/main/res/values-bn/10-preferences.xml |   3 +
 .../main/res/values-bn/18-standard-models.xml |   2 +-
 .../src/main/res/values-ca/02-strings.xml     |   5 +-
 .../src/main/res/values-ca/10-preferences.xml |   3 +
 .../main/res/values-ca/18-standard-models.xml |   2 +-
 .../src/main/res/values-ckb/02-strings.xml    |   5 +-
 .../main/res/values-ckb/10-preferences.xml    |   3 +
 .../res/values-ckb/18-standard-models.xml     |   2 +-
 .../src/main/res/values-cs/02-strings.xml     |   5 +-
 .../src/main/res/values-cs/10-preferences.xml |   3 +
 .../main/res/values-cs/18-standard-models.xml |   2 +-
 .../src/main/res/values-da/02-strings.xml     |   5 +-
 .../src/main/res/values-da/10-preferences.xml |   3 +
 .../main/res/values-da/18-standard-models.xml |   2 +-
 .../src/main/res/values-de/02-strings.xml     |   5 +-
 .../src/main/res/values-de/10-preferences.xml |   3 +
 .../main/res/values-de/18-standard-models.xml |   2 +-
 .../src/main/res/values-el/02-strings.xml     |   5 +-
 .../src/main/res/values-el/10-preferences.xml |   3 +
 .../main/res/values-el/18-standard-models.xml |   2 +-
 .../src/main/res/values-eo/02-strings.xml     |   5 +-
 .../src/main/res/values-eo/10-preferences.xml |   3 +
 .../main/res/values-eo/18-standard-models.xml |   2 +-
 .../src/main/res/values-es-rAR/02-strings.xml |   5 +-
 .../main/res/values-es-rAR/10-preferences.xml |   3 +
 .../res/values-es-rAR/18-standard-models.xml  |   2 +-
 .../src/main/res/values-es-rES/02-strings.xml |   5 +-
 .../main/res/values-es-rES/10-preferences.xml |   3 +
 .../res/values-es-rES/18-standard-models.xml  |   2 +-
 .../src/main/res/values-et/02-strings.xml     |   5 +-
 .../src/main/res/values-et/10-preferences.xml |   3 +
 .../main/res/values-et/18-standard-models.xml |   2 +-
 .../src/main/res/values-eu/02-strings.xml     |   5 +-
 .../src/main/res/values-eu/10-preferences.xml |   3 +
 .../main/res/values-eu/18-standard-models.xml |   2 +-
 .../src/main/res/values-fa/02-strings.xml     |   5 +-
 .../src/main/res/values-fa/10-preferences.xml |   3 +
 .../main/res/values-fa/18-standard-models.xml |   2 +-
 .../src/main/res/values-fi/02-strings.xml     |   5 +-
 .../src/main/res/values-fi/10-preferences.xml |   3 +
 .../main/res/values-fi/18-standard-models.xml |   2 +-
 .../src/main/res/values-fil/02-strings.xml    |   5 +-
 .../main/res/values-fil/10-preferences.xml    |   3 +
 .../res/values-fil/18-standard-models.xml     |   2 +-
 .../src/main/res/values-fr/02-strings.xml     |   5 +-
 .../src/main/res/values-fr/10-preferences.xml |   3 +
 .../main/res/values-fr/18-standard-models.xml |   2 +-
 .../src/main/res/values-fy/02-strings.xml     |   5 +-
 .../src/main/res/values-fy/10-preferences.xml |   3 +
 .../main/res/values-fy/18-standard-models.xml |   2 +-
 .../src/main/res/values-ga/02-strings.xml     |   5 +-
 .../src/main/res/values-ga/10-preferences.xml |   3 +
 .../main/res/values-ga/18-standard-models.xml |   2 +-
 AnkiDroid/src/main/res/values-gl/01-core.xml  |  24 +--
 .../src/main/res/values-gl/02-strings.xml     | 169 +++++++++---------
 .../src/main/res/values-gl/10-preferences.xml |   3 +
 .../main/res/values-gl/18-standard-models.xml |   2 +-
 .../src/main/res/values-got/02-strings.xml    |   5 +-
 .../main/res/values-got/10-preferences.xml    |   3 +
 .../res/values-got/18-standard-models.xml     |   2 +-
 .../src/main/res/values-gu/02-strings.xml     |   5 +-
 .../src/main/res/values-gu/10-preferences.xml |   3 +
 .../main/res/values-gu/18-standard-models.xml |   2 +-
 .../src/main/res/values-heb/02-strings.xml    |   5 +-
 .../main/res/values-heb/10-preferences.xml    |   3 +
 .../res/values-heb/18-standard-models.xml     |   2 +-
 .../src/main/res/values-hi/02-strings.xml     |   5 +-
 .../src/main/res/values-hi/10-preferences.xml |   3 +
 .../main/res/values-hi/18-standard-models.xml |   2 +-
 .../src/main/res/values-hr/02-strings.xml     |   5 +-
 .../src/main/res/values-hr/10-preferences.xml |   3 +
 .../main/res/values-hr/18-standard-models.xml |   2 +-
 .../src/main/res/values-hu/02-strings.xml     |   5 +-
 .../src/main/res/values-hu/10-preferences.xml |   3 +
 .../main/res/values-hu/18-standard-models.xml |   2 +-
 .../src/main/res/values-hy/02-strings.xml     |   5 +-
 .../src/main/res/values-hy/10-preferences.xml |   3 +
 .../main/res/values-hy/18-standard-models.xml |   2 +-
 .../src/main/res/values-ind/02-strings.xml    |   9 +-
 .../main/res/values-ind/10-preferences.xml    |   3 +
 .../res/values-ind/18-standard-models.xml     |   2 +-
 .../src/main/res/values-is/02-strings.xml     |   5 +-
 .../src/main/res/values-is/10-preferences.xml |   3 +
 .../main/res/values-is/18-standard-models.xml |   2 +-
 .../src/main/res/values-it/02-strings.xml     |   5 +-
 .../src/main/res/values-it/10-preferences.xml |   3 +
 .../main/res/values-it/18-standard-models.xml |   2 +-
 .../src/main/res/values-iw/02-strings.xml     |   5 +-
 .../src/main/res/values-iw/10-preferences.xml |   3 +
 .../main/res/values-iw/18-standard-models.xml |   2 +-
 .../src/main/res/values-ja/02-strings.xml     |   5 +-
 .../src/main/res/values-ja/10-preferences.xml |   3 +
 .../main/res/values-ja/18-standard-models.xml |   2 +-
 .../src/main/res/values-jv/02-strings.xml     |   5 +-
 .../src/main/res/values-jv/10-preferences.xml |   3 +
 .../main/res/values-jv/18-standard-models.xml |   2 +-
 .../src/main/res/values-ka/02-strings.xml     |   5 +-
 .../src/main/res/values-ka/10-preferences.xml |   3 +
 .../main/res/values-ka/18-standard-models.xml |   2 +-
 .../src/main/res/values-kk/02-strings.xml     |   5 +-
 .../src/main/res/values-kk/10-preferences.xml |   3 +
 .../main/res/values-kk/18-standard-models.xml |   2 +-
 .../src/main/res/values-km/02-strings.xml     |   5 +-
 .../src/main/res/values-km/10-preferences.xml |   3 +
 .../main/res/values-km/18-standard-models.xml |   2 +-
 .../src/main/res/values-kn/02-strings.xml     |   5 +-
 .../src/main/res/values-kn/10-preferences.xml |   3 +
 .../main/res/values-kn/18-standard-models.xml |   2 +-
 .../src/main/res/values-ko/02-strings.xml     |   5 +-
 .../src/main/res/values-ko/10-preferences.xml |   3 +
 .../main/res/values-ko/18-standard-models.xml |   2 +-
 .../src/main/res/values-ku/02-strings.xml     |   5 +-
 .../src/main/res/values-ku/10-preferences.xml |   3 +
 .../main/res/values-ku/18-standard-models.xml |   2 +-
 .../src/main/res/values-ky/02-strings.xml     |   5 +-
 .../src/main/res/values-ky/10-preferences.xml |   3 +
 .../main/res/values-ky/18-standard-models.xml |   2 +-
 .../src/main/res/values-lt/02-strings.xml     |   5 +-
 .../src/main/res/values-lt/10-preferences.xml |   3 +
 .../main/res/values-lt/18-standard-models.xml |   2 +-
 .../src/main/res/values-lv/02-strings.xml     |   5 +-
 .../src/main/res/values-lv/10-preferences.xml |   3 +
 .../main/res/values-lv/18-standard-models.xml |   2 +-
 .../src/main/res/values-mk/02-strings.xml     |   5 +-
 .../src/main/res/values-mk/10-preferences.xml |   3 +
 .../main/res/values-mk/18-standard-models.xml |   2 +-
 .../src/main/res/values-ml/02-strings.xml     |   5 +-
 .../src/main/res/values-ml/10-preferences.xml |   3 +
 .../main/res/values-ml/18-standard-models.xml |   2 +-
 .../src/main/res/values-mn/02-strings.xml     |   5 +-
 .../src/main/res/values-mn/10-preferences.xml |   3 +
 .../main/res/values-mn/18-standard-models.xml |   2 +-
 .../src/main/res/values-mr/02-strings.xml     |   5 +-
 .../src/main/res/values-mr/10-preferences.xml |   3 +
 .../main/res/values-mr/18-standard-models.xml |   2 +-
 .../src/main/res/values-ms/02-strings.xml     |   5 +-
 .../src/main/res/values-ms/10-preferences.xml |   3 +
 .../main/res/values-ms/18-standard-models.xml |   2 +-
 .../src/main/res/values-my/02-strings.xml     |   5 +-
 .../src/main/res/values-my/10-preferences.xml |   3 +
 .../main/res/values-my/18-standard-models.xml |   2 +-
 .../src/main/res/values-nl/02-strings.xml     |   5 +-
 .../src/main/res/values-nl/10-preferences.xml |   3 +
 .../main/res/values-nl/18-standard-models.xml |   2 +-
 .../src/main/res/values-nn/02-strings.xml     |   5 +-
 .../src/main/res/values-nn/10-preferences.xml |   3 +
 .../main/res/values-nn/18-standard-models.xml |   2 +-
 .../src/main/res/values-no/02-strings.xml     |   5 +-
 .../src/main/res/values-no/10-preferences.xml |   3 +
 .../main/res/values-no/18-standard-models.xml |   2 +-
 .../src/main/res/values-or/02-strings.xml     |   5 +-
 .../src/main/res/values-or/10-preferences.xml |   3 +
 .../main/res/values-or/18-standard-models.xml |   2 +-
 .../src/main/res/values-pa/02-strings.xml     |   5 +-
 .../src/main/res/values-pa/10-preferences.xml |   3 +
 .../main/res/values-pa/18-standard-models.xml |   2 +-
 .../src/main/res/values-pl/02-strings.xml     |   5 +-
 .../src/main/res/values-pl/10-preferences.xml |   3 +
 .../main/res/values-pl/18-standard-models.xml |   2 +-
 .../src/main/res/values-pt-rBR/02-strings.xml |   5 +-
 .../main/res/values-pt-rBR/10-preferences.xml |   3 +
 .../res/values-pt-rBR/18-standard-models.xml  |   2 +-
 .../src/main/res/values-pt-rPT/02-strings.xml |   5 +-
 .../main/res/values-pt-rPT/10-preferences.xml |   3 +
 .../res/values-pt-rPT/18-standard-models.xml  |   2 +-
 .../src/main/res/values-ro/02-strings.xml     |   5 +-
 .../src/main/res/values-ro/10-preferences.xml |   3 +
 .../main/res/values-ro/18-standard-models.xml |   2 +-
 .../src/main/res/values-ru/02-strings.xml     |   5 +-
 .../src/main/res/values-ru/10-preferences.xml |   3 +
 .../main/res/values-ru/18-standard-models.xml |   2 +-
 .../src/main/res/values-sat/02-strings.xml    |   5 +-
 .../main/res/values-sat/10-preferences.xml    |   3 +
 .../res/values-sat/18-standard-models.xml     |   2 +-
 .../src/main/res/values-sc/02-strings.xml     |   5 +-
 .../src/main/res/values-sc/10-preferences.xml |   3 +
 .../main/res/values-sc/18-standard-models.xml |   2 +-
 .../src/main/res/values-sk/02-strings.xml     |   5 +-
 .../src/main/res/values-sk/10-preferences.xml |   3 +
 .../main/res/values-sk/18-standard-models.xml |   2 +-
 .../src/main/res/values-sl/02-strings.xml     |   5 +-
 .../src/main/res/values-sl/10-preferences.xml |   3 +
 .../main/res/values-sl/18-standard-models.xml |   2 +-
 .../src/main/res/values-sq/02-strings.xml     |   5 +-
 .../src/main/res/values-sq/10-preferences.xml |   3 +
 .../main/res/values-sq/18-standard-models.xml |   2 +-
 .../src/main/res/values-sr/02-strings.xml     |   5 +-
 .../src/main/res/values-sr/10-preferences.xml |   3 +
 .../main/res/values-sr/18-standard-models.xml |   2 +-
 .../src/main/res/values-ss/02-strings.xml     |   5 +-
 .../src/main/res/values-ss/10-preferences.xml |   3 +
 .../main/res/values-ss/18-standard-models.xml |   2 +-
 .../src/main/res/values-sv/02-strings.xml     |   5 +-
 .../src/main/res/values-sv/10-preferences.xml |   3 +
 .../main/res/values-sv/18-standard-models.xml |   2 +-
 .../src/main/res/values-sw/02-strings.xml     |   5 +-
 .../src/main/res/values-sw/10-preferences.xml |   3 +
 .../main/res/values-sw/18-standard-models.xml |   2 +-
 .../src/main/res/values-ta/02-strings.xml     |   5 +-
 .../src/main/res/values-ta/10-preferences.xml |   3 +
 .../main/res/values-ta/18-standard-models.xml |   2 +-
 .../src/main/res/values-te/02-strings.xml     |   5 +-
 .../src/main/res/values-te/10-preferences.xml |   3 +
 .../main/res/values-te/18-standard-models.xml |   2 +-
 .../src/main/res/values-tg/02-strings.xml     |   5 +-
 .../src/main/res/values-tg/10-preferences.xml |   3 +
 .../main/res/values-tg/18-standard-models.xml |   2 +-
 .../src/main/res/values-tgl/02-strings.xml    |   5 +-
 .../main/res/values-tgl/10-preferences.xml    |   3 +
 .../res/values-tgl/18-standard-models.xml     |   2 +-
 .../src/main/res/values-th/02-strings.xml     |   5 +-
 .../src/main/res/values-th/10-preferences.xml |   3 +
 .../main/res/values-th/18-standard-models.xml |   2 +-
 .../src/main/res/values-ti/02-strings.xml     |   5 +-
 .../src/main/res/values-ti/10-preferences.xml |   3 +
 .../main/res/values-ti/18-standard-models.xml |   2 +-
 .../src/main/res/values-tn/02-strings.xml     |   5 +-
 .../src/main/res/values-tn/10-preferences.xml |   3 +
 .../main/res/values-tn/18-standard-models.xml |   2 +-
 .../src/main/res/values-tr/02-strings.xml     |   7 +-
 .../src/main/res/values-tr/03-dialogs.xml     |   2 +-
 .../src/main/res/values-tr/10-preferences.xml |   5 +-
 .../main/res/values-tr/18-standard-models.xml |   2 +-
 .../src/main/res/values-ts/02-strings.xml     |   5 +-
 .../src/main/res/values-ts/10-preferences.xml |   3 +
 .../main/res/values-ts/18-standard-models.xml |   2 +-
 .../src/main/res/values-tt/02-strings.xml     |   5 +-
 .../src/main/res/values-tt/10-preferences.xml |   3 +
 .../main/res/values-tt/18-standard-models.xml |   2 +-
 .../src/main/res/values-ug/02-strings.xml     |   5 +-
 .../src/main/res/values-ug/10-preferences.xml |   3 +
 .../main/res/values-ug/18-standard-models.xml |   2 +-
 .../src/main/res/values-uk/02-strings.xml     |   5 +-
 .../src/main/res/values-uk/10-preferences.xml |   3 +
 .../main/res/values-uk/18-standard-models.xml |   2 +-
 .../src/main/res/values-ur/02-strings.xml     |   5 +-
 .../src/main/res/values-ur/10-preferences.xml |   3 +
 .../main/res/values-ur/18-standard-models.xml |   2 +-
 .../src/main/res/values-uz/02-strings.xml     |   5 +-
 .../src/main/res/values-uz/10-preferences.xml |   3 +
 .../main/res/values-uz/18-standard-models.xml |   2 +-
 .../src/main/res/values-ve/02-strings.xml     |   5 +-
 .../src/main/res/values-ve/10-preferences.xml |   3 +
 .../main/res/values-ve/18-standard-models.xml |   2 +-
 .../src/main/res/values-vi/02-strings.xml     |   5 +-
 .../src/main/res/values-vi/10-preferences.xml |   3 +
 .../main/res/values-vi/18-standard-models.xml |   2 +-
 .../src/main/res/values-wo/02-strings.xml     |   5 +-
 .../src/main/res/values-wo/10-preferences.xml |   3 +
 .../main/res/values-wo/18-standard-models.xml |   2 +-
 .../src/main/res/values-xh/02-strings.xml     |   5 +-
 .../src/main/res/values-xh/10-preferences.xml |   3 +
 .../main/res/values-xh/18-standard-models.xml |   2 +-
 .../src/main/res/values-yue/02-strings.xml    |   5 +-
 .../main/res/values-yue/10-preferences.xml    |   3 +
 .../res/values-yue/18-standard-models.xml     |   2 +-
 .../src/main/res/values-zh-rCN/02-strings.xml |   5 +-
 .../main/res/values-zh-rCN/10-preferences.xml |   3 +
 .../res/values-zh-rCN/18-standard-models.xml  |   2 +-
 .../src/main/res/values-zh-rTW/02-strings.xml |   5 +-
 .../main/res/values-zh-rTW/10-preferences.xml |   3 +
 .../res/values-zh-rTW/18-standard-models.xml  |   2 +-
 .../src/main/res/values-zu/02-strings.xml     |   5 +-
 .../src/main/res/values-zu/10-preferences.xml |   3 +
 .../main/res/values-zu/18-standard-models.xml |   2 +-
 284 files changed, 851 insertions(+), 287 deletions(-)

diff --git a/AnkiDroid/src/main/res/values-af/02-strings.xml b/AnkiDroid/src/main/res/values-af/02-strings.xml
index ed329ea90e1f..c82314d39322 100644
--- a/AnkiDroid/src/main/res/values-af/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-af/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (van \"%2$s\")</string>
     <string name="confirm_map_cards_to_nothing">Enige kaarte wat aan niks gekoppel is nie, sal verwyder word. As \'n nota geen oorblywende kaarte het nie, sal dit verlore gaan. Is jy seker jy wil voortgaan?</string>
     <string name="missing_note_type">Geen nota tipe gevind nie</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Tydkas bereik</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d kaarte onbegrawe</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Herposisioneer</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Opname</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Speel</string>
-    <string name="next_recording">Volgende</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Volgende</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Kan Nie KaartTipe Verwyder Nie</string>
     <string name="orphan_note_message">Die verwydering van hierdie kaarttipe sal sommige notas sonder enige kaarte laat.</string>
diff --git a/AnkiDroid/src/main/res/values-af/10-preferences.xml b/AnkiDroid/src/main/res/values-af/10-preferences.xml
index 485f332f3219..dbf8778bbce4 100644
--- a/AnkiDroid/src/main/res/values-af/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-af/10-preferences.xml
@@ -199,6 +199,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-af/18-standard-models.xml b/AnkiDroid/src/main/res/values-af/18-standard-models.xml
index 59d64739d93d..a43ef550990e 100644
--- a/AnkiDroid/src/main/res/values-af/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-af/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Front</string>
-    <string name="back_field_name" maxLength="28">Back</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Back</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-am/02-strings.xml b/AnkiDroid/src/main/res/values-am/02-strings.xml
index 5e4fab69ad3c..fec7efe184db 100644
--- a/AnkiDroid/src/main/res/values-am/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-am/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (from “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Any cards mapped to nothing will be deleted. If a note has no remaining cards, it will be lost. Are you sure you want to continue?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-am/10-preferences.xml b/AnkiDroid/src/main/res/values-am/10-preferences.xml
index 4f678e027e22..5477b7010c96 100644
--- a/AnkiDroid/src/main/res/values-am/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-am/10-preferences.xml
@@ -199,6 +199,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-am/18-standard-models.xml b/AnkiDroid/src/main/res/values-am/18-standard-models.xml
index ad75b58c4d81..ec8b031604a4 100644
--- a/AnkiDroid/src/main/res/values-am/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-am/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">ፊት ለፊት</string>
-    <string name="back_field_name" maxLength="28">ጀርባ</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">ጀርባ</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ar/02-strings.xml b/AnkiDroid/src/main/res/values-ar/02-strings.xml
index 2a9530aeca9f..317cdbc8744f 100644
--- a/AnkiDroid/src/main/res/values-ar/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ar/02-strings.xml
@@ -108,6 +108,7 @@
     <string name="field_remapping">%1$s (من “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">البطاقات غير المُوزعة ستُحذف. إذا لم يتبقَّ لملحوظة أي بطاقة، ستُحذف. هل أنت متأكد من الاستمرار؟</string>
     <string name="missing_note_type">لا يوجد أي نوع ملحوظة</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">انتهت مهلة تقسيم المهام</string>
     <plurals name="timebox_reached">
@@ -348,10 +349,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">تغيير الموضع</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">تسجيل</string>
     <string name="stop_recording">إيقاف</string>
     <string name="play_recording">تشغيل</string>
-    <string name="next_recording">التالي</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">التالي</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">لا يمكنك حذف البطاقات من هذا النوع</string>
     <string name="orphan_note_message">حذف هذا النوع من البطاقات سيترك بعض الملحوظات بدون أي بطاقة.</string>
diff --git a/AnkiDroid/src/main/res/values-ar/10-preferences.xml b/AnkiDroid/src/main/res/values-ar/10-preferences.xml
index 6f50f09209eb..4f34b2c5f4c7 100644
--- a/AnkiDroid/src/main/res/values-ar/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ar/10-preferences.xml
@@ -206,6 +206,9 @@
     <string name="reset">إعادة ضبط</string>
     <string name="thirdparty_apps_title" maxLength="41">تطبيقات الطرف الثالث التي تستخدم واجهة البرمجة</string>
     <string name="thirdparty_apps_summary">اطلع على قائمة تطبيقات تستخدم واجهة برمجة أنكيدرويد مثل القواميس، والأدوات.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">شاشة المراجعة</string>
     <string name="show_deck_title" maxLength="41">إظهار عنوان المجموعة</string>
diff --git a/AnkiDroid/src/main/res/values-ar/18-standard-models.xml b/AnkiDroid/src/main/res/values-ar/18-standard-models.xml
index 37bb5db8c284..c8a77f06c4d5 100644
--- a/AnkiDroid/src/main/res/values-ar/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-ar/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">الأمامي</string>
-    <string name="back_field_name" maxLength="28">خلف</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">خلف</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-az/02-strings.xml b/AnkiDroid/src/main/res/values-az/02-strings.xml
index ed46a5b9997a..d09b23d73e54 100644
--- a/AnkiDroid/src/main/res/values-az/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-az/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (from “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Any cards mapped to nothing will be deleted. If a note has no remaining cards, it will be lost. Are you sure you want to continue?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-az/10-preferences.xml b/AnkiDroid/src/main/res/values-az/10-preferences.xml
index c242fb1aab4e..6c622c97d45e 100644
--- a/AnkiDroid/src/main/res/values-az/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-az/10-preferences.xml
@@ -199,6 +199,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-az/18-standard-models.xml b/AnkiDroid/src/main/res/values-az/18-standard-models.xml
index 59d64739d93d..a43ef550990e 100644
--- a/AnkiDroid/src/main/res/values-az/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-az/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Front</string>
-    <string name="back_field_name" maxLength="28">Back</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Back</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-be/02-strings.xml b/AnkiDroid/src/main/res/values-be/02-strings.xml
index 827127840cb0..002af0706415 100644
--- a/AnkiDroid/src/main/res/values-be/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-be/02-strings.xml
@@ -106,6 +106,7 @@
     <string name="field_remapping">%1$s (з “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Не супастаўленыя карткі будуць выдалены. Калі нататка не мае ніводнай карткі, то яна будзе згублена. Вы сапраўды хочаце працягнуць?</string>
     <string name="missing_note_type">Такі тып нататкі не знойдзены</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Дасягнутыя абмежаванні па часе</string>
     <plurals name="timebox_reached">
@@ -336,10 +337,12 @@
         <item quantity="other">%d картак вернуты</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Перамясціць</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Запіс</string>
     <string name="stop_recording">Стоп</string>
     <string name="play_recording">Прайграць</string>
-    <string name="next_recording">Далей</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Далей</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Немагчыма выдаліць тып карткі</string>
     <string name="orphan_note_message">Выдаленне гэтага тыпу карткі пакіне некаторыя нататкі без ніводнай карткі.</string>
diff --git a/AnkiDroid/src/main/res/values-be/10-preferences.xml b/AnkiDroid/src/main/res/values-be/10-preferences.xml
index 96cbbc9a55e1..ffc3a129b9c0 100644
--- a/AnkiDroid/src/main/res/values-be/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-be/10-preferences.xml
@@ -203,6 +203,9 @@
     <string name="reset">Скінуць</string>
     <string name="thirdparty_apps_title" maxLength="41">Праграмныя API іншых распрацоўшчыкаў</string>
     <string name="thirdparty_apps_summary">Паглядзець спіс праграм, якія выкарыстоўваць API AnkiDroid (слоўнікі, службовыя праграмы і г.д.).</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Паўтарэнне</string>
     <string name="show_deck_title" maxLength="41">Паказваць назву калоды</string>
diff --git a/AnkiDroid/src/main/res/values-be/18-standard-models.xml b/AnkiDroid/src/main/res/values-be/18-standard-models.xml
index 7c5daf3b210d..4f5a4a33cac3 100644
--- a/AnkiDroid/src/main/res/values-be/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-be/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Пярэдні бок</string>
-    <string name="back_field_name" maxLength="28">Задні бок</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Задні бок</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-bg/02-strings.xml b/AnkiDroid/src/main/res/values-bg/02-strings.xml
index 90e8e44831c2..4ed1da79fbf5 100644
--- a/AnkiDroid/src/main/res/values-bg/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-bg/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (от \"%2$s\")</string>
     <string name="confirm_map_cards_to_nothing">Несъпоставените карти ще бъдат отстранени. Бележки, останали без карти ще бъдат загубени. Продължавате ли?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Лимит на време е достигнат</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-bg/10-preferences.xml b/AnkiDroid/src/main/res/values-bg/10-preferences.xml
index 41681d067287..ae4b9514da89 100644
--- a/AnkiDroid/src/main/res/values-bg/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-bg/10-preferences.xml
@@ -198,6 +198,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-bg/18-standard-models.xml b/AnkiDroid/src/main/res/values-bg/18-standard-models.xml
index 4b510475e3ea..c45499b86dee 100644
--- a/AnkiDroid/src/main/res/values-bg/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-bg/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Отпред</string>
-    <string name="back_field_name" maxLength="28">Отзад</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Отзад</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-bn/02-strings.xml b/AnkiDroid/src/main/res/values-bn/02-strings.xml
index b48a4c597971..673f41d056d0 100644
--- a/AnkiDroid/src/main/res/values-bn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-bn/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (“%2$s” থেকে)</string>
     <string name="confirm_map_cards_to_nothing">ম্যাপিং বিহীন কার্ডগুলি মুছে ফেলা হবে। কোনও নোটে যদি আর কার্ড বাকি না থাকে তবে সেটাও মুছে যাবে। আপনি কি চালিয়ে যেতে চান?</string>
     <string name="missing_note_type">নোট টাইপ খুঁজে পাওয়া যাই নি</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">সময়সীমা অতিক্রান্ত হয়েছে</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d কার্ড আনবুরি করা হয়েছে</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">রিপজিশন</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">রেকর্ড</string>
     <string name="stop_recording">রেকর্ড</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">পরবর্তী</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">পরবর্তী</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">কার্ডের ধরন মুছে ফেলা যাবে না</string>
     <string name="orphan_note_message">এই কার্ডের ধরন মুছে ফেলার ফলে কোনো কার্ড ছাড়াই কিছু নোট চলে যাবে।</string>
diff --git a/AnkiDroid/src/main/res/values-bn/10-preferences.xml b/AnkiDroid/src/main/res/values-bn/10-preferences.xml
index a9536c1cd3e2..606783c965a2 100644
--- a/AnkiDroid/src/main/res/values-bn/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-bn/10-preferences.xml
@@ -199,6 +199,9 @@
     <string name="reset">রিসেট করুন</string>
     <string name="thirdparty_apps_title" maxLength="41">তৃতীয় পক্ষের API অ্যাপস</string>
     <string name="thirdparty_apps_summary">Android API ব্যবহার করে এমন অ্যাপ্লিকেশনগুলির একটি তালিকা দেখুন, যেমন অভিধান, ইউটিলিটিগুলি৷</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">রিভিউয়ার</string>
     <string name="show_deck_title" maxLength="41">ডেক শিরোনাম দেখান</string>
diff --git a/AnkiDroid/src/main/res/values-bn/18-standard-models.xml b/AnkiDroid/src/main/res/values-bn/18-standard-models.xml
index 9723f5215078..5a1bcc58bb61 100644
--- a/AnkiDroid/src/main/res/values-bn/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-bn/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">সামনে</string>
-    <string name="back_field_name" maxLength="28">পিছনে</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">পিছনে</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ca/02-strings.xml b/AnkiDroid/src/main/res/values-ca/02-strings.xml
index f05def6ae8de..2404977e1c1c 100644
--- a/AnkiDroid/src/main/res/values-ca/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ca/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (de \"%2$s\")</string>
     <string name="confirm_map_cards_to_nothing">S\'esborrarà qualsevol carta assignada a res. Si una anotació té cap carta restant, serà perduda. Esteu segur que voleu continuar?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Límit de temps assolit</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposició</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Enregistra</string>
     <string name="stop_recording">Atura</string>
     <string name="play_recording">Reprodueix</string>
-    <string name="next_recording">Següent</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Següent</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-ca/10-preferences.xml b/AnkiDroid/src/main/res/values-ca/10-preferences.xml
index 7a6493e9d11b..a1c5b632e4bd 100644
--- a/AnkiDroid/src/main/res/values-ca/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ca/10-preferences.xml
@@ -198,6 +198,9 @@
     <string name="reset">Reinicia</string>
     <string name="thirdparty_apps_title" maxLength="41">Aplicacions de terceres parts</string>
     <string name="thirdparty_apps_summary">Consulteu una llista d\'aplicacions que fan ús de l\'API AnkiDroid, com ara diccionaris i utilitats.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Revisor</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-ca/18-standard-models.xml b/AnkiDroid/src/main/res/values-ca/18-standard-models.xml
index 2903e714b3fe..887b69aa4ef7 100644
--- a/AnkiDroid/src/main/res/values-ca/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-ca/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Davant</string>
-    <string name="back_field_name" maxLength="28">Darrere</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Darrere</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ckb/02-strings.xml b/AnkiDroid/src/main/res/values-ckb/02-strings.xml
index d88b97498732..9630d57b7f88 100644
--- a/AnkiDroid/src/main/res/values-ckb/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ckb/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (from “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Any cards mapped to nothing will be deleted. If a note has no remaining cards, it will be lost. Are you sure you want to continue?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-ckb/10-preferences.xml b/AnkiDroid/src/main/res/values-ckb/10-preferences.xml
index 2067dfab39b5..279bdccda4aa 100644
--- a/AnkiDroid/src/main/res/values-ckb/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ckb/10-preferences.xml
@@ -199,6 +199,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-ckb/18-standard-models.xml b/AnkiDroid/src/main/res/values-ckb/18-standard-models.xml
index f8024a73f60e..7f3788a2c599 100644
--- a/AnkiDroid/src/main/res/values-ckb/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-ckb/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">پێشەوە</string>
-    <string name="back_field_name" maxLength="28">پشتەوە</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">پشتەوە</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-cs/02-strings.xml b/AnkiDroid/src/main/res/values-cs/02-strings.xml
index e1b6981a0518..ef2a472e3111 100644
--- a/AnkiDroid/src/main/res/values-cs/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-cs/02-strings.xml
@@ -106,6 +106,7 @@
     <string name="field_remapping">%1$s (z \'%2$s\')</string>
     <string name="confirm_map_cards_to_nothing">Karty mapované na prázdný cíl budou odstraněny. Nezbývají-li už v poznámce žádné karty, bude poznámka ztracena. Opravdu chcete pokračovat?</string>
     <string name="missing_note_type">Nenalezen žádný typ poznámky</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Časové omezení dosaženo</string>
     <plurals name="timebox_reached">
@@ -336,10 +337,12 @@
         <item quantity="other">Zrušeno přeskočení %d karet</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Přemístit</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Nahrát</string>
     <string name="stop_recording">Zastavit</string>
     <string name="play_recording">Přehrát</string>
-    <string name="next_recording">Další</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Další</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Typ karty nelze odstranit</string>
     <string name="orphan_note_message">Smazání tohoto typu karty zanechá některé poznámky bez jakýchkoliv karet.</string>
diff --git a/AnkiDroid/src/main/res/values-cs/10-preferences.xml b/AnkiDroid/src/main/res/values-cs/10-preferences.xml
index 94da29905f15..be402370b0cd 100644
--- a/AnkiDroid/src/main/res/values-cs/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-cs/10-preferences.xml
@@ -202,6 +202,9 @@
     <string name="reset">Obnovit</string>
     <string name="thirdparty_apps_title" maxLength="41">API aplikace třetích stran</string>
     <string name="thirdparty_apps_summary">Zobrazit seznam aplikací, které používají AnkiDroid API, jako jsou slovníky, nástroje</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Opakování karet</string>
     <string name="show_deck_title" maxLength="41">Zobrazit název balíčku</string>
diff --git a/AnkiDroid/src/main/res/values-cs/18-standard-models.xml b/AnkiDroid/src/main/res/values-cs/18-standard-models.xml
index b53a127b1e9e..50c2f9a6e6c0 100644
--- a/AnkiDroid/src/main/res/values-cs/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-cs/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Líc</string>
-    <string name="back_field_name" maxLength="28">Rub</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Rub</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-da/02-strings.xml b/AnkiDroid/src/main/res/values-da/02-strings.xml
index c135d8e2eb93..fedf69198742 100644
--- a/AnkiDroid/src/main/res/values-da/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-da/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (fra “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Any cards mapped to nothing will be deleted. If a note has no remaining cards, it will be lost. Are you sure you want to continue?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-da/10-preferences.xml b/AnkiDroid/src/main/res/values-da/10-preferences.xml
index b881c76aacc7..bec28d98c3a7 100644
--- a/AnkiDroid/src/main/res/values-da/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-da/10-preferences.xml
@@ -199,6 +199,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-da/18-standard-models.xml b/AnkiDroid/src/main/res/values-da/18-standard-models.xml
index 59d64739d93d..a43ef550990e 100644
--- a/AnkiDroid/src/main/res/values-da/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-da/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Front</string>
-    <string name="back_field_name" maxLength="28">Back</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Back</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-de/02-strings.xml b/AnkiDroid/src/main/res/values-de/02-strings.xml
index 69edeb73b954..757d6bb116d3 100644
--- a/AnkiDroid/src/main/res/values-de/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-de/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (von »%2$s«)</string>
     <string name="confirm_map_cards_to_nothing">Alle leeren Karten werden gelöscht. Sind sämtliche Karten einer Notiz gelöscht, wird diese ebenfalls entfernt. Fortfahren?</string>
     <string name="missing_note_type">Kein Notiztyp gefunden</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Zeitlimit erreicht</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d Karten nicht mehr aufgeschoben</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Position ändern</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Datensatz</string>
     <string name="stop_recording">Stopp</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Weiter</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Weiter</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Kartentyp kann nicht gelöscht werden</string>
     <string name="orphan_note_message">Das Löschen dieses Kartentyps wird einige Notizen ohne Karten hinterlassen.</string>
diff --git a/AnkiDroid/src/main/res/values-de/10-preferences.xml b/AnkiDroid/src/main/res/values-de/10-preferences.xml
index 292a681c5210..097521551fa6 100644
--- a/AnkiDroid/src/main/res/values-de/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-de/10-preferences.xml
@@ -198,6 +198,9 @@
     <string name="reset">Zurücksetzen</string>
     <string name="thirdparty_apps_title" maxLength="41">API-Apps von Drittanbietern</string>
     <string name="thirdparty_apps_summary">Eine Liste von Anwendungen anzeigen, die die AnkiDroid-API verwenden (z. B. Wörterbücher, Werkzeuge etc.)</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Feedback-Geber</string>
     <string name="show_deck_title" maxLength="41">Stapeltitel anzeigen</string>
diff --git a/AnkiDroid/src/main/res/values-de/18-standard-models.xml b/AnkiDroid/src/main/res/values-de/18-standard-models.xml
index 22aea08a176a..f3f461822e30 100644
--- a/AnkiDroid/src/main/res/values-de/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-de/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Vorderseite</string>
-    <string name="back_field_name" maxLength="28">Rückseite</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Rückseite</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-el/02-strings.xml b/AnkiDroid/src/main/res/values-el/02-strings.xml
index d168209a8220..d8c084074ce4 100644
--- a/AnkiDroid/src/main/res/values-el/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-el/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (από “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Kάρτες χωρίς αντιστοίχιση θα διαγραφούν. Αν μια σημείωση δεν έχει εναπομείναντες κάρτες, θα χαθεί. Είστε σίγουροι ότι θέλετε να συνεχίσετε;</string>
     <string name="missing_note_type">Δεν βρέθηκε τύπος σημείωσης</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Χρονικό όριο ξεπεράστηκε</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Επανατοποθέτηση</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Ηχογράφηση</string>
     <string name="stop_recording">Διακοπή</string>
     <string name="play_recording">Αναπαραγωγή</string>
-    <string name="next_recording">Επόμενο</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Επόμενο</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Αδυναμία διαγραφής τύπου κάρτας</string>
     <string name="orphan_note_message">Διαγράφοντας αυτόν τον τύπο κάρτας θα αφήσετε κάποιες σημειώσεις χωρίς κάρτες.</string>
diff --git a/AnkiDroid/src/main/res/values-el/10-preferences.xml b/AnkiDroid/src/main/res/values-el/10-preferences.xml
index 7288be07ad12..751fa47c00f2 100644
--- a/AnkiDroid/src/main/res/values-el/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-el/10-preferences.xml
@@ -199,6 +199,9 @@
     <string name="reset">Επαναφορά</string>
     <string name="thirdparty_apps_title" maxLength="41">Εφαρμογές API τρίτων</string>
     <string name="thirdparty_apps_summary">Δείτε μια λίστα εφαρμογών που κάνουν χρήση του AnkiDroid API όπως λεξικά, βοηθητικά προγράμματα.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Επαναλήψεις</string>
     <string name="show_deck_title" maxLength="41">Εμφάνιση τίτλου τράπουλας</string>
diff --git a/AnkiDroid/src/main/res/values-el/18-standard-models.xml b/AnkiDroid/src/main/res/values-el/18-standard-models.xml
index e965631ed5c8..55a5aeede750 100644
--- a/AnkiDroid/src/main/res/values-el/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-el/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Μπροστά</string>
-    <string name="back_field_name" maxLength="28">Πίσω</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Πίσω</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-eo/02-strings.xml b/AnkiDroid/src/main/res/values-eo/02-strings.xml
index 74b13a6efcf9..71ede11c37b2 100644
--- a/AnkiDroid/src/main/res/values-eo/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-eo/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (de “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Ĉiuj senasignitaj kartoj estos forigitaj. Se noto ne havas restajn kartojn, ĝi ankaŭ perdiĝos. Ĉu vi certe volas pluigi?</string>
     <string name="missing_note_type">Ne trovis nototipon</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Limigo de lernada tempo atingita</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d kartoj malkaŝitaj.</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Repozicii</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Registri</string>
     <string name="stop_recording">Haltigi</string>
     <string name="play_recording">Ludi</string>
-    <string name="next_recording">Antaŭen</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Antaŭen</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Ne povis forigi tiun ĉi kart-tipon</string>
     <string name="orphan_note_message">Forigi tiun ĉi kart-tipon kaŭzos, ke kelkaj notoj havos neniun karton.</string>
diff --git a/AnkiDroid/src/main/res/values-eo/10-preferences.xml b/AnkiDroid/src/main/res/values-eo/10-preferences.xml
index 43e86a4adc77..5de02d42d0cc 100644
--- a/AnkiDroid/src/main/res/values-eo/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-eo/10-preferences.xml
@@ -198,6 +198,9 @@
     <string name="reset">Restarigi</string>
     <string name="thirdparty_apps_title" maxLength="41">Eksteraj aplikaĵoj uzantaj API</string>
     <string name="thirdparty_apps_summary">Vidigi listojn de aplikaĵoj, kiuj uzas AnkiDroid API kiel vortaroj kaj iloj.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Lernada ekrano</string>
     <string name="show_deck_title" maxLength="41">Montri titolon de kartaro</string>
diff --git a/AnkiDroid/src/main/res/values-eo/18-standard-models.xml b/AnkiDroid/src/main/res/values-eo/18-standard-models.xml
index 301052c509f7..5567370c4880 100644
--- a/AnkiDroid/src/main/res/values-eo/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-eo/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Fronto</string>
-    <string name="back_field_name" maxLength="28">Dorso</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Dorso</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-es-rAR/02-strings.xml b/AnkiDroid/src/main/res/values-es-rAR/02-strings.xml
index 2ad02dcdca5d..9993e651d532 100644
--- a/AnkiDroid/src/main/res/values-es-rAR/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-es-rAR/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (de \'%2$s\')</string>
     <string name="confirm_map_cards_to_nothing">Se eliminará cualquier tarjeta sin asignación. Si una nota no posee tarjetas restantes se perderá. ¿Está seguro de que desea continuar?</string>
     <string name="missing_note_type">No se encontró ningún tipo de nota</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Límite de tiempo alcanzado</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d tarjetas desenterradas</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposición</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Grabar</string>
     <string name="stop_recording">Detener</string>
     <string name="play_recording">Reproducir</string>
-    <string name="next_recording">Siguiente</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Siguiente</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">No se puede eliminar el tipo de tarjeta</string>
     <string name="orphan_note_message">Eliminar este tipo de tarjeta dejará algunas notas sin ninguna tarjeta.</string>
diff --git a/AnkiDroid/src/main/res/values-es-rAR/10-preferences.xml b/AnkiDroid/src/main/res/values-es-rAR/10-preferences.xml
index 6bbcad2a7640..546a7c1695d2 100644
--- a/AnkiDroid/src/main/res/values-es-rAR/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-es-rAR/10-preferences.xml
@@ -198,6 +198,9 @@
     <string name="reset">Restablecer</string>
     <string name="thirdparty_apps_title" maxLength="41">Aplicaciones API de terceros</string>
     <string name="thirdparty_apps_summary">Vea una lista de aplicaciones que hacen uso de la API de AnkiDroid como diccionarios, utilidades.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Revisor</string>
     <string name="show_deck_title" maxLength="41">Mostrar el título del mazo</string>
diff --git a/AnkiDroid/src/main/res/values-es-rAR/18-standard-models.xml b/AnkiDroid/src/main/res/values-es-rAR/18-standard-models.xml
index b7d285c33f12..7c5a48bfe2d9 100644
--- a/AnkiDroid/src/main/res/values-es-rAR/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-es-rAR/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Frente</string>
-    <string name="back_field_name" maxLength="28">Atrás</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Atrás</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-es-rES/02-strings.xml b/AnkiDroid/src/main/res/values-es-rES/02-strings.xml
index 656b49c9a50a..10e060b4e390 100644
--- a/AnkiDroid/src/main/res/values-es-rES/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-es-rES/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (de \"%2$s\")</string>
     <string name="confirm_map_cards_to_nothing">Las tarjetas asignadas a nada se eliminarán. Si una nota no tiene cartas restantes, se perderán. ¿Seguro que deseas continuar?</string>
     <string name="missing_note_type">No se encontró ningún tipo de nota</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Límite de tiempo alcanzado</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d tarjetas desenterradas</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposición</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Grabar</string>
     <string name="stop_recording">Detener</string>
     <string name="play_recording">Reproducir</string>
-    <string name="next_recording">Siguiente</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Siguiente</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">No se puede eliminar el tipo de tarjeta</string>
     <string name="orphan_note_message">Eliminar este tipo de tarjeta dejará algunas notas sin ninguna tarjeta.</string>
diff --git a/AnkiDroid/src/main/res/values-es-rES/10-preferences.xml b/AnkiDroid/src/main/res/values-es-rES/10-preferences.xml
index 2a9209961af0..079fe6b93ba7 100644
--- a/AnkiDroid/src/main/res/values-es-rES/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-es-rES/10-preferences.xml
@@ -198,6 +198,9 @@
     <string name="reset">Restablecer</string>
     <string name="thirdparty_apps_title" maxLength="41">Aplicaciones API de terceros</string>
     <string name="thirdparty_apps_summary">Vea una lista de aplicaciones que hacen uso de la API de AnkiDroid como diccionarios, utilidades.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Revisor</string>
     <string name="show_deck_title" maxLength="41">Mostrar el título del mazo</string>
diff --git a/AnkiDroid/src/main/res/values-es-rES/18-standard-models.xml b/AnkiDroid/src/main/res/values-es-rES/18-standard-models.xml
index bbef3eb60873..8589de75db69 100644
--- a/AnkiDroid/src/main/res/values-es-rES/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-es-rES/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Cara delantera</string>
-    <string name="back_field_name" maxLength="28">Reverso</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Reverso</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-et/02-strings.xml b/AnkiDroid/src/main/res/values-et/02-strings.xml
index 4377b6fd1917..d92c1267685a 100644
--- a/AnkiDroid/src/main/res/values-et/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-et/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (from “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Any cards mapped to nothing will be deleted. If a note has no remaining cards, it will be lost. Are you sure you want to continue?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-et/10-preferences.xml b/AnkiDroid/src/main/res/values-et/10-preferences.xml
index 52bb1431fbdb..2682c32d9549 100644
--- a/AnkiDroid/src/main/res/values-et/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-et/10-preferences.xml
@@ -199,6 +199,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-et/18-standard-models.xml b/AnkiDroid/src/main/res/values-et/18-standard-models.xml
index 59d64739d93d..a43ef550990e 100644
--- a/AnkiDroid/src/main/res/values-et/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-et/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Front</string>
-    <string name="back_field_name" maxLength="28">Back</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Back</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-eu/02-strings.xml b/AnkiDroid/src/main/res/values-eu/02-strings.xml
index 66f27c5e6b60..4b9061255910 100644
--- a/AnkiDroid/src/main/res/values-eu/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-eu/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (“%2$s”(e)tik)</string>
     <string name="confirm_map_cards_to_nothing">Any cards mapped to nothing will be deleted. If a note has no remaining cards, it will be lost. Are you sure you want to continue?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-eu/10-preferences.xml b/AnkiDroid/src/main/res/values-eu/10-preferences.xml
index b4efe843f8e6..65ae72e10e2e 100644
--- a/AnkiDroid/src/main/res/values-eu/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-eu/10-preferences.xml
@@ -199,6 +199,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-eu/18-standard-models.xml b/AnkiDroid/src/main/res/values-eu/18-standard-models.xml
index 59d64739d93d..a43ef550990e 100644
--- a/AnkiDroid/src/main/res/values-eu/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-eu/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Front</string>
-    <string name="back_field_name" maxLength="28">Back</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Back</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-fa/02-strings.xml b/AnkiDroid/src/main/res/values-fa/02-strings.xml
index 65e8458d9a6f..18aabb7ae5da 100644
--- a/AnkiDroid/src/main/res/values-fa/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fa/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (از \"%2$s\")</string>
     <string name="confirm_map_cards_to_nothing">هرکارتی که با هیچ چیز پیوند نخورده باشد حذف خواهد شد. اگر یک یادداشت هیچ کارت باقی مانده ای نداشته باشد، از دست خواهد رفت. ادامه می دهید؟</string>
     <string name="missing_note_type">نوع یادداشتی یافت نشد</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">جعبه زمان رسیده</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d کارت از حالت مخفی خارج شد</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">جابجا کردن</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">ضبط</string>
     <string name="stop_recording">توقف</string>
     <string name="play_recording">پخش</string>
-    <string name="next_recording">بعدی</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">بعدی</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">نمیتوان نوع کارت را حذف کرد</string>
     <string name="orphan_note_message">حذف این نوع کارت باعث بی کارت شدن بعضی یادداشت ها می شود</string>
diff --git a/AnkiDroid/src/main/res/values-fa/10-preferences.xml b/AnkiDroid/src/main/res/values-fa/10-preferences.xml
index d8bd28377d5a..46e3545e6511 100644
--- a/AnkiDroid/src/main/res/values-fa/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-fa/10-preferences.xml
@@ -198,6 +198,9 @@
     <string name="reset">تنظیم مجدد</string>
     <string name="thirdparty_apps_title" maxLength="41">ای پی آی سایر نرم‌افزارها</string>
     <string name="thirdparty_apps_summary">لیستی از برنامه‌هایی که از API انکی‌دروید استفاده می‌کنند، مانند دیکشنری‌ها و ابزارها را ببینید.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">مرور کننده</string>
     <string name="show_deck_title" maxLength="41">نمایش عنوان دسته کارت</string>
diff --git a/AnkiDroid/src/main/res/values-fa/18-standard-models.xml b/AnkiDroid/src/main/res/values-fa/18-standard-models.xml
index c0b9a41b85bc..9cd3ca64fca2 100644
--- a/AnkiDroid/src/main/res/values-fa/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-fa/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">جلو</string>
-    <string name="back_field_name" maxLength="28">بازگشت</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">بازگشت</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-fi/02-strings.xml b/AnkiDroid/src/main/res/values-fi/02-strings.xml
index 3f3b13287a2c..38ff0377e0d2 100644
--- a/AnkiDroid/src/main/res/values-fi/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fi/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (”%2$s”:sta)</string>
     <string name="confirm_map_cards_to_nothing">Kortit, joita ei ole liitetty mihinkään, poistetaan. Jos muistiinpanoon ei liity jäljelle jääviä kortteja, se katoaa. Oletko varma, että haluat jatkaa?</string>
     <string name="missing_note_type">Muistiinpanotyyppejä ei löytynyt</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Aikaikkuna saavutettu</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d kortin hautaus poistettu</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Uudelleenasettele</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Äänitä</string>
     <string name="stop_recording">Pysäytä</string>
     <string name="play_recording">Toista</string>
-    <string name="next_recording">Seuraava</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Seuraava</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Korttityyppiä ei voida poistaa</string>
     <string name="orphan_note_message">Tämän korttityypin poistaminen jättää joitakin muistiinpanoja ilman kortteja.</string>
diff --git a/AnkiDroid/src/main/res/values-fi/10-preferences.xml b/AnkiDroid/src/main/res/values-fi/10-preferences.xml
index 2d5c1148119c..5eb1cc757ffb 100644
--- a/AnkiDroid/src/main/res/values-fi/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-fi/10-preferences.xml
@@ -198,6 +198,9 @@
     <string name="reset">Palauta</string>
     <string name="thirdparty_apps_title" maxLength="41">Kolmannen osapuolen API-sovellukset</string>
     <string name="thirdparty_apps_summary">Listaa sovellukset jotka käyttävät AnkiDroid API:ta, kuten kansioita ja työkaluja.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Kertaaminen</string>
     <string name="show_deck_title" maxLength="41">Näytä pakan otsikko</string>
diff --git a/AnkiDroid/src/main/res/values-fi/18-standard-models.xml b/AnkiDroid/src/main/res/values-fi/18-standard-models.xml
index e1b3fba752cc..52cb179da21e 100644
--- a/AnkiDroid/src/main/res/values-fi/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-fi/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Etupuoli</string>
-    <string name="back_field_name" maxLength="28">Kääntöpuoli</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Kääntöpuoli</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-fil/02-strings.xml b/AnkiDroid/src/main/res/values-fil/02-strings.xml
index 956c72614436..66c5670c4453 100644
--- a/AnkiDroid/src/main/res/values-fil/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fil/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (mula sa \"%2$s\")</string>
     <string name="confirm_map_cards_to_nothing">Ang anumang mga kard na nakabalangkas sa wala ay matatanggal. Kung ang isang tala ay walang natitirang mga kard, ito ay mawawala. Sigurado ka bang gusto mong magpatuloy?</string>
     <string name="missing_note_type">Walang mahanap na uri ng tala</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Naabot ang Timebox</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d na mga card ang tinanggal sa pagkabaon</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Muling iposisyon</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">I-rekord</string>
     <string name="stop_recording">Ihinto</string>
     <string name="play_recording">I-play</string>
-    <string name="next_recording">Sunod</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Sunod</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-fil/10-preferences.xml b/AnkiDroid/src/main/res/values-fil/10-preferences.xml
index fe0a82a80cff..5833153f0f1c 100644
--- a/AnkiDroid/src/main/res/values-fil/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-fil/10-preferences.xml
@@ -199,6 +199,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party na mga API app</string>
     <string name="thirdparty_apps_summary">Ipakit ang listahan ng aplikasyon na gumagamit sa API ng AnkiDroid tulad ng mga diksyunaryo, utility.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Ipakita ang pamagat ng deck</string>
diff --git a/AnkiDroid/src/main/res/values-fil/18-standard-models.xml b/AnkiDroid/src/main/res/values-fil/18-standard-models.xml
index 0ec2ade8cc0f..8c0422892411 100644
--- a/AnkiDroid/src/main/res/values-fil/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-fil/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Harapan</string>
-    <string name="back_field_name" maxLength="28">Likuran</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Likuran</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-fr/02-strings.xml b/AnkiDroid/src/main/res/values-fr/02-strings.xml
index 73f901dc20a8..330a7b4b2c14 100644
--- a/AnkiDroid/src/main/res/values-fr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fr/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (de « %2$s »)</string>
     <string name="confirm_map_cards_to_nothing">Toute carte sans connexion sera effacée. Si une note n’a aucune carte restante, elle sera perdue. Êtes-vous sûr de vouloir continuer ?</string>
     <string name="missing_note_type">Aucun type de note trouvé</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Le temps imparti est écoulé</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d cartes  déterrées</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Repositionner</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Enregistrer</string>
     <string name="stop_recording">Arrêter</string>
     <string name="play_recording">Lecture</string>
-    <string name="next_recording">Suivant</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Suivant</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Impossible de supprimer le type de carte</string>
     <string name="orphan_note_message">Supprimer ce type de carte laissera certaines notes sans cartes.</string>
diff --git a/AnkiDroid/src/main/res/values-fr/10-preferences.xml b/AnkiDroid/src/main/res/values-fr/10-preferences.xml
index 8a8587609e99..2e612bcf9464 100644
--- a/AnkiDroid/src/main/res/values-fr/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-fr/10-preferences.xml
@@ -198,6 +198,9 @@
     <string name="reset">Réinitialiser</string>
     <string name="thirdparty_apps_title" maxLength="41">Applications API tierces</string>
     <string name="thirdparty_apps_summary">Voir la liste des applications qui utilisent l\'API AnkiDroid comme les dictionnaires, les outils.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Réviseur</string>
     <string name="show_deck_title" maxLength="41">Afficher le titre du deck</string>
diff --git a/AnkiDroid/src/main/res/values-fr/18-standard-models.xml b/AnkiDroid/src/main/res/values-fr/18-standard-models.xml
index e00382821266..3cf793f3891b 100644
--- a/AnkiDroid/src/main/res/values-fr/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-fr/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Recto</string>
-    <string name="back_field_name" maxLength="28">Verso</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Verso</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-fy/02-strings.xml b/AnkiDroid/src/main/res/values-fy/02-strings.xml
index 63a5bd869e45..4d82c1515bdd 100644
--- a/AnkiDroid/src/main/res/values-fy/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-fy/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (from “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Any cards mapped to nothing will be deleted. If a note has no remaining cards, it will be lost. Are you sure you want to continue?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-fy/10-preferences.xml b/AnkiDroid/src/main/res/values-fy/10-preferences.xml
index e926f4d98799..39e08614294c 100644
--- a/AnkiDroid/src/main/res/values-fy/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-fy/10-preferences.xml
@@ -199,6 +199,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-fy/18-standard-models.xml b/AnkiDroid/src/main/res/values-fy/18-standard-models.xml
index 59d64739d93d..a43ef550990e 100644
--- a/AnkiDroid/src/main/res/values-fy/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-fy/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Front</string>
-    <string name="back_field_name" maxLength="28">Back</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Back</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ga/02-strings.xml b/AnkiDroid/src/main/res/values-ga/02-strings.xml
index 598d1cd160f3..3c1fc797e59a 100644
--- a/AnkiDroid/src/main/res/values-ga/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ga/02-strings.xml
@@ -107,6 +107,7 @@
     <string name="field_remapping">%1$s (from “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Any cards mapped to nothing will be deleted. If a note has no remaining cards, it will be lost. Are you sure you want to continue?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -342,10 +343,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-ga/10-preferences.xml b/AnkiDroid/src/main/res/values-ga/10-preferences.xml
index 6a5de7af8e09..fbe427d0e532 100644
--- a/AnkiDroid/src/main/res/values-ga/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ga/10-preferences.xml
@@ -205,6 +205,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-ga/18-standard-models.xml b/AnkiDroid/src/main/res/values-ga/18-standard-models.xml
index aba9270b52dc..907ac8f525d8 100644
--- a/AnkiDroid/src/main/res/values-ga/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-ga/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Aghaidh</string>
-    <string name="back_field_name" maxLength="28">Cúl</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Cúl</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-gl/01-core.xml b/AnkiDroid/src/main/res/values-gl/01-core.xml
index 9e0704765112..d5903082ece3 100644
--- a/AnkiDroid/src/main/res/values-gl/01-core.xml
+++ b/AnkiDroid/src/main/res/values-gl/01-core.xml
@@ -46,7 +46,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Navigation drawer items-->
     <string name="decks" maxLength="28">Barallas</string>
-    <string name="card_browser" maxLength="28" comment="The usage of card browser inside the app (note the casing)">Explorador de cartóns</string>
+    <string name="card_browser" maxLength="28" comment="The usage of card browser inside the app (note the casing)">Explorador de tarxetas</string>
     <string name="statistics" maxLength="28">Estatísticas</string>
     <string name="settings" maxLength="28">Axustes</string>
     <string name="help" maxLength="28">Axuda</string>
@@ -83,8 +83,8 @@
     <string name="undo" maxLength="28" comment="When tapping on this text, the last action is undone.">Desfacer</string>
     <string name="redo" maxLength="28">Refacer</string>
     <string name="undo_action_whiteboard_last_stroke" comment="One of the display patterns of \'Undo\' item on the action menu in Reviewer. It is shown as the title of the item when the whiteboard (handwriting) feature is enabled and visible and has any strokes (handwritten lines)" maxLength="28">Desfacer trazo</string>
-    <string name="move_all_to_deck">Mover todos para a barallla</string>
-    <string name="unbury" maxLength="28">Desenterrar</string>
+    <string name="move_all_to_deck">Mover todos cara á baralla</string>
+    <string name="unbury" maxLength="28">Desagochar</string>
     <string name="rename_deck" maxLength="28">Renomear baralla</string>
     <string name="create_shortcut">Crear atallo</string>
     <string name="browse_cards">Explorar tarxetas</string>
@@ -93,18 +93,18 @@
     <string name="menu_add_note" maxLength="28">Engadir nota</string>
     <string name="menu_my_account" comment="Label of the window in which the user should enter their account. This text can\'t be found in AnkiDroid directly.">Sincronizar conta</string>
     <string name="menu_dismiss_note" maxLength="41">Agochar/eliminar</string>
-    <string name="menu_bury_card" maxLength="28">Enterrar cartón</string>
+    <string name="menu_bury_card" maxLength="28">Agochar tarxeta</string>
     <string name="menu_bury_note" maxLength="28">Agochar nota</string>
-    <string name="menu_suspend_card" maxLength="28">Suspender cartón</string>
+    <string name="menu_suspend_card" maxLength="28">Suspender tarxeta</string>
     <string name="menu_suspend_note" maxLength="28">Suspender nota</string>
-    <string name="menu_bury" maxLength="28">Enterrar</string>
+    <string name="menu_bury" maxLength="28">Agochar</string>
     <string name="menu_suspend" maxLength="28">Suspender</string>
     <string name="menu_delete_note" maxLength="28">Eliminar nota</string>
-    <string name="menu_flag" maxLength="41">Marca</string>
+    <string name="menu_flag" maxLength="41">Bandeira</string>
     <string name="rename_flag">Renomear bandeiras</string>
-    <string name="menu_flag_card" maxLength="28">Tarxeta marcada</string>
+    <string name="menu_flag_card" maxLength="28">Marcar tarxeta</string>
     <string name="menu_edit_tags" maxLength="28">Editar etiquetas</string>
-    <string name="delete_note_message">Tes a certeza de querer eliminar esta nota e todos os seus cartóns?\n%s</string>
+    <string name="delete_note_message">Tes a certeza de querer eliminar esta nota e todas as súas tarxetas?\n%s</string>
     <string name="menu_search" maxLength="28">Procurar en %1$s</string>
     <string name="menu_mark_note" maxLength="28">Marcar nota</string>
     <string name="menu_unmark_note">Desmarcar nota</string>
@@ -112,12 +112,12 @@
     <string name="menu_disable_voice_playback">Desactivar reprodución de voz</string>
     <string name="new_deck">Crear baralla</string>
     <string name="new_dynamic_deck">Crear baralla filtrada</string>
-    <string name="directory_inaccessible">O directorio AnkiDroid non está accesible</string>
+    <string name="directory_inaccessible">O directorio AnkiDroid non é accesíbel</string>
     <!--This is shown when AnkiDroid starts up with no storage permissions.
     The user is taken to the "App Info" screen, and needs to click "Permissions" and
     grant AnkiDroid the \'Storage\' permission. This needs to be a fairly generic message as implementations
     of the permissions/app info screen will differ between devices. -->
-    <string name="startup_no_storage_permission">Por favor, conceda a Ankidroid o permiso de almacenamento para continuar</string>
+    <string name="startup_no_storage_permission">Concede a Ankidroid o permiso de \'Almacenamento\' para continuar</string>
     <string name="rebuild_filtered_deck">Reconstruíndo baralla filtrada&#8230;</string>
     <string name="rebuild_cram_label" maxLength="28">Reconstruír</string>
     <string name="empty_cram_label" maxLength="28">Baleirar</string>
@@ -129,7 +129,7 @@
     <string name="invalid_deck_name">O nome da baralla non é valido</string>
     <string name="studyoptions_congrats_finished">Parabéns! Remataches por hoxe.</string>
     <string name="studyoptions_congrats_next_due_in" comment="The param will be replaced with \'The next card will be ready in X time\'">Baralla rematada por agora! %s</string>
-    <string name="studyoptions_no_cards_due">Aínda non hai cartóns pendentes</string>
+    <string name="studyoptions_no_cards_due">Non hai tarxetas pendentes</string>
     <string name="sd_card_not_mounted">Almacenamento do dispositivo non montado</string>
     <string name="button_sync" comment="Text of the sync button" maxLength="28">Sincronizar</string>
     <string name="cancel_sync_confirm" tools:ignore="UnusedResources">Queres cancelar a sincronización?</string>
diff --git a/AnkiDroid/src/main/res/values-gl/02-strings.xml b/AnkiDroid/src/main/res/values-gl/02-strings.xml
index 941618fa0112..625ba38d897b 100644
--- a/AnkiDroid/src/main/res/values-gl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-gl/02-strings.xml
@@ -73,20 +73,20 @@
     <string name="leech_suspend_notification">Tarxeta marcada como sambesuga e suspendida</string>
     <string name="leech_notification">Tarxeta marcada como sambesuga</string>
     <string name="webview_crash_unknown">Erro descoñecido</string>
-    <string name="webview_crash_unknwon_detailed">Isto foi causado por un erro interno na WebView</string>
+    <string name="webview_crash_unknwon_detailed">Isto foi causado por un erro interno no WebView</string>
     <string name="webview_crash_oom">Memoria insuficiente</string>
-    <string name="webview_crash_oom_details">The WebView was terminated by the system. This typically happens when the application runs out of memory, often due to large fonts or media.</string>
-    <string name="webview_crash_nonfatal">WebView renderer crashed. Cause: %s</string>
-    <string name="webview_crash_fatal">Fatal Error: WebView renderer crashed. Cause: %s</string>
-    <string name="webview_crash_loop_dialog_title">System WebView Rendering Failure</string>
-    <string name="webview_crash_loop_dialog_content">System WebView failed to render card \'%1$s\'.\n %2$s</string>
+    <string name="webview_crash_oom_details">O sistema terminou WebView. Isto adoita ocorrer cando a aplicación queda sen memoria, moitas veces debido ao tipo de letra ou ficheiros multimedia grandes.</string>
+    <string name="webview_crash_nonfatal">O renderizador de WebView quebrou. Causa: %s</string>
+    <string name="webview_crash_fatal">Erro fatal: o renderizador de WebView quebrou. Causa: %s</string>
+    <string name="webview_crash_loop_dialog_title">Produciuse un erro ao representar o WebView</string>
+    <string name="webview_crash_loop_dialog_content">O WebView do sistema fallou ao representar a tarxeta \'%1$s\'.\n%2$s</string>
     <string name="filter_by_flags" maxLength="41">Bandeiras</string>
     <!-- Custom study options -->
     <string name="custom_study_loading_tags">Creando lista de etiquetas&#8230;</string>
     <!-- Study options -->
     <plurals name="studyoptions_buried_count">
-        <item quantity="one">+%d soterrada</item>
-        <item quantity="other">+%d soterradas</item>
+        <item quantity="one">+%d agochada</item>
+        <item quantity="other">+%d agochadas</item>
     </plurals>
     <string name="studyoptions_total_new_label">Tarxetas novas totais</string>
     <string name="studyoptions_total_label">Tarxetas totais</string>
@@ -95,7 +95,7 @@
     <string name="discard">Descartar</string>
     <string name="note_editor_no_cards_created">Non se crearon tarxetas. Por favor, enche máis campos.</string>
     <string name="note_editor_no_cards_created_all_fields">O tipo de nota actual non produciu ningunha tarxeta.\nEscolle outro tipo de nota, ou selecciona \'Tarxetas\' e engade un campo de substitución</string>
-    <string name="note_editor_insert_cloze_no_cloze_note_type">Cloze deletions will only work on a Cloze note type</string>
+    <string name="note_editor_insert_cloze_no_cloze_note_type">Os ocos só funcionan en notas de tipo ocos</string>
     <string name="saving_facts">Gardando a nota</string>
     <string name="saving_model">Gardando tipo de nota</string>
     <string name="save" maxLength="28">Gardar</string>
@@ -103,7 +103,8 @@
     <string name="select">Seleccionar</string>
     <string name="field_remapping">%1$s (de “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Eliminaranse os cartóns asignados a ren. Se unha nota non ten cartóns restantes, perderase. Tes a certeza de querer continuar?</string>
-    <string name="missing_note_type">Non se encontrou o tipo de nota</string>
+    <string name="missing_note_type">Non se atopou o tipo de nota</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Límite de tempo acadado</string>
     <plurals name="timebox_reached">
@@ -147,14 +148,14 @@
     <string name="export_preparation_in_progress">Preparando exportación&#8230;</string>
     <string name="export_ready_title">Listo para exportar</string>
     <string name="export_send_no_handlers">Non hai aplicacións dispoñíbeis para manexar apkg. Gardando&#8230;</string>
-    <string name="export_save_apkg_successful">Successfully saved Anki package</string>
-    <string name="export_save_apkg_unsuccessful">Save Anki package failed</string>
-    <string name="export_share_title">Send Anki package using</string>
+    <string name="export_save_apkg_successful">Paquete Anki gardado correctamente</string>
+    <string name="export_save_apkg_unsuccessful">Fallo ao gardar o paquete Anki</string>
+    <string name="export_share_title">Enviar paquete Anki usando</string>
     <string name="export_email_subject">Cartóns exportados por AnkiDroid: %s</string>
-    <string name="export_email_text"><![CDATA[        Hi!
+    <string name="export_email_text"><![CDATA[        Ola!
         <br/><br/>
-        This is an Anki flashcards deck sent from AnkiDroid[1].
-        Try to open it using one of the available Anki distributions[2] and enjoy easy and efficient learning!<br/><br/>
+        Esta é unha baralla de tarxetas Anki enviada desde AnkiDroid[1].
+        Tenta abrila usando unha das versións dispoñíbeis de Anki[2] e goza dunha aprendizaxe doada e eficiente!<br/><br/>
         [1] %1$s<br/>
         [2] %2$s
         ]]></string>
@@ -180,10 +181,10 @@
     <!-- Currently only used if exporting APKG fails -->
     <string name="apk_share_error">Produciuse un erro ao compartir o ficheiro apkg</string>
     <!-- Import and export v2 feedback -->
-    <string name="activity_start_failed">The system does not have an app installed that can perform this action.</string>
-    <string name="multimedia_editor_image_compression_failed"><![CDATA[Camera images may be large. You may wish to compress & resize images in the media directory]]></string>
-    <string name="no_browser_msg">No browser found for opening the link: %s</string>
-    <string name="web_page_error">Error loading page: %s</string>
+    <string name="activity_start_failed">O sistema non ten ningunha aplicación instalada que poida executar esta acción.</string>
+    <string name="multimedia_editor_image_compression_failed"><![CDATA[As imaxes da cámara poden ser grandes. Pode que desexes comprimilas e redimensionalas no directorio de multimedia]]></string>
+    <string name="no_browser_msg">Non se encontrou navegador para abrir a ligazón: %s</string>
+    <string name="web_page_error">Erro ao cargar a páxina: %s</string>
     <!-- The name of the deck which corrupt cards will be moved to -->
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Fondo</string>
@@ -191,106 +192,106 @@
     <string name="remove_wallpaper_image" maxLength="41">Retirar fondo</string>
     <string name="remove_background_image">Retirar fondo?</string>
     <!-- Card Template Browser Appearance -->
-    <string name="restore_default" maxLength="28">Restore Default</string>
-    <string name="reviewer_tts_cloze_spoken_replacement">Blank</string>
+    <string name="restore_default" maxLength="28">Restablecer predefinidos</string>
+    <string name="reviewer_tts_cloze_spoken_replacement">Baleiro</string>
     <!-- Whiteboard save image message in Reviewer -->
-    <string name="white_board_image_save_failed">Failed to save whiteboard image. %s</string>
-    <string name="white_board_image_saved">Whiteboard image saved to %s</string>
-    <string name="title_whiteboard_editor" maxLength="28">Whiteboard editor</string>
+    <string name="white_board_image_save_failed">Fallo ao gardar a imaxe do encerado. %s</string>
+    <string name="white_board_image_saved">Imaxe do encerado gardada en %s</string>
+    <string name="title_whiteboard_editor" maxLength="28">Editor do encerado</string>
     <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
     <!-- JS api -->
     <string name="api_version_developer_contact">This card uses unsupported AnkiDroid features. Contact developer %1$s, or view the wiki. %2$s</string>
     <string name="invalid_json_data">Card provided invalid data. %s</string>
     <string name="valid_js_api_version">Invalid AnkiDroid JS API version. Contact developer %s, or view wiki</string>
     <string name="update_js_api_version">AnkiDroid JS API update available. Contact developer %s, or view wiki</string>
-    <string name="reviewer_invalid_api_version_visit_documentation">View</string>
+    <string name="reviewer_invalid_api_version_visit_documentation">Ver</string>
     <string name="anki_js_error_code">(Código de erro: %d)</string>
     <!-- About AnkiDroid screen -->
     <string name="about_ankidroid_successfully_copied_debug_info">Copiado ao portapapeis</string>
     <string name="about_ankidroid_error_copy_debug_info">Error copying debug information to clipboard</string>
     <!-- Card Viewer -->
-    <string name="card_viewer_could_not_find_image">Card Content Error: Failed to load ‘%s’</string>
+    <string name="card_viewer_could_not_find_image">Erro no contido da tarxeta: Fallo ao cargar ‘%s’</string>
     <!-- Deck Picker -->
     <string name="search_decks" maxLength="28">Buscar barallas</string>
     <string name="ankidroid_init_failed_webview_title">Erro fatal</string>
-    <string name="ankidroid_init_failed_webview">AnkiDroid relies on the System WebView which is unavailable. This can happen if the system is installing updates. Please try again in a few minutes.\n\n%s</string>
+    <string name="ankidroid_init_failed_webview">O sistema WebView, do cal depende AnkiDroid, non se encontra dispoñíbel. Isto pode ocorrer durante a instalación de actualizacións. Téntao de novo nuns minutos.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
-    <string name="menu_font_size" maxLength="28">Font size</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Show toolbar</string>
-    <string name="format_insert_bold">Format as Bold</string>
-    <string name="format_insert_italic">Format as Italic</string>
-    <string name="format_insert_underline">Format as Underline</string>
-    <string name="insert_horizontal_line">Insert Horizontal Line</string>
-    <string name="insert_heading">Insert Heading</string>
-    <string name="format_font_size">Change Font Size</string>
-    <string name="insert_mathjax">Insert MathJax Equation</string>
-    <string name="note_editor_toolbar_icon">Button text</string>
-    <string name="before_text">HTML Before Selection</string>
-    <string name="after_text">HTML After Selection</string>
-    <string name="add_toolbar_item">Create Toolbar Item</string>
-    <string name="edit_toolbar_item">Edit Toolbar Item</string>
+    <string name="menu_font_size" maxLength="28">Tamaño da letra</string>
+    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Amosar barra de ferramentas</string>
+    <string name="format_insert_bold">Aplicar letra grosa</string>
+    <string name="format_insert_italic">Aplicar cursiva</string>
+    <string name="format_insert_underline">Aplicar subliñado</string>
+    <string name="insert_horizontal_line">Inserir liña horizontal</string>
+    <string name="insert_heading">Inserir cabeceira</string>
+    <string name="format_font_size">Cambiar tamaño da letra</string>
+    <string name="insert_mathjax">Inserir ecuación MathJax</string>
+    <string name="note_editor_toolbar_icon">Texto do botón</string>
+    <string name="before_text">HTML antes da selección</string>
+    <string name="after_text">HTML despois da selección</string>
+    <string name="add_toolbar_item">Crear elemento da barra de ferramentas</string>
+    <string name="edit_toolbar_item">Editar elemento da barra de ferramentas</string>
     <string name="toolbar_item_explain_edit_or_remove">Enter HTML to be inserted before and after the selected text\n\nLong press a toolbar item to edit or remove it</string>
-    <string name="remove_toolbar_item">Remove Toolbar Item?</string>
-    <string name="note_editor_image_too_large">The image is too large, please insert the image manually</string>
-    <string name="note_editor_video_too_large">The video file is too large, please insert the video manually</string>
-    <string name="note_editor_audio_too_large">The audio file is too large, please insert the audio manually</string>
+    <string name="remove_toolbar_item">Eliminar elemento da barra de ferramentas?</string>
+    <string name="note_editor_image_too_large">A imaxe é moi grande. Insire a imaxe manualmente</string>
+    <string name="note_editor_video_too_large">O ficheiro de vídeo é moi grande. Insire o vídeo manualmente</string>
+    <string name="note_editor_audio_too_large">O ficheiro de audio é moi grande. Insire o audio manualmente</string>
     <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
-    <string name="create_shortcut_error">Error adding shortcut: %s</string>
-    <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Capitalize sentences</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Scroll toolbar</string>
+    <string name="create_shortcut_error">Erro ao engadir atallo: %s</string>
+    <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Comezar frases con maiúscula</string>
+    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Barra ferramentas deslizábel</string>
     <!-- Symbols used as Button text in IncrementNumberRangePreference -->
     <string name="plus_sign" comment="Label for increment button in IncrementerNumberRangePreference">+</string>
     <string name="minus_sign" comment="Label for decrement button in IncrementerNumberRangePreference">-</string>
     <!-- Used for credential empty warning message -->
-    <string name="invalid_email">Enter a valid email</string>
-    <string name="password_empty">Password is required</string>
-    <string name="back_pressed_once">Press back again to exit</string>
+    <string name="invalid_email">Insire un correo electrónico válido</string>
+    <string name="password_empty">O contrasinal é obrigatorio</string>
+    <string name="back_pressed_once">Preme en atrás de novo para saír</string>
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
-    <string name="download_deck">Download deck</string>
-    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in Browser</string>
-    <string name="try_again">Try Again</string>
-    <string name="cancel_download">Cancel download</string>
-    <string name="cancel_download_question_title">Cancel download?</string>
-    <string name="downloading_file">Downloading %s</string>
-    <string name="import_deck">Import Deck</string>
-    <string name="something_wrong">Something went wrong, please try again</string>
-    <string name="download_failed">Download failed</string>
+    <string name="download_deck">Descargar baralla</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Abrir no navegador</string>
+    <string name="try_again">Tentar de novo</string>
+    <string name="cancel_download">Cancelar descarga</string>
+    <string name="cancel_download_question_title">Cancelar descarga?</string>
+    <string name="downloading_file">Descargando %s</string>
+    <string name="import_deck">Importar baralla</string>
+    <string name="something_wrong">Algo saíu mal. Téntao de novo</string>
+    <string name="download_failed">Fallo ao descargar</string>
     <string name="deck_download_progress_message">You can use other apps while the download is running</string>
-    <string name="check_network">Please check your network connection</string>
-    <string name="search_using_deck_name">Search using deck name</string>
+    <string name="check_network">Comproba a túa conexión de rede</string>
+    <string name="search_using_deck_name">Buscar usando o nome da baralla</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
-    <string name="home" maxLength="28">Home</string>
+    <string name="home" maxLength="28">Inicio</string>
     <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
-    <string name="card_buried">Tarxeta soterrada.</string>
+    <string name="card_buried">Tarxeta agochada.</string>
     <plurals name="note_suspended">
-        <item quantity="one">%d card suspended.</item>
-        <item quantity="other">%d cards suspended.</item>
+        <item quantity="one">%d tarxeta suspendida.</item>
+        <item quantity="other">%d tarxetas suspendidas.</item>
     </plurals>
     <!--  Note Editor Toggle Sticky  -->
     <string name="note_editor_toggle_sticky">Make field %s sticky</string>
-    <string name="scoped_storage_learn_more">Learn More</string>
-    <string name="search_card_js_api_no_results">Search returned no results</string>
+    <string name="scoped_storage_learn_more">Máis información</string>
+    <string name="search_card_js_api_no_results">A busca non devolveu ningún resultado</string>
     <!--  JS Addons  -->
     <string name="not_valid_js_addon_package">%s is not a valid JavaScript addon package</string>
-    <string name="could_not_create_dir">Could not create directory %s</string>
+    <string name="could_not_create_dir">Non se puido crear o directorio %s</string>
     <string name="malicious_archive_entry_outside">Malicious archive. Contains entry outside of the target dir: %s</string>
     <string name="malicious_archive_exceeds_limit">Malicious archive. Size exceeds %1$s or contains more than %2$d files</string>
-    <string name="file_extract_exceeds_storage_space">File extract exceeds storage space</string>
+    <string name="file_extract_exceeds_storage_space">O ficheiro extraido excede o espazo de almacenamento</string>
     <!--  Hierarchical Tags  -->
-    <string name="expand_tag">Expand tag \'%s\'</string>
+    <string name="expand_tag">Expandir etiqueta \'%s\'</string>
     <!-- Manage note types -->
-    <string name="field_editor_model_not_available">Failed to access collection. Please try again!</string>
-    <string name="cd_manage_notetypes_add">Add a new note type</string>
+    <string name="field_editor_model_not_available">Non se puido cargar a colección. Por favor, téntao de novo!</string>
+    <string name="cd_manage_notetypes_add">Engadir novo tipo de nota</string>
     <!-- App Intro -->
-    <string name="intro_ankidroid_tagline_one">Study less</string>
-    <string name="intro_ankidroid_tagline_two">Remember more</string>
+    <string name="intro_ankidroid_tagline_one">Estuda menos</string>
+    <string name="intro_ankidroid_tagline_two">Lembra máis</string>
     <string name="intro_short_ankidroid_explanation">Anki\'s card scheduler saves time by strengthening your weakest memories and preserving your strongest</string>
-    <string name="intro_get_started" comment="Action to start AnkiDroid for the first time without syncing from AnkiWeb">Get Started</string>
-    <string name="intro_sync_from_ankiweb">Sync from AnkiWeb</string>
+    <string name="intro_get_started" comment="Action to start AnkiDroid for the first time without syncing from AnkiWeb">Comeza agora</string>
+    <string name="intro_sync_from_ankiweb">Sincronizar desde AnkiWeb</string>
     <!-- IntentHandler -->
     <string name="app_not_initialized_new">AnkiDroid aínda non está inicializado. Abre AnkiDroid e téntao de novo</string>
     <string name="already_logged_in">Xa iniciaches sesión</string>
@@ -320,14 +321,16 @@
     <string name="failed_to_copy">Non se puido copiar</string>
     <string name="card_browser_unavailable_when_notes_mode">Non dispoñíbel en modo \'Notas\'</string>
     <plurals name="unbury_cards_feedback">
-        <item quantity="one">%d tarxeta desenterrada</item>
-        <item quantity="other">%d tarxetas desenterradas</item>
+        <item quantity="one">%d tarxeta desagochada</item>
+        <item quantity="other">%d tarxetas desagochadas</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposicionar</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Gravar</string>
     <string name="stop_recording">Deter</string>
     <string name="play_recording">Reproducir</string>
-    <string name="next_recording">Seguinte</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Seguinte</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Non se puido eliminar o tipo de tarxeta</string>
     <string name="orphan_note_message">Eliminando este tipo de tarxeta deixarás algunhas notas sen tarxetas</string>
@@ -345,6 +348,6 @@
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Editar estilo</string>
     <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Copiar modelo como markdown</string>
     <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Editar aparencia do explorador</string>
-    <string name="missing_user_action_dialog_message" comment="%s is the user action number">User action %s is not set in this notetype. Please configure it</string>
-    <string name="directory_inaccessible_info">Learn more about how to restore access here %s or go to settings to update collection folder.</string>
+    <string name="missing_user_action_dialog_message" comment="%s is the user action number">A acción de usuario %s non está establecida neste tipo de nota. Configúraa</string>
+    <string name="directory_inaccessible_info">Obtén máis información sobre como restaurar o acceso aquí %s ou ve á configuración para actualizar o cartafol da colección.</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-gl/10-preferences.xml b/AnkiDroid/src/main/res/values-gl/10-preferences.xml
index dbe41161e2bf..bbf95035899e 100644
--- a/AnkiDroid/src/main/res/values-gl/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-gl/10-preferences.xml
@@ -199,6 +199,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-gl/18-standard-models.xml b/AnkiDroid/src/main/res/values-gl/18-standard-models.xml
index 59d64739d93d..a43ef550990e 100644
--- a/AnkiDroid/src/main/res/values-gl/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-gl/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Front</string>
-    <string name="back_field_name" maxLength="28">Back</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Back</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-got/02-strings.xml b/AnkiDroid/src/main/res/values-got/02-strings.xml
index 1097c5bbcc89..a42cb290a637 100644
--- a/AnkiDroid/src/main/res/values-got/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-got/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (fram \'%2$s\')</string>
     <string name="confirm_map_cards_to_nothing">Any cards mapped to nothing will be deleted. If a note has no remaining cards, it will be lost. Are you sure you want to continue?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-got/10-preferences.xml b/AnkiDroid/src/main/res/values-got/10-preferences.xml
index 8d49177684a2..ff647bafaf11 100644
--- a/AnkiDroid/src/main/res/values-got/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-got/10-preferences.xml
@@ -199,6 +199,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-got/18-standard-models.xml b/AnkiDroid/src/main/res/values-got/18-standard-models.xml
index 59d64739d93d..a43ef550990e 100644
--- a/AnkiDroid/src/main/res/values-got/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-got/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Front</string>
-    <string name="back_field_name" maxLength="28">Back</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Back</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-gu/02-strings.xml b/AnkiDroid/src/main/res/values-gu/02-strings.xml
index b31abf1d5177..7c274f192b2d 100644
--- a/AnkiDroid/src/main/res/values-gu/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-gu/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (“%2$s”માંથી)</string>
     <string name="confirm_map_cards_to_nothing">કંઈપણ સાથે મેપ કરેલ કોઈપણ કાર્ડ કાઢી નાખવામાં આવશે. જો કોઈ નોંધમાં કોઈ બાકી કાર્ડ નથી, તો તે ખોવાઈ જશે. શું તમે ખરેખર ચાલુ રાખવા માંગો છો?</string>
     <string name="missing_note_type">કોઈ નોંધ પ્રકાર મળ્યો નથી</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">ટાઈમબોક્સ પહોંચી ગયું</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d કાર્ડ અનબરી</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">રિપોઝિશન</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">રેકોર્ડ કરો</string>
     <string name="stop_recording">બંધ</string>
     <string name="play_recording">પ્લે</string>
-    <string name="next_recording">આગલું</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">આગલું</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">அட்டை வகையை நீக்க முடியாது</string>
     <string name="orphan_note_message">இந்த கார்டு வகையை நீக்கினால் சில குறிப்புகள் கார்டு இல்லாமல் இருக்கும்.</string>
diff --git a/AnkiDroid/src/main/res/values-gu/10-preferences.xml b/AnkiDroid/src/main/res/values-gu/10-preferences.xml
index 23ec71655ae8..ef94c4f48bc8 100644
--- a/AnkiDroid/src/main/res/values-gu/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-gu/10-preferences.xml
@@ -198,6 +198,9 @@
     <string name="reset">રીસેટ કરો</string>
     <string name="thirdparty_apps_title" maxLength="41">તૃતીય-પક્ષ API એપ્લિકેશન્સ</string>
     <string name="thirdparty_apps_summary">એપ્લીકેશનની યાદી જુઓ જે AnkiDroid API નો ઉપયોગ કરે છે જેમ કે શબ્દકોશો, ઉપયોગિતાઓ.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">સમીક્ષક</string>
     <string name="show_deck_title" maxLength="41">ડેક શીર્ષક બતાવો</string>
diff --git a/AnkiDroid/src/main/res/values-gu/18-standard-models.xml b/AnkiDroid/src/main/res/values-gu/18-standard-models.xml
index 431f83065ec6..272a92717300 100644
--- a/AnkiDroid/src/main/res/values-gu/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-gu/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">આગળ</string>
-    <string name="back_field_name" maxLength="28">પાછળ</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">પાછળ</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-heb/02-strings.xml b/AnkiDroid/src/main/res/values-heb/02-strings.xml
index 46f3de424f99..4310325d9e83 100644
--- a/AnkiDroid/src/main/res/values-heb/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-heb/02-strings.xml
@@ -106,6 +106,7 @@
     <string name="field_remapping">%1$s (מתוך \"%2$s\")</string>
     <string name="confirm_map_cards_to_nothing">קלף שממופה לכלום ימחק. אם לרשימה אין קלפים נותרים, היא תימחק. להמשיך?</string>
     <string name="missing_note_type">לא נמצא סוג פתק</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">קופסת הזמן הגיעה</string>
     <plurals name="timebox_reached">
@@ -336,10 +337,12 @@
         <item quantity="other">%d כרטיסים הוצאו מהטמנה</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">מיקום מחדש</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">הקלטה</string>
     <string name="stop_recording">עצור</string>
     <string name="play_recording">השמע</string>
-    <string name="next_recording">הבא</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">הבא</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">לא ניתן למחוק את סוג הכרטיס</string>
     <string name="orphan_note_message">מחיקת סוג כרטיס זה תשאיר כמה הערות ללא כרטיס.</string>
diff --git a/AnkiDroid/src/main/res/values-heb/10-preferences.xml b/AnkiDroid/src/main/res/values-heb/10-preferences.xml
index e91a4be581e5..b786918a300f 100644
--- a/AnkiDroid/src/main/res/values-heb/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-heb/10-preferences.xml
@@ -203,6 +203,9 @@
     <string name="reset">איפוס</string>
     <string name="thirdparty_apps_title" maxLength="41">יישומי צד שלישי</string>
     <string name="thirdparty_apps_summary">ראה רשימת יישומים המשתמשים ב- API של AnkiDroid כגון מילונים, כלי עזר.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">סוקר</string>
     <string name="show_deck_title" maxLength="41">הצג את כותרת החפיסה</string>
diff --git a/AnkiDroid/src/main/res/values-heb/18-standard-models.xml b/AnkiDroid/src/main/res/values-heb/18-standard-models.xml
index 3882077db2bb..c168c3269d7c 100644
--- a/AnkiDroid/src/main/res/values-heb/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-heb/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">חזית</string>
-    <string name="back_field_name" maxLength="28">גב</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">גב</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-hi/02-strings.xml b/AnkiDroid/src/main/res/values-hi/02-strings.xml
index 2bdd0cfc0c9e..7f5dcbe55a00 100644
--- a/AnkiDroid/src/main/res/values-hi/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-hi/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (\"%2$s\" से)</string>
     <string name="confirm_map_cards_to_nothing">कुछ नहीं के लिए मैप किए गए किसी भी कार्ड को हटा दिया जाएगा । यदि किसी नोट में कोई शेष कार्ड नहीं है, तो वह खो जाएगा । क्या आप निश्चयपूर्वक जारी रखना चाहते हैं?</string>
     <string name="missing_note_type">कोई नोट प्रकार नहीं मिला</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">टाइमबॉक्स पहुँच गया</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d कार्ड दफनाए नहीं गए</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">स्थान बदलने</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">अभिलेख</string>
     <string name="stop_recording">रुकना</string>
     <string name="play_recording">खेल</string>
-    <string name="next_recording">अगला</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">अगला</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">कार्ड प्रकार को हटाया नहीं जा सकता</string>
     <string name="orphan_note_message">इस कार्ड प्रकार को हटाने से कुछ नोट बिना किसी कार्ड के रह जाएंगे।</string>
diff --git a/AnkiDroid/src/main/res/values-hi/10-preferences.xml b/AnkiDroid/src/main/res/values-hi/10-preferences.xml
index 578694adec0f..75c7208cc0d5 100644
--- a/AnkiDroid/src/main/res/values-hi/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-hi/10-preferences.xml
@@ -198,6 +198,9 @@
     <string name="reset">रीसेट</string>
     <string name="thirdparty_apps_title" maxLength="41">तृतीय-पक्ष API ऐप्स</string>
     <string name="thirdparty_apps_summary">शब्दकोशों और उपयोगिताओं सहित AnkiDroid का उपयोग करने वाले ऐप्स की सूची देखने के लिए यहां टैप करें</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">समीक्षक</string>
     <string name="show_deck_title" maxLength="41">डेक शीर्षक दिखाएँ</string>
diff --git a/AnkiDroid/src/main/res/values-hi/18-standard-models.xml b/AnkiDroid/src/main/res/values-hi/18-standard-models.xml
index f1f571f7035f..68348522fdee 100644
--- a/AnkiDroid/src/main/res/values-hi/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-hi/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">सामने</string>
-    <string name="back_field_name" maxLength="28">पिछला</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">पिछला</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-hr/02-strings.xml b/AnkiDroid/src/main/res/values-hr/02-strings.xml
index 4b37568612c6..43b39cc0dece 100644
--- a/AnkiDroid/src/main/res/values-hr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-hr/02-strings.xml
@@ -105,6 +105,7 @@
     <string name="field_remapping">%1$s (from “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Any cards mapped to nothing will be deleted. If a note has no remaining cards, it will be lost. Are you sure you want to continue?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -330,10 +331,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-hr/10-preferences.xml b/AnkiDroid/src/main/res/values-hr/10-preferences.xml
index 083d2591e533..61559bbd7582 100644
--- a/AnkiDroid/src/main/res/values-hr/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-hr/10-preferences.xml
@@ -201,6 +201,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-hr/18-standard-models.xml b/AnkiDroid/src/main/res/values-hr/18-standard-models.xml
index 59d64739d93d..a43ef550990e 100644
--- a/AnkiDroid/src/main/res/values-hr/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-hr/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Front</string>
-    <string name="back_field_name" maxLength="28">Back</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Back</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-hu/02-strings.xml b/AnkiDroid/src/main/res/values-hu/02-strings.xml
index 2d9159ff71a0..0fcf53641b90 100644
--- a/AnkiDroid/src/main/res/values-hu/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-hu/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (az “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Az összes üres kártyát töröljük. Ha a jegyzet összes kártyája törlődik, akkor ez is eltávolításra kerül. Folytatod?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">A rendelkezésre álló időt elhasználtuk</string>
     <plurals name="timebox_reached">
@@ -325,10 +326,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Felvétel indítása</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Indítás</string>
-    <string name="next_recording">Következő</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Következő</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-hu/10-preferences.xml b/AnkiDroid/src/main/res/values-hu/10-preferences.xml
index 8f3d3969497a..fcc67cff2a7b 100644
--- a/AnkiDroid/src/main/res/values-hu/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-hu/10-preferences.xml
@@ -199,6 +199,9 @@
     <string name="reset">Visszaállít</string>
     <string name="thirdparty_apps_title" maxLength="41">Külsős API alkalmazások</string>
     <string name="thirdparty_apps_summary">Egy lista az alkalmazásokról, amik az AnkiDroid API-t használják, mint például szótárak és segédprogramok.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Felülvizsgáló</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-hu/18-standard-models.xml b/AnkiDroid/src/main/res/values-hu/18-standard-models.xml
index 67139ad4e309..68af4eccf38b 100644
--- a/AnkiDroid/src/main/res/values-hu/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-hu/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Elülső</string>
-    <string name="back_field_name" maxLength="28">Hátsó</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Hátsó</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-hy/02-strings.xml b/AnkiDroid/src/main/res/values-hy/02-strings.xml
index 264a2307fcb9..3b4247ba3cd3 100644
--- a/AnkiDroid/src/main/res/values-hy/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-hy/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s («%2$s»-ից)</string>
     <string name="confirm_map_cards_to_nothing">Բոլոր չարտապատկերված քարտերը ջնջվելու են: Եթե գրառումը քարտ չունի, ապա այն կվերանա: Վստա՞հ եք, որ ուզում եք շարունակել:</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-hy/10-preferences.xml b/AnkiDroid/src/main/res/values-hy/10-preferences.xml
index b8b750d93e9e..84b6f61de3f6 100644
--- a/AnkiDroid/src/main/res/values-hy/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-hy/10-preferences.xml
@@ -199,6 +199,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-hy/18-standard-models.xml b/AnkiDroid/src/main/res/values-hy/18-standard-models.xml
index 146106c725c5..dd3a12a1b5b0 100644
--- a/AnkiDroid/src/main/res/values-hy/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-hy/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Առջև</string>
-    <string name="back_field_name" maxLength="28">Հետև</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Հետև</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ind/02-strings.xml b/AnkiDroid/src/main/res/values-ind/02-strings.xml
index 2289fef947a6..6fd2c43fa490 100644
--- a/AnkiDroid/src/main/res/values-ind/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ind/02-strings.xml
@@ -87,8 +87,8 @@
     <plurals name="studyoptions_buried_count">
         <item quantity="other">+%d buried</item>
     </plurals>
-    <string name="studyoptions_total_new_label">Total new cards</string>
-    <string name="studyoptions_total_label">Total cards</string>
+    <string name="studyoptions_total_new_label">Total kartu baru</string>
+    <string name="studyoptions_total_label">Total Kartu</string>
     <!-- Card editor -->
     <string name="cardeditor_title_edit_card" maxLength="28">Edit catatan</string>
     <string name="discard">Buang</string>
@@ -103,6 +103,7 @@
     <string name="field_remapping">%1$s (dari “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Semua kartu yang yang dibuat kosong akan dihapus. Jika catatan tidak memiliki sisa kartu, kartu tersebut akan hilang. Apa kamu yakin?</string>
     <string name="missing_note_type">Tidak ada jenis catatan yang ditemukan</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Batas waktu telah tercapai</string>
     <plurals name="timebox_reached">
@@ -318,10 +319,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Pindah posisi</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Mulai rekam</string>
     <string name="stop_recording">Selesai rekam</string>
     <string name="play_recording">Mainkan</string>
-    <string name="next_recording">Berikutnya</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Berikutnya</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-ind/10-preferences.xml b/AnkiDroid/src/main/res/values-ind/10-preferences.xml
index 63bf0274b0d8..5713510d92a3 100644
--- a/AnkiDroid/src/main/res/values-ind/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ind/10-preferences.xml
@@ -197,6 +197,9 @@
     <string name="reset">Atur ulang</string>
     <string name="thirdparty_apps_title" maxLength="41">Aplikasi API pihak ketiga</string>
     <string name="thirdparty_apps_summary">Lihat daftar aplikasi yang menggunakan API AnkiDroid seperti kamus, alat.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Peninjau</string>
     <string name="show_deck_title" maxLength="41">Tampilkan judul dek</string>
diff --git a/AnkiDroid/src/main/res/values-ind/18-standard-models.xml b/AnkiDroid/src/main/res/values-ind/18-standard-models.xml
index 26741de51702..1a700c3ce320 100644
--- a/AnkiDroid/src/main/res/values-ind/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-ind/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Depan</string>
-    <string name="back_field_name" maxLength="28">Belakang</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Belakang</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-is/02-strings.xml b/AnkiDroid/src/main/res/values-is/02-strings.xml
index 5e4fab69ad3c..fec7efe184db 100644
--- a/AnkiDroid/src/main/res/values-is/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-is/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (from “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Any cards mapped to nothing will be deleted. If a note has no remaining cards, it will be lost. Are you sure you want to continue?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-is/10-preferences.xml b/AnkiDroid/src/main/res/values-is/10-preferences.xml
index 8d49177684a2..ff647bafaf11 100644
--- a/AnkiDroid/src/main/res/values-is/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-is/10-preferences.xml
@@ -199,6 +199,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-is/18-standard-models.xml b/AnkiDroid/src/main/res/values-is/18-standard-models.xml
index 59d64739d93d..a43ef550990e 100644
--- a/AnkiDroid/src/main/res/values-is/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-is/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Front</string>
-    <string name="back_field_name" maxLength="28">Back</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Back</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-it/02-strings.xml b/AnkiDroid/src/main/res/values-it/02-strings.xml
index 6614856d1daf..88b4306b690d 100644
--- a/AnkiDroid/src/main/res/values-it/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-it/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (di \'%2$s\')</string>
     <string name="confirm_map_cards_to_nothing">Verranno eliminate eventuali carte senza connessione. Se una nota non ha nessuna carta rimanente, sarà perduta. Sei sicuro/a di voler continuare?</string>
     <string name="missing_note_type">Nessun tipo di nota trovato</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Limite di tempo raggiunto</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d carte non sepolte</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Riposiziona</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Registra</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Riproduci</string>
-    <string name="next_recording">Successivo</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Successivo</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Impossibile eliminare il tipo di carta</string>
     <string name="orphan_note_message">L\'eliminazione di questo tipo di carta lascerà alcune note senza alcuna carta.</string>
diff --git a/AnkiDroid/src/main/res/values-it/10-preferences.xml b/AnkiDroid/src/main/res/values-it/10-preferences.xml
index 269b280100c7..d2b0ac1c6797 100644
--- a/AnkiDroid/src/main/res/values-it/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-it/10-preferences.xml
@@ -198,6 +198,9 @@
     <string name="reset">Reimposta</string>
     <string name="thirdparty_apps_title" maxLength="41">Applicazioni API di terze parti</string>
     <string name="thirdparty_apps_summary">Vedi un elenco di applicazioni che utilizzano l\'API AnkiDroid come dizionari, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Revisore</string>
     <string name="show_deck_title" maxLength="41">Visualizza titolo del mazzo</string>
diff --git a/AnkiDroid/src/main/res/values-it/18-standard-models.xml b/AnkiDroid/src/main/res/values-it/18-standard-models.xml
index acf2ac7c0cfa..12f83b77b75b 100644
--- a/AnkiDroid/src/main/res/values-it/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-it/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Fronte</string>
-    <string name="back_field_name" maxLength="28">Retro</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Retro</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-iw/02-strings.xml b/AnkiDroid/src/main/res/values-iw/02-strings.xml
index 46f3de424f99..4310325d9e83 100644
--- a/AnkiDroid/src/main/res/values-iw/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-iw/02-strings.xml
@@ -106,6 +106,7 @@
     <string name="field_remapping">%1$s (מתוך \"%2$s\")</string>
     <string name="confirm_map_cards_to_nothing">קלף שממופה לכלום ימחק. אם לרשימה אין קלפים נותרים, היא תימחק. להמשיך?</string>
     <string name="missing_note_type">לא נמצא סוג פתק</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">קופסת הזמן הגיעה</string>
     <plurals name="timebox_reached">
@@ -336,10 +337,12 @@
         <item quantity="other">%d כרטיסים הוצאו מהטמנה</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">מיקום מחדש</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">הקלטה</string>
     <string name="stop_recording">עצור</string>
     <string name="play_recording">השמע</string>
-    <string name="next_recording">הבא</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">הבא</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">לא ניתן למחוק את סוג הכרטיס</string>
     <string name="orphan_note_message">מחיקת סוג כרטיס זה תשאיר כמה הערות ללא כרטיס.</string>
diff --git a/AnkiDroid/src/main/res/values-iw/10-preferences.xml b/AnkiDroid/src/main/res/values-iw/10-preferences.xml
index e91a4be581e5..b786918a300f 100644
--- a/AnkiDroid/src/main/res/values-iw/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-iw/10-preferences.xml
@@ -203,6 +203,9 @@
     <string name="reset">איפוס</string>
     <string name="thirdparty_apps_title" maxLength="41">יישומי צד שלישי</string>
     <string name="thirdparty_apps_summary">ראה רשימת יישומים המשתמשים ב- API של AnkiDroid כגון מילונים, כלי עזר.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">סוקר</string>
     <string name="show_deck_title" maxLength="41">הצג את כותרת החפיסה</string>
diff --git a/AnkiDroid/src/main/res/values-iw/18-standard-models.xml b/AnkiDroid/src/main/res/values-iw/18-standard-models.xml
index 3882077db2bb..c168c3269d7c 100644
--- a/AnkiDroid/src/main/res/values-iw/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-iw/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">חזית</string>
-    <string name="back_field_name" maxLength="28">גב</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">גב</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ja/02-strings.xml b/AnkiDroid/src/main/res/values-ja/02-strings.xml
index 193ed691035e..65daa6bbd2f5 100644
--- a/AnkiDroid/src/main/res/values-ja/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ja/02-strings.xml
@@ -103,6 +103,7 @@
     <string name="field_remapping">%1$s (\'%2$s\'から)</string>
     <string name="confirm_map_cards_to_nothing">カードタイプ数がより少ないノートタイプに変更する場合、変更先がないカードタイプのカードは削除されます（たとえば、「基本（裏表反転カード付き）」から「基本」に変更する場合、裏表反転カードは削除されます）。続行してもよろしいですか？</string>
     <string name="missing_note_type">ノートタイプが見つかりませんでした</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">タイムボックスの時間です</string>
     <plurals name="timebox_reached">
@@ -318,10 +319,12 @@
         <item quantity="other">%d枚のカードの「今日は非表示」を解除しました</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">並べ替える</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">録音</string>
     <string name="stop_recording">停止</string>
     <string name="play_recording">再生</string>
-    <string name="next_recording">次へ</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">次へ</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">カードタイプを削除できません</string>
     <string name="orphan_note_message">このカードタイプを削除すると、カードが無いノートが生じます。</string>
diff --git a/AnkiDroid/src/main/res/values-ja/10-preferences.xml b/AnkiDroid/src/main/res/values-ja/10-preferences.xml
index 971cf0e7092e..bf65440f3521 100644
--- a/AnkiDroid/src/main/res/values-ja/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ja/10-preferences.xml
@@ -196,6 +196,9 @@
     <string name="reset">リセット</string>
     <string name="thirdparty_apps_title" maxLength="41">サードパーティー製APIアプリ</string>
     <string name="thirdparty_apps_summary">辞書やユーティリティなど、AnkiDroidを活用するアプリのリストを見るにはここをタップしてください</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">学習画面</string>
     <string name="show_deck_title" maxLength="41">デッキのタイトルを表示</string>
diff --git a/AnkiDroid/src/main/res/values-ja/18-standard-models.xml b/AnkiDroid/src/main/res/values-ja/18-standard-models.xml
index b8560061b12f..bf873796d684 100644
--- a/AnkiDroid/src/main/res/values-ja/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-ja/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">表面</string>
-    <string name="back_field_name" maxLength="28">裏面</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">裏面</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-jv/02-strings.xml b/AnkiDroid/src/main/res/values-jv/02-strings.xml
index 24259046bec8..2a772b346efe 100644
--- a/AnkiDroid/src/main/res/values-jv/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-jv/02-strings.xml
@@ -103,6 +103,7 @@
     <string name="field_remapping">%1$s (dari \"%2$s\")</string>
     <string name="confirm_map_cards_to_nothing">Setiap kartu yang dipetakan ke tidak akan dihapus. Jika sebuah catatan tidak memiliki kartu yang tersisa, kartu tersebut akan hilang. Apakah anda yakin ingin melanjutkan?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -318,10 +319,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-jv/10-preferences.xml b/AnkiDroid/src/main/res/values-jv/10-preferences.xml
index 3f9dd4876545..4ab0154dd5d3 100644
--- a/AnkiDroid/src/main/res/values-jv/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-jv/10-preferences.xml
@@ -197,6 +197,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-jv/18-standard-models.xml b/AnkiDroid/src/main/res/values-jv/18-standard-models.xml
index 59d64739d93d..a43ef550990e 100644
--- a/AnkiDroid/src/main/res/values-jv/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-jv/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Front</string>
-    <string name="back_field_name" maxLength="28">Back</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Back</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ka/02-strings.xml b/AnkiDroid/src/main/res/values-ka/02-strings.xml
index afb671b172cb..7afc33dc881f 100644
--- a/AnkiDroid/src/main/res/values-ka/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ka/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (\"%2$s\"-დან)</string>
     <string name="confirm_map_cards_to_nothing">ყველა ბარათი რომელიც არაფერთანაა დაკავშირებული წაიშლება. თუ შენიშვნას არ აქვს შერჩენილი ბარათები ის დაიკარგება. დარწმუნებული ხართ, რომ გსურთ გაგრძელება?</string>
     <string name="missing_note_type">შენიშვნის ტიპი ვერ მოიძებნა</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">დროის ლიმიტი ამოიწურა</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">გადაადგილება</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">ჩაწერა</string>
     <string name="stop_recording">გაჩერება</string>
     <string name="play_recording">დაკვრა</string>
-    <string name="next_recording">შემდეგი</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">შემდეგი</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-ka/10-preferences.xml b/AnkiDroid/src/main/res/values-ka/10-preferences.xml
index e39095b68fe3..870d9fccce27 100644
--- a/AnkiDroid/src/main/res/values-ka/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ka/10-preferences.xml
@@ -198,6 +198,9 @@
     <string name="reset">საწყისი პარამეტრების აღდგენა</string>
     <string name="thirdparty_apps_title" maxLength="41">მესამე მხარეების API-აპლიკაციები</string>
     <string name="thirdparty_apps_summary">იხილეთ სია იმ აპლიკაციებისა, როგორებიცაა მაგალითად ლექსიკონები, რომლებიც AnkiDroid-ის API-ს მოიხმარებენ.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">გადამხედველი</string>
     <string name="show_deck_title" maxLength="41">დასტის სათაურის ჩვენება</string>
diff --git a/AnkiDroid/src/main/res/values-ka/18-standard-models.xml b/AnkiDroid/src/main/res/values-ka/18-standard-models.xml
index fca7bce37987..b09c38f59c04 100644
--- a/AnkiDroid/src/main/res/values-ka/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-ka/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">წინა მხარე</string>
-    <string name="back_field_name" maxLength="28">უკანა მხარე</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">უკანა მხარე</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-kk/02-strings.xml b/AnkiDroid/src/main/res/values-kk/02-strings.xml
index 5e4fab69ad3c..fec7efe184db 100644
--- a/AnkiDroid/src/main/res/values-kk/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-kk/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (from “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Any cards mapped to nothing will be deleted. If a note has no remaining cards, it will be lost. Are you sure you want to continue?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-kk/10-preferences.xml b/AnkiDroid/src/main/res/values-kk/10-preferences.xml
index 8d49177684a2..ff647bafaf11 100644
--- a/AnkiDroid/src/main/res/values-kk/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-kk/10-preferences.xml
@@ -199,6 +199,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-kk/18-standard-models.xml b/AnkiDroid/src/main/res/values-kk/18-standard-models.xml
index 139989445cde..bd22cc7d4f53 100644
--- a/AnkiDroid/src/main/res/values-kk/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-kk/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Алды</string>
-    <string name="back_field_name" maxLength="28">Арты</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Арты</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-km/02-strings.xml b/AnkiDroid/src/main/res/values-km/02-strings.xml
index 0c0d139cc8c6..899c5bae976d 100644
--- a/AnkiDroid/src/main/res/values-km/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-km/02-strings.xml
@@ -103,6 +103,7 @@
     <string name="field_remapping">%1$s (from “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Any cards mapped to nothing will be deleted. If a note has no remaining cards, it will be lost. Are you sure you want to continue?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -318,10 +319,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">ថត</string>
     <string name="stop_recording">ឈប់</string>
     <string name="play_recording">លេង</string>
-    <string name="next_recording">បន្ទាប់</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">បន្ទាប់</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">មិនអាចលុបប្រភេទកាត</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-km/10-preferences.xml b/AnkiDroid/src/main/res/values-km/10-preferences.xml
index ba0a05cc1d31..d0ee55314349 100644
--- a/AnkiDroid/src/main/res/values-km/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-km/10-preferences.xml
@@ -197,6 +197,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-km/18-standard-models.xml b/AnkiDroid/src/main/res/values-km/18-standard-models.xml
index 59d64739d93d..a43ef550990e 100644
--- a/AnkiDroid/src/main/res/values-km/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-km/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Front</string>
-    <string name="back_field_name" maxLength="28">Back</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Back</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-kn/02-strings.xml b/AnkiDroid/src/main/res/values-kn/02-strings.xml
index 300368471ffa..610e8439f46c 100644
--- a/AnkiDroid/src/main/res/values-kn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-kn/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (“%2$s” ನಿಂದ)</string>
     <string name="confirm_map_cards_to_nothing">ಯಾವುದಕ್ಕೂ ಮ್ಯಾಪ್ ಮಾಡದ ಯಾವುದೇ ಕಾರ್ಡ್‌ಗಳನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ. ಟಿಪ್ಪಣಿಯಲ್ಲಿ ಉಳಿದ ಕಾರ್ಡ್‌ಗಳಿಲ್ಲದಿದ್ದರೆ, ಅದು ಕಳೆದುಹೋಗುತ್ತದೆ. ನೀವು ಮುಂದುವರಿಯಲು ಖಚಿತವಾಗಿ ಬಯಸುವಿರಾ?</string>
     <string name="missing_note_type">ಯಾವುದೇ ಟಿಪ್ಪಣಿ ಪ್ರಕಾರ ಕಂಡುಬಂದಿಲ್ಲ</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">ಟೈಮ್‌ಬಾಕ್ಸ್ ತಲುಪಿದೆ</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d ಕಾರ್ಡ್‌ಗಳನ್ನು ಸಮಾಧಿ ಮಾಡಲಾಗಿಲ್ಲ</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">ಪುನಃಸ್ಥಾಪನೆ</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">ರೆಕಾರ್ಡ್ ಮಾಡಿ</string>
     <string name="stop_recording">ನಿಲ್ಲಿಸು</string>
     <string name="play_recording">ಪ್ಲೇ ಮಾಡಿ</string>
-    <string name="next_recording">ಮುಂದೆ</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">ಮುಂದೆ</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-kn/10-preferences.xml b/AnkiDroid/src/main/res/values-kn/10-preferences.xml
index 9ae9ca5fae8b..cc40ada39d02 100644
--- a/AnkiDroid/src/main/res/values-kn/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-kn/10-preferences.xml
@@ -198,6 +198,9 @@
     <string name="reset">ಮರುಹೊಂದಿಸಿ</string>
     <string name="thirdparty_apps_title" maxLength="41">ಮೂರನೇ ವ್ಯಕ್ತಿಯ API ಅಪ್ಲಿಕೇಶನ್‌ಗಳು</string>
     <string name="thirdparty_apps_summary">ನಿಘಂಟುಗಳು, ಉಪಯುಕ್ತತೆಗಳಂತಹ AnkiDroid API ಅನ್ನು ಬಳಸುವ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಪಟ್ಟಿಯನ್ನು ನೋಡಿ.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">ರಿವೈವರ್</string>
     <string name="show_deck_title" maxLength="41">ಡೆಕ್ ಶೀರ್ಷಿಕೆಯನ್ನು ತೋರಿಸಿ</string>
diff --git a/AnkiDroid/src/main/res/values-kn/18-standard-models.xml b/AnkiDroid/src/main/res/values-kn/18-standard-models.xml
index 8140354bf0ac..b665cebdf025 100644
--- a/AnkiDroid/src/main/res/values-kn/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-kn/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">ಮುಂಭಾಗ</string>
-    <string name="back_field_name" maxLength="28">ಹಿಂದೆ</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">ಹಿಂದೆ</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ko/02-strings.xml b/AnkiDroid/src/main/res/values-ko/02-strings.xml
index c9963f7b007f..401df384a49b 100644
--- a/AnkiDroid/src/main/res/values-ko/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ko/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (\'%2$s\'에서)</string>
     <string name="confirm_map_cards_to_nothing">연결되지 않은 모든 카드는 삭제됩니다. 만약 노트에 남아있는 카드가 없다면 버려질 것입니다. 계속 진행할까요?</string>
     <string name="missing_note_type">노트 유형이 없습니다.</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">시간 상자에 도달했습니다</string>
     <plurals name="timebox_reached">
@@ -321,10 +322,12 @@ Context | Request Context    [1]</string>
         <item quantity="other">지금 보기된 카드 %d장</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">위치 변경</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">녹음</string>
     <string name="stop_recording">중지</string>
     <string name="play_recording">재생</string>
-    <string name="next_recording">다음</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">다음</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">카드 유형을 삭제할 수 없습니다</string>
     <string name="orphan_note_message">이 카드 유형을 삭제하면 카드 없이 일부 메모만 남습니다</string>
diff --git a/AnkiDroid/src/main/res/values-ko/10-preferences.xml b/AnkiDroid/src/main/res/values-ko/10-preferences.xml
index 7ee7e8b4657f..ba8c85758507 100644
--- a/AnkiDroid/src/main/res/values-ko/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ko/10-preferences.xml
@@ -196,6 +196,9 @@
     <string name="reset">초기화하기</string>
     <string name="thirdparty_apps_title" maxLength="41">타사 API 앱</string>
     <string name="thirdparty_apps_summary">Ankidroid API를 사용하는 어플 목록 보기 (사전, 편집기 등)</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">복습</string>
     <string name="show_deck_title" maxLength="41">덱 이름 표시</string>
diff --git a/AnkiDroid/src/main/res/values-ko/18-standard-models.xml b/AnkiDroid/src/main/res/values-ko/18-standard-models.xml
index 0c6793c79452..4a128c5c6ba9 100644
--- a/AnkiDroid/src/main/res/values-ko/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-ko/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">앞장</string>
-    <string name="back_field_name" maxLength="28">뒷장</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">뒷장</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ku/02-strings.xml b/AnkiDroid/src/main/res/values-ku/02-strings.xml
index 5b388918c577..e76665ba9d4f 100644
--- a/AnkiDroid/src/main/res/values-ku/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ku/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (from “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Any cards mapped to nothing will be deleted. If a note has no remaining cards, it will be lost. Are you sure you want to continue?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-ku/10-preferences.xml b/AnkiDroid/src/main/res/values-ku/10-preferences.xml
index 2067dfab39b5..279bdccda4aa 100644
--- a/AnkiDroid/src/main/res/values-ku/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ku/10-preferences.xml
@@ -199,6 +199,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-ku/18-standard-models.xml b/AnkiDroid/src/main/res/values-ku/18-standard-models.xml
index 59d64739d93d..a43ef550990e 100644
--- a/AnkiDroid/src/main/res/values-ku/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-ku/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Front</string>
-    <string name="back_field_name" maxLength="28">Back</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Back</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ky/02-strings.xml b/AnkiDroid/src/main/res/values-ky/02-strings.xml
index 5e4fab69ad3c..fec7efe184db 100644
--- a/AnkiDroid/src/main/res/values-ky/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ky/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (from “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Any cards mapped to nothing will be deleted. If a note has no remaining cards, it will be lost. Are you sure you want to continue?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-ky/10-preferences.xml b/AnkiDroid/src/main/res/values-ky/10-preferences.xml
index 8d49177684a2..ff647bafaf11 100644
--- a/AnkiDroid/src/main/res/values-ky/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ky/10-preferences.xml
@@ -199,6 +199,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-ky/18-standard-models.xml b/AnkiDroid/src/main/res/values-ky/18-standard-models.xml
index 59d64739d93d..a43ef550990e 100644
--- a/AnkiDroid/src/main/res/values-ky/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-ky/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Front</string>
-    <string name="back_field_name" maxLength="28">Back</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Back</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-lt/02-strings.xml b/AnkiDroid/src/main/res/values-lt/02-strings.xml
index 93772f8870a8..2280d6ccce2f 100644
--- a/AnkiDroid/src/main/res/values-lt/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-lt/02-strings.xml
@@ -106,6 +106,7 @@
     <string name="field_remapping">%1$s (nuo “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Bet kokios tuščios kortelės bus ištrintos. Jei užrašas neturės susijusių kortelių, jis bus ištrintas. Ar tikrai norite tęsti?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -336,10 +337,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-lt/10-preferences.xml b/AnkiDroid/src/main/res/values-lt/10-preferences.xml
index 245bae8fa871..176a00b72ea3 100644
--- a/AnkiDroid/src/main/res/values-lt/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-lt/10-preferences.xml
@@ -203,6 +203,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-lt/18-standard-models.xml b/AnkiDroid/src/main/res/values-lt/18-standard-models.xml
index d3c5a031de82..ab22d9e4d2e6 100644
--- a/AnkiDroid/src/main/res/values-lt/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-lt/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Priekis</string>
-    <string name="back_field_name" maxLength="28">Galas</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Galas</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-lv/02-strings.xml b/AnkiDroid/src/main/res/values-lv/02-strings.xml
index fa194d29c6c9..f752ef458ce4 100644
--- a/AnkiDroid/src/main/res/values-lv/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-lv/02-strings.xml
@@ -105,6 +105,7 @@
     <string name="field_remapping">%1$s (from “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Any cards mapped to nothing will be deleted. If a note has no remaining cards, it will be lost. Are you sure you want to continue?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -330,10 +331,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-lv/10-preferences.xml b/AnkiDroid/src/main/res/values-lv/10-preferences.xml
index 745c5692839e..72428cb36b3c 100644
--- a/AnkiDroid/src/main/res/values-lv/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-lv/10-preferences.xml
@@ -201,6 +201,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-lv/18-standard-models.xml b/AnkiDroid/src/main/res/values-lv/18-standard-models.xml
index 59d64739d93d..a43ef550990e 100644
--- a/AnkiDroid/src/main/res/values-lv/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-lv/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Front</string>
-    <string name="back_field_name" maxLength="28">Back</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Back</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-mk/02-strings.xml b/AnkiDroid/src/main/res/values-mk/02-strings.xml
index ba3c163628e9..9f0b7a2fbd84 100644
--- a/AnkiDroid/src/main/res/values-mk/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-mk/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (од “%2$s“)</string>
     <string name="confirm_map_cards_to_nothing">Сите неодбележани картички да бидат избришани. Ако белешката нема преостанати картички, таа ќе биде изгубена. Дали сте сигурни дека сакате да продолжите?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -325,10 +326,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-mk/10-preferences.xml b/AnkiDroid/src/main/res/values-mk/10-preferences.xml
index 2fc8ed4d26ce..c9287b8d0546 100644
--- a/AnkiDroid/src/main/res/values-mk/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-mk/10-preferences.xml
@@ -199,6 +199,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-mk/18-standard-models.xml b/AnkiDroid/src/main/res/values-mk/18-standard-models.xml
index 59d64739d93d..a43ef550990e 100644
--- a/AnkiDroid/src/main/res/values-mk/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-mk/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Front</string>
-    <string name="back_field_name" maxLength="28">Back</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Back</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ml/02-strings.xml b/AnkiDroid/src/main/res/values-ml/02-strings.xml
index 7810138f2cf1..692f83dc2997 100644
--- a/AnkiDroid/src/main/res/values-ml/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ml/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (“%2$s” ൽ നിന്ന്)</string>
     <string name="confirm_map_cards_to_nothing">ഒന്നുമില്ലാതെ മാപ്പുചെയ്ത ഏത് കാർഡുകളും ഇല്ലാതാക്കപ്പെടും. ഒരു കുറിപ്പിന് ശേഷിക്കുന്ന കാർഡുകളില്ലെങ്കിൽ, അത് നഷ്‌ടപ്പെടും. തുടരണമെന്ന് നിങ്ങൾക്ക് ഉറപ്പാണോ?</string>
     <string name="missing_note_type">നോട്ട് തരങ്ങളൊന്നും കണ്ടെത്തിയില്ല</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">ടൈംബോക്സ് എത്തി</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d കാർഡ് കുഴിച്ചിട്ടിട്ടില്ല</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">അത് രേഖപ്പെടുത്തുക</string>
     <string name="stop_recording">നിർത്തുക</string>
     <string name="play_recording">കളിക്കുക</string>
-    <string name="next_recording">അടുത്തത്</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">അടുത്തത്</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">കാർഡ് തരം ഇല്ലാതാക്കാൻ കഴിയില്ല</string>
     <string name="orphan_note_message">ഈ കാർഡ് തരം ഇല്ലാതാക്കുന്നത് ചില കുറിപ്പുകൾ കാർഡുകളില്ലാതെ അവശേഷിക്കും.</string>
diff --git a/AnkiDroid/src/main/res/values-ml/10-preferences.xml b/AnkiDroid/src/main/res/values-ml/10-preferences.xml
index 816a474a9446..0ef6b9243f8b 100644
--- a/AnkiDroid/src/main/res/values-ml/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ml/10-preferences.xml
@@ -198,6 +198,9 @@
     <string name="reset">പുനഃസജ്ജമാക്കുക</string>
     <string name="thirdparty_apps_title" maxLength="41">മൂന്നാം കക്ഷി API ആപ്പുകൾ</string>
     <string name="thirdparty_apps_summary">നിഘണ്ടുക്കളും യൂട്ടിലിറ്റികളും പോലുള്ള AnkiDroid API ഉപയോഗിക്കുന്ന ആപ്ലിക്കേഷനുകളുടെ ഒരു ലിസ്റ്റ് കാണുക.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">നിരൂപകൻ</string>
     <string name="show_deck_title" maxLength="41">ഡെക്ക് ശീർഷകം കാണിക്കുക</string>
diff --git a/AnkiDroid/src/main/res/values-ml/18-standard-models.xml b/AnkiDroid/src/main/res/values-ml/18-standard-models.xml
index 15ccc51bf53a..61143569c42b 100644
--- a/AnkiDroid/src/main/res/values-ml/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-ml/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">മുന്നിൽ</string>
-    <string name="back_field_name" maxLength="28">തിരികെ</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">തിരികെ</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-mn/02-strings.xml b/AnkiDroid/src/main/res/values-mn/02-strings.xml
index dcfb698e5e64..b2816001c6e1 100644
--- a/AnkiDroid/src/main/res/values-mn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-mn/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s(\"%2$s\"- с)</string>
     <string name="confirm_map_cards_to_nothing">Any cards mapped to nothing will be deleted. If a note has no remaining cards, it will be lost. Are you sure you want to continue?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-mn/10-preferences.xml b/AnkiDroid/src/main/res/values-mn/10-preferences.xml
index edd69700a9df..dd31ab0aba15 100644
--- a/AnkiDroid/src/main/res/values-mn/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-mn/10-preferences.xml
@@ -199,6 +199,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-mn/18-standard-models.xml b/AnkiDroid/src/main/res/values-mn/18-standard-models.xml
index 59d64739d93d..a43ef550990e 100644
--- a/AnkiDroid/src/main/res/values-mn/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-mn/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Front</string>
-    <string name="back_field_name" maxLength="28">Back</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Back</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-mr/02-strings.xml b/AnkiDroid/src/main/res/values-mr/02-strings.xml
index 13f8d49654d3..5267a244f88c 100644
--- a/AnkiDroid/src/main/res/values-mr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-mr/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s(Pāsūna \"%2$s\")</string>
     <string name="confirm_map_cards_to_nothing">Kāhīhī na kēlēlyā kōṇatyāhī kārḍānnā haṭavilē jā\'īla. Ṭīpakaḍē urvarita kārḍa nasalyāsa tō gamāvalā jā\'īla. Āpalyālā khātrī āhē kī āpaṇa surū ṭhēvū icchitā?</string>
     <string name="missing_note_type">नोट प्रकार आढळला नाही</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">टाइमबॉक्स गाठला</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d कार्ड अनबरी केले</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">बदलणे</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">रेकॉर्ड</string>
     <string name="stop_recording">थांबा</string>
     <string name="play_recording">खेळा</string>
-    <string name="next_recording">पुढे</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">पुढे</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-mr/10-preferences.xml b/AnkiDroid/src/main/res/values-mr/10-preferences.xml
index 7cb37be876d0..0b7ce76c75da 100644
--- a/AnkiDroid/src/main/res/values-mr/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-mr/10-preferences.xml
@@ -198,6 +198,9 @@
     <string name="reset">रीसेट करा</string>
     <string name="thirdparty_apps_title" maxLength="41">तृतीय-पक्ष API ॲप्स</string>
     <string name="thirdparty_apps_summary">AnkiDroid API वापरणाऱ्या अनुप्रयोगांची सूची पहा, जसे की शब्दकोश, उपयुक्तता.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">समीक्षक</string>
     <string name="show_deck_title" maxLength="41">डेक शीर्षक दर्शवा</string>
diff --git a/AnkiDroid/src/main/res/values-mr/18-standard-models.xml b/AnkiDroid/src/main/res/values-mr/18-standard-models.xml
index 24f8d9f322ad..0f82864e97ea 100644
--- a/AnkiDroid/src/main/res/values-mr/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-mr/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">समोर</string>
-    <string name="back_field_name" maxLength="28">मागे</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">मागे</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ms/02-strings.xml b/AnkiDroid/src/main/res/values-ms/02-strings.xml
index 53aa804d2d8a..37d2f89ab917 100644
--- a/AnkiDroid/src/main/res/values-ms/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ms/02-strings.xml
@@ -103,6 +103,7 @@
     <string name="field_remapping">%1$s (daripada “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Mana-mana kad yang dipetakan ke \"tiada\" akan dipadam. Jika suatu nota tiada baki kad, ia akan dipadam. Adakah anda mahu teruskan?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Kotak masa tercapai</string>
     <plurals name="timebox_reached">
@@ -318,10 +319,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-ms/10-preferences.xml b/AnkiDroid/src/main/res/values-ms/10-preferences.xml
index 94358a0dd5ef..4c969452b259 100644
--- a/AnkiDroid/src/main/res/values-ms/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ms/10-preferences.xml
@@ -197,6 +197,9 @@
     <string name="reset">Tetap semula</string>
     <string name="thirdparty_apps_title" maxLength="41">API aplikasi pihak ketiga</string>
     <string name="thirdparty_apps_summary">Lihat senarai aplikasi yang menggunakan API AnkiDroid seperti kamus, utiliti.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Penyemak</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-ms/18-standard-models.xml b/AnkiDroid/src/main/res/values-ms/18-standard-models.xml
index 4a20598192dd..55f7c8ec6081 100644
--- a/AnkiDroid/src/main/res/values-ms/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-ms/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Hadapan</string>
-    <string name="back_field_name" maxLength="28">Belakang</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Belakang</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-my/02-strings.xml b/AnkiDroid/src/main/res/values-my/02-strings.xml
index fb9a40012630..01844efbc801 100644
--- a/AnkiDroid/src/main/res/values-my/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-my/02-strings.xml
@@ -103,6 +103,7 @@
     <string name="field_remapping">%1$s (from “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Any cards mapped to nothing will be deleted. If a note has no remaining cards, it will be lost. Are you sure you want to continue?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -318,10 +319,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-my/10-preferences.xml b/AnkiDroid/src/main/res/values-my/10-preferences.xml
index 3f9dd4876545..4ab0154dd5d3 100644
--- a/AnkiDroid/src/main/res/values-my/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-my/10-preferences.xml
@@ -197,6 +197,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-my/18-standard-models.xml b/AnkiDroid/src/main/res/values-my/18-standard-models.xml
index 59d64739d93d..a43ef550990e 100644
--- a/AnkiDroid/src/main/res/values-my/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-my/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Front</string>
-    <string name="back_field_name" maxLength="28">Back</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Back</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-nl/02-strings.xml b/AnkiDroid/src/main/res/values-nl/02-strings.xml
index 0e691094f539..0ce34daba367 100644
--- a/AnkiDroid/src/main/res/values-nl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-nl/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (van “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">De kaarten toegewezen aan niets zullen worden verwijderd. Als een memo resterende kaarten heeft, zullen zij verloren gaan. Weet u zeker dat u wilt doorgaan?</string>
     <string name="missing_note_type">Geen notitietype gevonden</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox bereikt</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d kaarten onbegraven</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Verplaatsen</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Opnemen</string>
     <string name="stop_recording">Stoppen</string>
     <string name="play_recording">Afspelen</string>
-    <string name="next_recording">Volgende</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Volgende</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Kan kaarttype niet verwijderen</string>
     <string name="orphan_note_message">Als je dit kaarttype verwijdert, zullen sommige notities geen kaarten meer hebben.</string>
diff --git a/AnkiDroid/src/main/res/values-nl/10-preferences.xml b/AnkiDroid/src/main/res/values-nl/10-preferences.xml
index d63c91d5cfe3..e1e4c54e1c97 100644
--- a/AnkiDroid/src/main/res/values-nl/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-nl/10-preferences.xml
@@ -198,6 +198,9 @@
     <string name="reset">Resetten</string>
     <string name="thirdparty_apps_title" maxLength="41">API-apps van derden</string>
     <string name="thirdparty_apps_summary">Raadpleeg de lijst van applicaties die gebruik maken van de AnkiDroid API zoals woordenboeken, hulpprogramma\'s.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Settitel weergeven</string>
diff --git a/AnkiDroid/src/main/res/values-nl/18-standard-models.xml b/AnkiDroid/src/main/res/values-nl/18-standard-models.xml
index 9b6acc93804c..7f12c9599ff8 100644
--- a/AnkiDroid/src/main/res/values-nl/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-nl/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Voorkant</string>
-    <string name="back_field_name" maxLength="28">Achterzijde</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Achterzijde</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-nn/02-strings.xml b/AnkiDroid/src/main/res/values-nn/02-strings.xml
index 71e4fa3cf337..903caae0b6a3 100644
--- a/AnkiDroid/src/main/res/values-nn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-nn/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (fra “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Alle kort som ikke er tilordnet noe vil slettes. Hvis et notat ikke har kort igjen, vil det gå tapt. Er du sikker du vil fortsette?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-nn/10-preferences.xml b/AnkiDroid/src/main/res/values-nn/10-preferences.xml
index 75db7a8513e6..995ab37bef2b 100644
--- a/AnkiDroid/src/main/res/values-nn/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-nn/10-preferences.xml
@@ -199,6 +199,9 @@
     <string name="reset">Tilbakestill</string>
     <string name="thirdparty_apps_title" maxLength="41">Tredjeparts API apper</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-nn/18-standard-models.xml b/AnkiDroid/src/main/res/values-nn/18-standard-models.xml
index 874581ccc3a4..487bfc9a668a 100644
--- a/AnkiDroid/src/main/res/values-nn/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-nn/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Framside</string>
-    <string name="back_field_name" maxLength="28">Bakside</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Bakside</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-no/02-strings.xml b/AnkiDroid/src/main/res/values-no/02-strings.xml
index b8e0cf2f800f..2ce111fb5451 100644
--- a/AnkiDroid/src/main/res/values-no/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-no/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (fra “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Alle kort som ikke er tilordnet noe vil slettes. Hvis et notat ikke har kort igjen, vil det gå tapt. Er du sikker du vil fortsette?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-no/10-preferences.xml b/AnkiDroid/src/main/res/values-no/10-preferences.xml
index e2cffc310d35..bb0dd0f1135e 100644
--- a/AnkiDroid/src/main/res/values-no/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-no/10-preferences.xml
@@ -199,6 +199,9 @@
     <string name="reset">Tilbakestill</string>
     <string name="thirdparty_apps_title" maxLength="41">Tredjeparts API apper</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-no/18-standard-models.xml b/AnkiDroid/src/main/res/values-no/18-standard-models.xml
index f108ac9c69f8..4b11aa633548 100644
--- a/AnkiDroid/src/main/res/values-no/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-no/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Forsiden</string>
-    <string name="back_field_name" maxLength="28">Baksiden</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Baksiden</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-or/02-strings.xml b/AnkiDroid/src/main/res/values-or/02-strings.xml
index 1368632cd8ec..dfc3c40943c0 100644
--- a/AnkiDroid/src/main/res/values-or/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-or/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (“%2$s” ରୁ)</string>
     <string name="confirm_map_cards_to_nothing">କୌଣସି ଜିନିଷକୁ ମ୍ୟାପ୍ ନହୋଇ ଥିବା ପତ୍ରସବୁ ବିଲୋପ ହେବ। ଯଦି କୌଣସି ନୋଟ୍ ର ଅବଶିଷ୍ଟ ପତ୍ର ନଥାଏ, ତେବେ ଏହା ନଷ୍ଟ ହୋଇଯିବ। ଆପଣ ଜାରି ରଖିବାକୁ ଚାହୁଁଛନ୍ତି କି?</string>
     <string name="missing_note_type">କୌଣସି ନୋଟ୍ ପ୍ରକାର ମିଳିଲା ନାହିଁ</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">ସମୟବାକ୍ସ ପହଞ୍ଚିଛି</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">ଚାଳନ କରିବା</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-or/10-preferences.xml b/AnkiDroid/src/main/res/values-or/10-preferences.xml
index c1ace4a21e87..59c380d7c8a7 100644
--- a/AnkiDroid/src/main/res/values-or/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-or/10-preferences.xml
@@ -198,6 +198,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">ତୃତୀୟ-ପକ୍ଷ API ଆପ୍ ସମୂହ</string>
     <string name="thirdparty_apps_summary">ଆପ୍ଲିକେସନଗୁଡ଼ିକର ଏକ ତାଲିକା ଦେଖନ୍ତୁ ଯାହା AnkiDroid API ଯେପରିକି ଅଭିଧାନ, ଉପଯୋଗୀତା ର ବ୍ୟବହାର କରନ୍ତି।</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">ସମୀକ୍ଷକ</string>
     <string name="show_deck_title" maxLength="41">ତାସଖଣ୍ଡ ଆଖ୍ୟା ଦେଖାଇବା</string>
diff --git a/AnkiDroid/src/main/res/values-or/18-standard-models.xml b/AnkiDroid/src/main/res/values-or/18-standard-models.xml
index fa307e5892e0..1af370d3ca5d 100644
--- a/AnkiDroid/src/main/res/values-or/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-or/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">ସାମ୍ନା</string>
-    <string name="back_field_name" maxLength="28">ପଛ</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">ପଛ</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-pa/02-strings.xml b/AnkiDroid/src/main/res/values-pa/02-strings.xml
index 3072c87d5673..7c81686ef999 100644
--- a/AnkiDroid/src/main/res/values-pa/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-pa/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (“%2$s” ਤੋਂ)</string>
     <string name="confirm_map_cards_to_nothing">ਕਿਸੇ ਵੀ ਕਾਰਡ ਨੂੰ ਕੁਝ ਵੀ ਨਹੀਂ ਨਾਲ ਮੈਪ ਕੀਤਾ ਜਾਵੇਗਾ ਮਿਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ। ਜੇਕਰ ਕਿਸੇ ਨੋਟ ਵਿੱਚ ਕੋਈ ਕਾਰਡ ਨਹੀਂ ਬਚਿਆ ਹੈ, ਤਾਂ ਇਹ ਗੁੰਮ ਹੋ ਜਾਵੇਗਾ। ਕੀ ਤੁਸੀਂ ਯਕੀਨੀ ਤੌਰ \'ਤੇ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?</string>
     <string name="missing_note_type">ਕੋਈ ਨੋਟ ਕਿਸਮ ਨਹੀਂ ਮਿਲੀ</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">ਟਾਈਮਬਾਕਸ ਪਹੁੰਚ ਗਿਆ</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d ਕਾਰਡ ਅਣਦਫਨ ਕੀਤੇ ਗਏ</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">ਰਿਕਾਰਡ</string>
     <string name="stop_recording">ਪਕੜਨਾ</string>
     <string name="play_recording">ਖੇਡੋ</string>
-    <string name="next_recording">ਅਗਲਾ</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">ਅਗਲਾ</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">ਕਾਰਡ ਦੀ ਕਿਸਮ ਨੂੰ ਮਿਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ</string>
     <string name="orphan_note_message">ਇਸ ਕਾਰਡ ਦੀ ਕਿਸਮ ਨੂੰ ਮਿਟਾਉਣ ਨਾਲ ਕੁਝ ਨੋਟ ਬਿਨਾਂ ਕਿਸੇ ਕਾਰਡ ਦੇ ਰਹਿ ਜਾਣਗੇ।</string>
diff --git a/AnkiDroid/src/main/res/values-pa/10-preferences.xml b/AnkiDroid/src/main/res/values-pa/10-preferences.xml
index b68438511533..017234c001cd 100644
--- a/AnkiDroid/src/main/res/values-pa/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-pa/10-preferences.xml
@@ -199,6 +199,9 @@
     <string name="reset">ਰੀਸੈਟ ਕਰੋ</string>
     <string name="thirdparty_apps_title" maxLength="41">ਤੀਜੀ-ਧਿਰ API ਐਪਸ</string>
     <string name="thirdparty_apps_summary">ਐਪਲੀਕੇਸ਼ਨਾਂ ਦੀ ਇੱਕ ਸੂਚੀ ਵੇਖੋ ਜੋ AnkiDroid API ਦੀ ਵਰਤੋਂ ਕਰਦੀਆਂ ਹਨ ਜਿਵੇਂ ਕਿ ਸ਼ਬਦਕੋਸ਼, ਉਪਯੋਗਤਾਵਾਂ।</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">ਸਮੀਖਿਅਕ</string>
     <string name="show_deck_title" maxLength="41">ਡੇਕ ਸਿਰਲੇਖ ਦਿਖਾਓ</string>
diff --git a/AnkiDroid/src/main/res/values-pa/18-standard-models.xml b/AnkiDroid/src/main/res/values-pa/18-standard-models.xml
index 38e0a994a3fe..ef36e2345255 100644
--- a/AnkiDroid/src/main/res/values-pa/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-pa/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">ਸਾਹਮਣੇ</string>
-    <string name="back_field_name" maxLength="28">ਪਿੱਛੇ</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">ਪਿੱਛੇ</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-pl/02-strings.xml b/AnkiDroid/src/main/res/values-pl/02-strings.xml
index d59b4068bf2b..193ef2678883 100644
--- a/AnkiDroid/src/main/res/values-pl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-pl/02-strings.xml
@@ -106,6 +106,7 @@
     <string name="field_remapping">%1$s (z “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Wszystkie nieprzypisane karty zostaną usunięte. Jeśli notatka nie zawiera już kart, również zostanie usunięta. Czy na pewno chcesz kontynuować?</string>
     <string name="missing_note_type">Nie znaleziono typu notatki</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Osiągnięto limit czasu</string>
     <plurals name="timebox_reached">
@@ -336,10 +337,12 @@
         <item quantity="other">%d kart odkopano</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Zmień pozycję</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Nagraj</string>
     <string name="stop_recording">Zatrzymaj</string>
     <string name="play_recording">Odtwórz</string>
-    <string name="next_recording">Dalej</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Dalej</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Nie można usunąć typu karty</string>
     <string name="orphan_note_message">Usunięcie tej karty spowoduje pozostawienie niektórych notatek bez żadnej karty.</string>
diff --git a/AnkiDroid/src/main/res/values-pl/10-preferences.xml b/AnkiDroid/src/main/res/values-pl/10-preferences.xml
index c6774d80644b..63bbf783c06e 100644
--- a/AnkiDroid/src/main/res/values-pl/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-pl/10-preferences.xml
@@ -202,6 +202,9 @@
     <string name="reset">Zresetuj</string>
     <string name="thirdparty_apps_title" maxLength="41">API aplikacji stron trzecich</string>
     <string name="thirdparty_apps_summary">Zobacz listę aplikacji, które używają API AnkiDroid takie jak słowniki, narzędzia.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Ekran nauki</string>
     <string name="show_deck_title" maxLength="41">Pokaż tytuł talii</string>
diff --git a/AnkiDroid/src/main/res/values-pl/18-standard-models.xml b/AnkiDroid/src/main/res/values-pl/18-standard-models.xml
index b6bd7d0e63bc..023fcd55909e 100644
--- a/AnkiDroid/src/main/res/values-pl/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-pl/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Przód</string>
-    <string name="back_field_name" maxLength="28">Tył</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Tył</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml b/AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml
index d31ed8285f66..954ea04fd1a1 100644
--- a/AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (de \'%2$s\')</string>
     <string name="confirm_map_cards_to_nothing">Quaisquer cards não-mapeados serão removidos. Se não houverem cards para uma nota, ela será perdida. Tem certeza de que deseja continuar?</string>
     <string name="missing_note_type">Nenhum tipo de nota encontrado</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Caixa do tempo alcançada</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d cartões desenterrados</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposicionar</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Gravar</string>
     <string name="stop_recording">Parar</string>
     <string name="play_recording">Reproduzir</string>
-    <string name="next_recording">Próximo</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Próximo</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Não é possível excluir tipo de cartão</string>
     <string name="orphan_note_message">Deletar essa categoria de cartão deixará algumas notas sem cartão</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rBR/10-preferences.xml b/AnkiDroid/src/main/res/values-pt-rBR/10-preferences.xml
index 2ef896681794..ee215920763c 100644
--- a/AnkiDroid/src/main/res/values-pt-rBR/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-pt-rBR/10-preferences.xml
@@ -198,6 +198,9 @@
     <string name="reset">Redefinir</string>
     <string name="thirdparty_apps_title" maxLength="41">Apps de terceiros</string>
     <string name="thirdparty_apps_summary">Veja uma lista de aplicativos que usam a API do AnkiDroid, como dicionários, ferramentas.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Revisor</string>
     <string name="show_deck_title" maxLength="41">Mostrar título do baralho</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rBR/18-standard-models.xml b/AnkiDroid/src/main/res/values-pt-rBR/18-standard-models.xml
index c23a2edc4e0c..5be29c944a3b 100644
--- a/AnkiDroid/src/main/res/values-pt-rBR/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-pt-rBR/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Frente</string>
-    <string name="back_field_name" maxLength="28">Verso</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Verso</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml b/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml
index 7bfcc20996a1..b11bb8d0f0f7 100644
--- a/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (de \"%2$s\")</string>
     <string name="confirm_map_cards_to_nothing">Serão eliminadas quaisquer fichas mapeadas para nada. Se uma nota não tiver fichas restantes, esta estará perdida. Tem certeza que deseja continuar?</string>
     <string name="missing_note_type">Tipo de nota não encontrado</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Limite de Tempo Atingido</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d fichas com adiamento cancelado</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposicionar</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Gravar</string>
     <string name="stop_recording">Interromper</string>
     <string name="play_recording">Reproduzir</string>
-    <string name="next_recording">Próxima</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Próxima</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Não é possível apagar este tipo de ficha</string>
     <string name="orphan_note_message">Apagar este tipo de ficha implica deixar algumas notas sem fichas.</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rPT/10-preferences.xml b/AnkiDroid/src/main/res/values-pt-rPT/10-preferences.xml
index 4174c778e421..ca6b6cedfc1c 100644
--- a/AnkiDroid/src/main/res/values-pt-rPT/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-pt-rPT/10-preferences.xml
@@ -199,6 +199,9 @@
     <string name="reset">Redefinir</string>
     <string name="thirdparty_apps_title" maxLength="41">Aplicações utilizadoras da API</string>
     <string name="thirdparty_apps_summary">Veja a lista de aplicações que utilizam a API do AnkiDroid, tal como dicionários, ou ferramentas.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Ecrã de Revisão</string>
     <string name="show_deck_title" maxLength="41">Mostrar o título do baralho</string>
diff --git a/AnkiDroid/src/main/res/values-pt-rPT/18-standard-models.xml b/AnkiDroid/src/main/res/values-pt-rPT/18-standard-models.xml
index c23a2edc4e0c..5be29c944a3b 100644
--- a/AnkiDroid/src/main/res/values-pt-rPT/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-pt-rPT/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Frente</string>
-    <string name="back_field_name" maxLength="28">Verso</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Verso</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ro/02-strings.xml b/AnkiDroid/src/main/res/values-ro/02-strings.xml
index 6a3f59c65a6a..dfdc25953edb 100644
--- a/AnkiDroid/src/main/res/values-ro/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ro/02-strings.xml
@@ -105,6 +105,7 @@
     <string name="field_remapping">%1$s (from “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Any cards mapped to nothing will be deleted. If a note has no remaining cards, it will be lost. Are you sure you want to continue?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -330,10 +331,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-ro/10-preferences.xml b/AnkiDroid/src/main/res/values-ro/10-preferences.xml
index ad43dc8823a3..3a98aeb80d5e 100644
--- a/AnkiDroid/src/main/res/values-ro/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ro/10-preferences.xml
@@ -201,6 +201,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-ro/18-standard-models.xml b/AnkiDroid/src/main/res/values-ro/18-standard-models.xml
index 179166306818..b9d144c66422 100644
--- a/AnkiDroid/src/main/res/values-ro/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-ro/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Față</string>
-    <string name="back_field_name" maxLength="28">Spate</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Spate</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ru/02-strings.xml b/AnkiDroid/src/main/res/values-ru/02-strings.xml
index b0635238f8c1..295baf022aba 100644
--- a/AnkiDroid/src/main/res/values-ru/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ru/02-strings.xml
@@ -106,6 +106,7 @@
     <string name="field_remapping">%1$s (из «%2$s»)</string>
     <string name="confirm_map_cards_to_nothing">Несопоставленные карты будут удалены. Записи, оставшиеся без карт, будут утеряны. Продолжить?</string>
     <string name="missing_note_type">Такого типа заметок не найдено</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Достигнут лимит учебного блока</string>
     <plurals name="timebox_reached">
@@ -336,10 +337,12 @@
         <item quantity="other">%d карточек возвращено</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Переместить</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Записать</string>
     <string name="stop_recording">Стоп</string>
     <string name="play_recording">Играть</string>
-    <string name="next_recording">След.</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">След.</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Не удается удалить тип карточек</string>
     <string name="orphan_note_message">Удаление этого типа карточек оставит некоторые записи без карточек.</string>
diff --git a/AnkiDroid/src/main/res/values-ru/10-preferences.xml b/AnkiDroid/src/main/res/values-ru/10-preferences.xml
index c0e4b8ccdfe8..69be697d508d 100644
--- a/AnkiDroid/src/main/res/values-ru/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ru/10-preferences.xml
@@ -202,6 +202,9 @@
     <string name="reset">Сброс</string>
     <string name="thirdparty_apps_title" maxLength="41">Сторонние приложения</string>
     <string name="thirdparty_apps_summary">Покажет список приложений, которые используют API AnkiDroid, например, словари</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Повторение</string>
     <string name="show_deck_title" maxLength="41">Показывать название колоды</string>
diff --git a/AnkiDroid/src/main/res/values-ru/18-standard-models.xml b/AnkiDroid/src/main/res/values-ru/18-standard-models.xml
index 0fe92996749a..7dce2fb755a0 100644
--- a/AnkiDroid/src/main/res/values-ru/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-ru/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Лицо</string>
-    <string name="back_field_name" maxLength="28">Оборот</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Оборот</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-sat/02-strings.xml b/AnkiDroid/src/main/res/values-sat/02-strings.xml
index 75d272c5b3c8..be20aea38cb6 100644
--- a/AnkiDroid/src/main/res/values-sat/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sat/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (“%2$s” ᱠᱷᱚᱱ)</string>
     <string name="confirm_map_cards_to_nothing">ᱡᱟᱷᱟᱭ ᱠᱟᱰ ᱵᱟᱭ ᱢᱮᱯ ᱠᱚᱜᱼᱟ ᱚᱱᱟ ᱠᱟᱲ ᱫᱚ ᱜᱮᱫ ᱜᱤᱰᱤᱜᱼᱟ ᱾ ᱡᱚᱫᱤ ᱠᱷᱟᱴᱚ ᱵᱤᱪᱟᱹᱨ ᱨᱮ ᱠᱟᱰ ᱵᱟᱝ ᱛᱟᱦᱮᱱᱟ ᱠᱷᱟᱱ ᱪᱮᱫ ᱢᱟᱱᱮ ᱵᱟᱝ ᱛᱟᱦᱮᱱᱟ ᱾ ᱢᱤᱫ ᱞᱮᱛᱟᱲ ᱥᱮᱱᱟᱢ ᱠᱟᱱᱟ?</string>
     <string name="missing_note_type">ᱪᱮᱫ ᱞᱮᱠᱟᱱ ᱱᱳᱴ ᱠᱚ ᱧᱟᱢ ᱟᱠᱟᱱᱟ</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">ᱚᱠᱛᱚᱵᱚᱠᱥᱟ ᱥᱮᱴᱮᱨᱟ ᱠᱟᱱᱟ</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d ᱵᱟᱝ ᱥᱮᱞᱮᱫ ᱟᱠᱟᱱ ᱠᱟᱨᱰ</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">ᱨᱤᱯᱳᱡᱤᱥᱚᱱ</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">ᱨᱮᱠᱳᱨᱰ</string>
     <string name="stop_recording">ᱛᱷᱟᱯᱚᱱ</string>
     <string name="play_recording">ᱯᱞᱮ</string>
-    <string name="next_recording">ᱱᱮᱛᱟᱨ</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">ᱱᱮᱛᱟᱨ</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">ᱠᱟᱨᱰ ᱴᱟᱭᱯ ᱵᱟᱭ ᱵᱚᱫᱚᱞ ᱫᱟᱲᱮᱭᱟᱜ-ᱟ</string>
     <string name="orphan_note_message">ᱱᱚᱶᱟ ᱠᱟᱨᱰ ᱨᱮᱱᱟᱜ ᱛᱟᱹᱞᱠᱟᱹ ᱵᱚᱫᱚᱞ ᱞᱮᱠᱷᱟᱱ ᱠᱟᱨᱰ ᱵᱟᱹᱱᱩᱜ ᱟᱠᱟᱱ ᱟᱭᱢᱟ ᱱᱳᱴᱥ ᱠᱚ ᱵᱚᱫᱚᱞᱚᱜ-ᱟ᱾</string>
diff --git a/AnkiDroid/src/main/res/values-sat/10-preferences.xml b/AnkiDroid/src/main/res/values-sat/10-preferences.xml
index f7201526d3d7..caac12c94767 100644
--- a/AnkiDroid/src/main/res/values-sat/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sat/10-preferences.xml
@@ -198,6 +198,9 @@
     <string name="reset">ᱨᱤᱥᱮᱴ</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">ᱨᱤᱯᱤᱴᱟᱨ</string>
     <string name="show_deck_title" maxLength="41">ᱰᱮᱠ ᱨᱮᱱᱟᱜ ᱧᱩᱛᱩᱢ ᱧᱮᱞᱢᱮ</string>
diff --git a/AnkiDroid/src/main/res/values-sat/18-standard-models.xml b/AnkiDroid/src/main/res/values-sat/18-standard-models.xml
index 9b57a2e625fb..ca73bbf2e3e0 100644
--- a/AnkiDroid/src/main/res/values-sat/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-sat/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">ᱥᱟᱢᱟᱝ</string>
-    <string name="back_field_name" maxLength="28">ᱛᱟᱭᱚᱢ</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">ᱛᱟᱭᱚᱢ</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-sc/02-strings.xml b/AnkiDroid/src/main/res/values-sc/02-strings.xml
index 4a4076240a93..f4752c747274 100644
--- a/AnkiDroid/src/main/res/values-sc/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sc/02-strings.xml
@@ -106,6 +106,7 @@
     <string name="field_remapping">%1$s (dae “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Sas cartas chene connessiones s\'ant a iscantzellare. Si una nota non tenet prus cartas s\'at a pèrdere. Ses seguru de chèrrere sighire?</string>
     <string name="missing_note_type">Peruna casta de nota atzapada</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Lìmite de tempus barigadu</string>
     <plurals name="timebox_reached">
@@ -327,10 +328,12 @@
         <item quantity="other">%d cartas no interradas</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Muda de positzione</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Registra</string>
     <string name="stop_recording">Firma</string>
     <string name="play_recording">Riprodui</string>
-    <string name="next_recording">Imbeniente</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Imbeniente</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Non faghet a cantzellare sa casta de carta</string>
     <string name="orphan_note_message">S\'iscantzelladura de custa casta de carta at a lassare unas cantas notas chene carta peruna.</string>
diff --git a/AnkiDroid/src/main/res/values-sc/10-preferences.xml b/AnkiDroid/src/main/res/values-sc/10-preferences.xml
index f69a46f43ba3..5b2bf936ae74 100644
--- a/AnkiDroid/src/main/res/values-sc/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sc/10-preferences.xml
@@ -198,6 +198,9 @@
     <string name="reset">Reseta</string>
     <string name="thirdparty_apps_title" maxLength="41">Aplicatziones API esternas (de tertzas partes)</string>
     <string name="thirdparty_apps_summary">Pòmpia·ti una lista de aplicatziones chi impreant s\'API de AnkiDroid che a ditzionàrios o àteras ainas.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Revisore</string>
     <string name="show_deck_title" maxLength="41">Ammustra su tìtulu de su matzu</string>
diff --git a/AnkiDroid/src/main/res/values-sc/18-standard-models.xml b/AnkiDroid/src/main/res/values-sc/18-standard-models.xml
index 7754daf3133f..7b8cef72c327 100644
--- a/AnkiDroid/src/main/res/values-sc/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-sc/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Fronte</string>
-    <string name="back_field_name" maxLength="28">Parte de segus</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Parte de segus</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-sk/02-strings.xml b/AnkiDroid/src/main/res/values-sk/02-strings.xml
index 45ba852b4cd1..56e57fb422a2 100644
--- a/AnkiDroid/src/main/res/values-sk/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sk/02-strings.xml
@@ -106,6 +106,7 @@
     <string name="field_remapping">%1$s (z “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Akékoľvek kartičky, ktoré nie sú na nič mapované, budú zmazané. Ak poznámka nemá žiadne zostávajúce kartičky, bude stratená. Ste si istý, že chcete pokračovať?</string>
     <string name="missing_note_type">Chýba typ poznámky</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Dosiahol sa limit pre časový box</string>
     <plurals name="timebox_reached">
@@ -336,10 +337,12 @@
         <item quantity="other">%d kartičiek vyhrabaných</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Zmeniť poradie</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Nahrávať</string>
     <string name="stop_recording">Zastaviť</string>
     <string name="play_recording">Prehrať</string>
-    <string name="next_recording">Ďalej</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Ďalej</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-sk/10-preferences.xml b/AnkiDroid/src/main/res/values-sk/10-preferences.xml
index 7115061d6573..d82b574f3f85 100644
--- a/AnkiDroid/src/main/res/values-sk/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sk/10-preferences.xml
@@ -203,6 +203,9 @@
     <string name="reset">Obnoviť</string>
     <string name="thirdparty_apps_title" maxLength="41">Aplikácie API od tretích strán</string>
     <string name="thirdparty_apps_summary">Pozrite si zoznam aplikácií, ktoré využívajú Ankidroid API ako sú slovníky, služby.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Náhľad počas štúdia</string>
     <string name="show_deck_title" maxLength="41">Ukázať názov balíčka</string>
diff --git a/AnkiDroid/src/main/res/values-sk/18-standard-models.xml b/AnkiDroid/src/main/res/values-sk/18-standard-models.xml
index 71fc21b5923f..ab1534c7d33e 100644
--- a/AnkiDroid/src/main/res/values-sk/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-sk/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Predná strana</string>
-    <string name="back_field_name" maxLength="28">Zadná strana</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Zadná strana</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-sl/02-strings.xml b/AnkiDroid/src/main/res/values-sl/02-strings.xml
index 24fb37cbae39..dcea12db5a00 100644
--- a/AnkiDroid/src/main/res/values-sl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sl/02-strings.xml
@@ -106,6 +106,7 @@
     <string name="field_remapping">%1$s (od \"%2$s\")</string>
     <string name="confirm_map_cards_to_nothing">Vse kartice, ki so preslikane v nič, bodo izbrisane. Če zapisek nima preostalih kartic, bo izgubljen. Ali res želite nadaljevati?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -336,10 +337,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-sl/10-preferences.xml b/AnkiDroid/src/main/res/values-sl/10-preferences.xml
index c4e9476ae1cc..940b4ce434be 100644
--- a/AnkiDroid/src/main/res/values-sl/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sl/10-preferences.xml
@@ -203,6 +203,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-sl/18-standard-models.xml b/AnkiDroid/src/main/res/values-sl/18-standard-models.xml
index 59d64739d93d..a43ef550990e 100644
--- a/AnkiDroid/src/main/res/values-sl/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-sl/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Front</string>
-    <string name="back_field_name" maxLength="28">Back</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Back</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-sq/02-strings.xml b/AnkiDroid/src/main/res/values-sq/02-strings.xml
index 029f25f457bb..7c9240014cc1 100644
--- a/AnkiDroid/src/main/res/values-sq/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sq/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (from “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Any cards mapped to nothing will be deleted. If a note has no remaining cards, it will be lost. Are you sure you want to continue?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-sq/10-preferences.xml b/AnkiDroid/src/main/res/values-sq/10-preferences.xml
index 8d49177684a2..ff647bafaf11 100644
--- a/AnkiDroid/src/main/res/values-sq/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sq/10-preferences.xml
@@ -199,6 +199,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-sq/18-standard-models.xml b/AnkiDroid/src/main/res/values-sq/18-standard-models.xml
index 59d64739d93d..a43ef550990e 100644
--- a/AnkiDroid/src/main/res/values-sq/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-sq/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Front</string>
-    <string name="back_field_name" maxLength="28">Back</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Back</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-sr/02-strings.xml b/AnkiDroid/src/main/res/values-sr/02-strings.xml
index c39fa441dc0e..9939dfa75b78 100644
--- a/AnkiDroid/src/main/res/values-sr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sr/02-strings.xml
@@ -105,6 +105,7 @@
     <string name="field_remapping">%1$s (од \'%2$s\')</string>
     <string name="confirm_map_cards_to_nothing">Немапиране карте ће бити избрисане. Напомене, које немају своје карте, биће изгубљене. Да продужим?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -330,10 +331,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-sr/10-preferences.xml b/AnkiDroid/src/main/res/values-sr/10-preferences.xml
index dc4e2ea5b0ad..b43434368c9c 100644
--- a/AnkiDroid/src/main/res/values-sr/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sr/10-preferences.xml
@@ -201,6 +201,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-sr/18-standard-models.xml b/AnkiDroid/src/main/res/values-sr/18-standard-models.xml
index 59d64739d93d..a43ef550990e 100644
--- a/AnkiDroid/src/main/res/values-sr/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-sr/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Front</string>
-    <string name="back_field_name" maxLength="28">Back</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Back</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ss/02-strings.xml b/AnkiDroid/src/main/res/values-ss/02-strings.xml
index 5e4fab69ad3c..fec7efe184db 100644
--- a/AnkiDroid/src/main/res/values-ss/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ss/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (from “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Any cards mapped to nothing will be deleted. If a note has no remaining cards, it will be lost. Are you sure you want to continue?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-ss/10-preferences.xml b/AnkiDroid/src/main/res/values-ss/10-preferences.xml
index 8d49177684a2..ff647bafaf11 100644
--- a/AnkiDroid/src/main/res/values-ss/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ss/10-preferences.xml
@@ -199,6 +199,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-ss/18-standard-models.xml b/AnkiDroid/src/main/res/values-ss/18-standard-models.xml
index 59d64739d93d..a43ef550990e 100644
--- a/AnkiDroid/src/main/res/values-ss/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-ss/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Front</string>
-    <string name="back_field_name" maxLength="28">Back</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Back</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-sv/02-strings.xml b/AnkiDroid/src/main/res/values-sv/02-strings.xml
index 912172f05bc6..78f0c1f3020a 100644
--- a/AnkiDroid/src/main/res/values-sv/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sv/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (från \"%2$s\")</string>
     <string name="confirm_map_cards_to_nothing">Alla kort som inte kopplar till något kommer att tas bort. Om en not inte har några kvarvarande kort, kommer den att försvinna. Är du säker på att du vill fortsätta?</string>
     <string name="missing_note_type">Anteckningstyp saknas</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Tidsruta har uppnåtts</string>
     <plurals name="timebox_reached">
@@ -325,10 +326,12 @@
         <item quantity="other">%d kort slutade gömmas</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Flytta på</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Spela in</string>
     <string name="stop_recording">Stoppa</string>
     <string name="play_recording">Spela upp</string>
-    <string name="next_recording">Nästa</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Nästa</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Kan inte ta bort kort typ</string>
     <string name="orphan_note_message">Om du tar bort denna kort typ så kommer det finnas noter utan kort.</string>
diff --git a/AnkiDroid/src/main/res/values-sv/10-preferences.xml b/AnkiDroid/src/main/res/values-sv/10-preferences.xml
index 4157b6f29f87..259a806f7d3c 100644
--- a/AnkiDroid/src/main/res/values-sv/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sv/10-preferences.xml
@@ -198,6 +198,9 @@
     <string name="reset">Nollställ</string>
     <string name="thirdparty_apps_title" maxLength="41">Tredjeparts API-appar</string>
     <string name="thirdparty_apps_summary">Se en lista över alla applikationer som använder AnkiDroids API, exempelvis ordböcker och händiga verktyg.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Repeterare</string>
     <string name="show_deck_title" maxLength="41">Visa kortlekens titel</string>
diff --git a/AnkiDroid/src/main/res/values-sv/18-standard-models.xml b/AnkiDroid/src/main/res/values-sv/18-standard-models.xml
index c764bbb8e32b..28f16ee2f302 100644
--- a/AnkiDroid/src/main/res/values-sv/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-sv/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Framsida</string>
-    <string name="back_field_name" maxLength="28">Baksida</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Baksida</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-sw/02-strings.xml b/AnkiDroid/src/main/res/values-sw/02-strings.xml
index 5e4fab69ad3c..fec7efe184db 100644
--- a/AnkiDroid/src/main/res/values-sw/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-sw/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (from “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Any cards mapped to nothing will be deleted. If a note has no remaining cards, it will be lost. Are you sure you want to continue?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-sw/10-preferences.xml b/AnkiDroid/src/main/res/values-sw/10-preferences.xml
index 8d49177684a2..ff647bafaf11 100644
--- a/AnkiDroid/src/main/res/values-sw/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-sw/10-preferences.xml
@@ -199,6 +199,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-sw/18-standard-models.xml b/AnkiDroid/src/main/res/values-sw/18-standard-models.xml
index 59d64739d93d..a43ef550990e 100644
--- a/AnkiDroid/src/main/res/values-sw/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-sw/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Front</string>
-    <string name="back_field_name" maxLength="28">Back</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Back</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ta/02-strings.xml b/AnkiDroid/src/main/res/values-ta/02-strings.xml
index b5aa0fa2f03c..25673ec08831 100644
--- a/AnkiDroid/src/main/res/values-ta/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ta/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (“%2$s” இலிருந்து)</string>
     <string name="confirm_map_cards_to_nothing">எதுவும் இல்லை என்று வரைபடமாக்கப்படும் எந்த அட்டைகளும் நீக்கப்படும். ஒரு குறிப்பில் மீதமுள்ள அட்டைகள் இல்லை என்றால், அது இழக்கப்படும். நீங்கள் நிச்சயமாகத் தொடர விரும்புகிறீர்களா?</string>
     <string name="missing_note_type">குறிப்பு வகை இல்லை</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">டைம்பாக்ஸை அடைந்தது</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d கார்டுகள் புதைக்கப்படவில்லை</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">இடமாற்றம்</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">பதிவு</string>
     <string name="stop_recording">நிறுத்து</string>
     <string name="play_recording">ஓட்டுக</string>
-    <string name="next_recording">அடுத்து</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">அடுத்து</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">அட்டை வகையை நீக்க முடியாது</string>
     <string name="orphan_note_message">இந்தக் கார்டு வகையை நீக்கினால் சில குறிப்புகள் கார்டு இல்லாமல் இருக்கும்.</string>
diff --git a/AnkiDroid/src/main/res/values-ta/10-preferences.xml b/AnkiDroid/src/main/res/values-ta/10-preferences.xml
index 50b735684fd4..c6f1fa3d5f5d 100644
--- a/AnkiDroid/src/main/res/values-ta/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ta/10-preferences.xml
@@ -198,6 +198,9 @@
     <string name="reset">மீட்டமை</string>
     <string name="thirdparty_apps_title" maxLength="41">மூன்றாம் தரப்பு API பயன்பாடுகள்</string>
     <string name="thirdparty_apps_summary">அகராதிகள், பயன்பாடுகள் போன்ற AnkiDroid API ஐப் பயன்படுத்தும் பயன்பாடுகளின் பட்டியலைப் பார்க்கவும்.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">விமர்சகர்</string>
     <string name="show_deck_title" maxLength="41">டெக் தலைப்பைக் காட்டு</string>
diff --git a/AnkiDroid/src/main/res/values-ta/18-standard-models.xml b/AnkiDroid/src/main/res/values-ta/18-standard-models.xml
index d0cc97059ce3..cd8aa5986dfa 100644
--- a/AnkiDroid/src/main/res/values-ta/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-ta/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">முன்</string>
-    <string name="back_field_name" maxLength="28">பின்</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">பின்</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-te/02-strings.xml b/AnkiDroid/src/main/res/values-te/02-strings.xml
index 5ef13b860940..78ac30fe9a2c 100644
--- a/AnkiDroid/src/main/res/values-te/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-te/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (from “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">ఏదైనా మ్యాప్ చేసిన కార్డ్లు తొలగించబడతాయి. గమనికకు మిగిలిన కార్డులు లేకుంటే, అది కోల్పోతుంది. మీరు ఖచ్చితంగా కొనసాగించాలనుకుంటున్నారా?</string>
     <string name="missing_note_type">గమనిక రకం కనుగొనబడలేదు</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">టైంబాక్స్ వచ్చింది</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d కార్డ్‌లు పాతిపెట్టబడలేదు</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">ప్రత్యామ్నాయం</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">దానిని రికార్డ్ చేయండి</string>
     <string name="stop_recording">ఆపు దాన్ని</string>
     <string name="play_recording">ఆడండి</string>
-    <string name="next_recording">తర్వాత</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">తర్వాత</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">కార్డ్ రకాన్ని తొలగించడం సాధ్యం కాదు</string>
     <string name="orphan_note_message">ఈ కార్డ్ రకాన్ని తొలగించడం వలన కొన్ని గమనికలు కార్డ్‌లు లేకుండా ఉంటాయి.</string>
diff --git a/AnkiDroid/src/main/res/values-te/10-preferences.xml b/AnkiDroid/src/main/res/values-te/10-preferences.xml
index 77c84636187e..b2bc79c5dc7a 100644
--- a/AnkiDroid/src/main/res/values-te/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-te/10-preferences.xml
@@ -198,6 +198,9 @@
     <string name="reset">రీసెట్ చేయండి</string>
     <string name="thirdparty_apps_title" maxLength="41">మూడవ పక్షం API యాప్‌లు</string>
     <string name="thirdparty_apps_summary">డిక్షనరీలు, యుటిలిటీస్ వంటి AnkiDroid APIని ఉపయోగించే అప్లికేషన్‌ల జాబితాను చూడండి.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">సమీక్షకుడు</string>
     <string name="show_deck_title" maxLength="41">డెక్ శీర్షికను చూపించు</string>
diff --git a/AnkiDroid/src/main/res/values-te/18-standard-models.xml b/AnkiDroid/src/main/res/values-te/18-standard-models.xml
index 305a483f093b..244f0417e68a 100644
--- a/AnkiDroid/src/main/res/values-te/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-te/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">ముందు</string>
-    <string name="back_field_name" maxLength="28">వెనుకకు</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">వెనుకకు</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-tg/02-strings.xml b/AnkiDroid/src/main/res/values-tg/02-strings.xml
index 5e4fab69ad3c..fec7efe184db 100644
--- a/AnkiDroid/src/main/res/values-tg/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tg/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (from “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Any cards mapped to nothing will be deleted. If a note has no remaining cards, it will be lost. Are you sure you want to continue?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-tg/10-preferences.xml b/AnkiDroid/src/main/res/values-tg/10-preferences.xml
index 8d49177684a2..ff647bafaf11 100644
--- a/AnkiDroid/src/main/res/values-tg/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-tg/10-preferences.xml
@@ -199,6 +199,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-tg/18-standard-models.xml b/AnkiDroid/src/main/res/values-tg/18-standard-models.xml
index 59d64739d93d..a43ef550990e 100644
--- a/AnkiDroid/src/main/res/values-tg/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-tg/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Front</string>
-    <string name="back_field_name" maxLength="28">Back</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Back</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-tgl/02-strings.xml b/AnkiDroid/src/main/res/values-tgl/02-strings.xml
index fb3dba00be7b..9218bf49d6d4 100644
--- a/AnkiDroid/src/main/res/values-tgl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tgl/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (mula “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Ang anumang mga baraha na hindi naka-map ay tatanggalin. Kung ang isang paalala ay walang natitirang mga baraha, mawawala ito. Sigurado ka bang gusto mong magpatuloy?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-tgl/10-preferences.xml b/AnkiDroid/src/main/res/values-tgl/10-preferences.xml
index 697498d1ae70..9880c6e188b5 100644
--- a/AnkiDroid/src/main/res/values-tgl/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-tgl/10-preferences.xml
@@ -199,6 +199,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-tgl/18-standard-models.xml b/AnkiDroid/src/main/res/values-tgl/18-standard-models.xml
index 59d64739d93d..a43ef550990e 100644
--- a/AnkiDroid/src/main/res/values-tgl/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-tgl/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Front</string>
-    <string name="back_field_name" maxLength="28">Back</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Back</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-th/02-strings.xml b/AnkiDroid/src/main/res/values-th/02-strings.xml
index 77318aa3c107..5c281060da85 100644
--- a/AnkiDroid/src/main/res/values-th/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-th/02-strings.xml
@@ -103,6 +103,7 @@
     <string name="field_remapping">%1$s (from “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Any cards mapped to nothing will be deleted. If a note has no remaining cards, it will be lost. Are you sure you want to continue?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -318,10 +319,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-th/10-preferences.xml b/AnkiDroid/src/main/res/values-th/10-preferences.xml
index 9cbbc5259b8d..724b650f69fd 100644
--- a/AnkiDroid/src/main/res/values-th/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-th/10-preferences.xml
@@ -197,6 +197,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-th/18-standard-models.xml b/AnkiDroid/src/main/res/values-th/18-standard-models.xml
index c243735d9c87..cfd3c228182e 100644
--- a/AnkiDroid/src/main/res/values-th/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-th/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">ด้านหน้า</string>
-    <string name="back_field_name" maxLength="28">ด้านหลัง</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">ด้านหลัง</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ti/02-strings.xml b/AnkiDroid/src/main/res/values-ti/02-strings.xml
index 5e4fab69ad3c..fec7efe184db 100644
--- a/AnkiDroid/src/main/res/values-ti/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ti/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (from “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Any cards mapped to nothing will be deleted. If a note has no remaining cards, it will be lost. Are you sure you want to continue?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-ti/10-preferences.xml b/AnkiDroid/src/main/res/values-ti/10-preferences.xml
index 8d49177684a2..ff647bafaf11 100644
--- a/AnkiDroid/src/main/res/values-ti/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ti/10-preferences.xml
@@ -199,6 +199,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-ti/18-standard-models.xml b/AnkiDroid/src/main/res/values-ti/18-standard-models.xml
index 59d64739d93d..a43ef550990e 100644
--- a/AnkiDroid/src/main/res/values-ti/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-ti/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Front</string>
-    <string name="back_field_name" maxLength="28">Back</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Back</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-tn/02-strings.xml b/AnkiDroid/src/main/res/values-tn/02-strings.xml
index 5e4fab69ad3c..fec7efe184db 100644
--- a/AnkiDroid/src/main/res/values-tn/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tn/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (from “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Any cards mapped to nothing will be deleted. If a note has no remaining cards, it will be lost. Are you sure you want to continue?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-tn/10-preferences.xml b/AnkiDroid/src/main/res/values-tn/10-preferences.xml
index 8d49177684a2..ff647bafaf11 100644
--- a/AnkiDroid/src/main/res/values-tn/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-tn/10-preferences.xml
@@ -199,6 +199,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-tn/18-standard-models.xml b/AnkiDroid/src/main/res/values-tn/18-standard-models.xml
index 59d64739d93d..a43ef550990e 100644
--- a/AnkiDroid/src/main/res/values-tn/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-tn/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Front</string>
-    <string name="back_field_name" maxLength="28">Back</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Back</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-tr/02-strings.xml b/AnkiDroid/src/main/res/values-tr/02-strings.xml
index d7aefe93952c..086b75bc11ed 100644
--- a/AnkiDroid/src/main/res/values-tr/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tr/02-strings.xml
@@ -82,7 +82,7 @@
     <string name="webview_crash_loop_dialog_content">Sistem WebView bu kartı işleyemedi: \'%1$s\'.\n %2$s</string>
     <string name="filter_by_flags" maxLength="41">Bayraklar</string>
     <!-- Custom study options -->
-    <string name="custom_study_loading_tags">Building list of tags&#8230;</string>
+    <string name="custom_study_loading_tags">Etiket listesi oluşturuluyor&#8230;</string>
     <!-- Study options -->
     <plurals name="studyoptions_buried_count">
         <item quantity="one">+%d gömülü</item>
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (\'%2$s\' içinden)</string>
     <string name="confirm_map_cards_to_nothing">Hiçbir şeyle eşlemeyen tüm kartlar silinecektir. Eğer bir notun kalan kartları yoksa, kaybolacaktır. Devam etmek istediğinizden emin misiniz?</string>
     <string name="missing_note_type">Not türü bulunmuyor</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Zaman sınırına ulaşıldı</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d kart çıkarıldı</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Yerini değiştir</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Kayda başla</string>
     <string name="stop_recording">Durdur</string>
     <string name="play_recording">Oynat</string>
-    <string name="next_recording">Sonraki</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Sonraki</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Kart Türü Silinemiyor</string>
     <string name="orphan_note_message">Bu kart türünü silmek bazı notları kartsız bırakacak.</string>
diff --git a/AnkiDroid/src/main/res/values-tr/03-dialogs.xml b/AnkiDroid/src/main/res/values-tr/03-dialogs.xml
index a0b3d5e8eebc..ce60a9ccc139 100644
--- a/AnkiDroid/src/main/res/values-tr/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-tr/03-dialogs.xml
@@ -73,7 +73,7 @@
     <string name="custom_study_forgotten">Son x gündeki unutulan kartları izle:</string>
     <string name="custom_study_ahead">X günleri önce izle:</string>
     <string name="custom_study_preview">Son x günlerdeki eklenen yeni kartları önizle:</string>
-    <string name="custom_study_tags">Select x cards from the deck:</string>
+    <string name="custom_study_tags">Desteden x kart seç:</string>
     <string name="storage_full_title">Depolama alanı dolu</string>
     <string name="storage_almost_full_title">Depolama alanı nerdeyse dolu</string>
     <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">Hiç alan yok</string>
diff --git a/AnkiDroid/src/main/res/values-tr/10-preferences.xml b/AnkiDroid/src/main/res/values-tr/10-preferences.xml
index e39b8833b980..78de6f87fa53 100644
--- a/AnkiDroid/src/main/res/values-tr/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-tr/10-preferences.xml
@@ -68,7 +68,7 @@
     <string name="pref_cat_advanced" maxLength="41">Gelişmiş</string>
     <string name="pref_cat_workarounds" maxLength="41">Geçici çözümler</string>
     <string name="pref_cat_plugins" maxLength="41">Eklentiler</string>
-    <string name="pref_cat_editing" maxLength="41">Editing</string>
+    <string name="pref_cat_editing" maxLength="41">Düzenleme</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Kontur genişliği</string>
     <string name="use_input_tag" maxLength="41">Cevabı karta yaz</string>
@@ -198,6 +198,9 @@
     <string name="reset">Sıfırla</string>
     <string name="thirdparty_apps_title" maxLength="41">Üçüncü parti API uygulamaları</string>
     <string name="thirdparty_apps_summary">AnkiDroid API\'ından faydalanan sözlük, araç gibi uygulamaların bir listesine bakın.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Çalışıcı</string>
     <string name="show_deck_title" maxLength="41">Deste başlığını göster</string>
diff --git a/AnkiDroid/src/main/res/values-tr/18-standard-models.xml b/AnkiDroid/src/main/res/values-tr/18-standard-models.xml
index fdedf476d211..a50ac647b349 100644
--- a/AnkiDroid/src/main/res/values-tr/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-tr/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Ön</string>
-    <string name="back_field_name" maxLength="28">Arka</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Arka</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ts/02-strings.xml b/AnkiDroid/src/main/res/values-ts/02-strings.xml
index 5e4fab69ad3c..fec7efe184db 100644
--- a/AnkiDroid/src/main/res/values-ts/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ts/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (from “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Any cards mapped to nothing will be deleted. If a note has no remaining cards, it will be lost. Are you sure you want to continue?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-ts/10-preferences.xml b/AnkiDroid/src/main/res/values-ts/10-preferences.xml
index 8d49177684a2..ff647bafaf11 100644
--- a/AnkiDroid/src/main/res/values-ts/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ts/10-preferences.xml
@@ -199,6 +199,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-ts/18-standard-models.xml b/AnkiDroid/src/main/res/values-ts/18-standard-models.xml
index 59d64739d93d..a43ef550990e 100644
--- a/AnkiDroid/src/main/res/values-ts/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-ts/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Front</string>
-    <string name="back_field_name" maxLength="28">Back</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Back</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-tt/02-strings.xml b/AnkiDroid/src/main/res/values-tt/02-strings.xml
index c003b91cee26..f15ab1b25e10 100644
--- a/AnkiDroid/src/main/res/values-tt/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-tt/02-strings.xml
@@ -103,6 +103,7 @@
     <string name="field_remapping">%1$s (\"%2$s\"дан)</string>
     <string name="confirm_map_cards_to_nothing">Бернәрсәгә дә бәйләнмәгән кәртләр сөртелер. Кәртсез калган язулар югалыр. Дәвам итәргә телисезме?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -319,10 +320,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Яздыру</string>
     <string name="stop_recording">Туктату</string>
     <string name="play_recording">Уйнату</string>
-    <string name="next_recording">Киләсе</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Киләсе</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-tt/10-preferences.xml b/AnkiDroid/src/main/res/values-tt/10-preferences.xml
index 3a0190ed8706..7e4fe9ecd94d 100644
--- a/AnkiDroid/src/main/res/values-tt/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-tt/10-preferences.xml
@@ -197,6 +197,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-tt/18-standard-models.xml b/AnkiDroid/src/main/res/values-tt/18-standard-models.xml
index 0e34cffda214..a27b7841a908 100644
--- a/AnkiDroid/src/main/res/values-tt/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-tt/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Алгы</string>
-    <string name="back_field_name" maxLength="28">Баш тарту</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Баш тарту</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ug/02-strings.xml b/AnkiDroid/src/main/res/values-ug/02-strings.xml
index 2e8e8a7bdaec..63debb1e83b5 100644
--- a/AnkiDroid/src/main/res/values-ug/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ug/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (ئورنى «‎%2$s‎‏»)</string>
     <string name="confirm_map_cards_to_nothing">ھېچنېمىگە خەرىتىلەنمىگەن كارتا ئۆچۈرۈلىدۇ. ئەگەر خاتىرىدە قېپقالغان كارتا بولمىسا، ئۇ يوقاپ كېتىدۇ. راستلا داۋاملاشتۇرامسىز؟</string>
     <string name="missing_note_type">ھېچقانداق خاتىرە تۈرى تېپىلمىدى</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">مۆھلەتكە يەتتى</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d كارتا ئاشكارىلاندى</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">قايتا تەرتىپلە</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">خاتىرىلە</string>
     <string name="stop_recording">توختا</string>
     <string name="play_recording">قوي</string>
-    <string name="next_recording">كېيىنكى</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">كېيىنكى</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">كارتا تۈرىنى ئۆچۈرەلمەيدۇ</string>
     <string name="orphan_note_message">بۇ كارتا تۈرى ئۆچۈرۈلسە بەزى كارتىسىز خاتىرە قېپقالىدۇ.</string>
diff --git a/AnkiDroid/src/main/res/values-ug/10-preferences.xml b/AnkiDroid/src/main/res/values-ug/10-preferences.xml
index 89258869c2fd..99f213479c2b 100644
--- a/AnkiDroid/src/main/res/values-ug/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ug/10-preferences.xml
@@ -199,6 +199,9 @@
     <string name="reset">ئەسلىگە قايتۇر</string>
     <string name="thirdparty_apps_title" maxLength="41">ئۈچىنچى تەرەپ API ئەپلىرى</string>
     <string name="thirdparty_apps_summary">لۇغەت، ئاممىۋى مۇلازىمەتكە ئوخشاش AnkiDroid API نى ئىشلىتىدىغان پىروگراممىلارنىڭ تىزىملىكىنى كۆرسىتىدۇ.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">تەكرارلىغۇچى</string>
     <string name="show_deck_title" maxLength="41">دەستە ماۋزۇسىنى كۆرسەت</string>
diff --git a/AnkiDroid/src/main/res/values-ug/18-standard-models.xml b/AnkiDroid/src/main/res/values-ug/18-standard-models.xml
index ff2044143026..14ded2ef4a8f 100644
--- a/AnkiDroid/src/main/res/values-ug/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-ug/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">خەت نۇسخا</string>
-    <string name="back_field_name" maxLength="28">قايت</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">قايت</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-uk/02-strings.xml b/AnkiDroid/src/main/res/values-uk/02-strings.xml
index 620b070a679d..def7b9d550ef 100644
--- a/AnkiDroid/src/main/res/values-uk/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-uk/02-strings.xml
@@ -106,6 +106,7 @@
     <string name="field_remapping">%1$s (з\"%2$s\")</string>
     <string name="confirm_map_cards_to_nothing">Картки, які не прив\'язані, будуть видалені. Якщо запис не має жодної картки, то запис буде втрачено. Ви хочете продовжити?</string>
     <string name="missing_note_type">Жодного типу записів не знайдено</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Досягнуто часу</string>
     <plurals name="timebox_reached">
@@ -336,10 +337,12 @@
         <item quantity="other">%d карток повернуто</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Репозиціонувати</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Запис</string>
     <string name="stop_recording">Зупинити</string>
     <string name="play_recording">Відтворити</string>
-    <string name="next_recording">Наступний</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Наступний</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Неможливо видалити тип картки</string>
     <string name="orphan_note_message">Якщо видалити цей тип картки, деякі записи залишаться без карток.</string>
diff --git a/AnkiDroid/src/main/res/values-uk/10-preferences.xml b/AnkiDroid/src/main/res/values-uk/10-preferences.xml
index c4ead4ab77f7..0953bd83e852 100644
--- a/AnkiDroid/src/main/res/values-uk/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-uk/10-preferences.xml
@@ -203,6 +203,9 @@
     <string name="reset">Скинути</string>
     <string name="thirdparty_apps_title" maxLength="41">API додатки сторонніх виробників</string>
     <string name="thirdparty_apps_summary">Переглянути список програм, які використовують API AnkiDroid, наприклад словники, утиліти</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Повторення</string>
     <string name="show_deck_title" maxLength="41">Показувати назву колоди</string>
diff --git a/AnkiDroid/src/main/res/values-uk/18-standard-models.xml b/AnkiDroid/src/main/res/values-uk/18-standard-models.xml
index 7640de8217b7..62a4b4253710 100644
--- a/AnkiDroid/src/main/res/values-uk/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-uk/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Лицьовий бік</string>
-    <string name="back_field_name" maxLength="28">Зворотній бік</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Зворотній бік</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ur/02-strings.xml b/AnkiDroid/src/main/res/values-ur/02-strings.xml
index 9023f28f672c..a85b2c6630a8 100644
--- a/AnkiDroid/src/main/res/values-ur/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ur/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (\"%2$s\" سے)</string>
     <string name="confirm_map_cards_to_nothing">کسی بھی کارڈ کو کچھ بھی نہیں پر میپ کیا جائے گا حذف کر دیا جائے گا۔ اگر کسی نوٹ میں کوئی کارڈ باقی نہیں ہے، تو وہ کھو جائے گا۔ کیا آپ واقعی جاری رکھنا چاہتے ہیں؟</string>
     <string name="missing_note_type">نوٹ کی کوئی قسم نہیں ملی</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">ٹائم باکس پہنچ گیا۔</string>
     <plurals name="timebox_reached">
@@ -325,10 +326,12 @@
         <item quantity="other">%d کارڈز کو دفن کیا گیا</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">ریپوزیشن</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">ریکارڈ کریں</string>
     <string name="stop_recording">بند کریں</string>
     <string name="play_recording">چلائیں</string>
-    <string name="next_recording">اگلے</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">اگلے</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">کارڈ کی قسم کو حذف نہیں کیا جا سکتا</string>
     <string name="orphan_note_message">اس کارڈ کی قسم کو حذف کرنے سے کچھ نوٹ بغیر کسی کارڈ کے رہ جائیں گے۔</string>
diff --git a/AnkiDroid/src/main/res/values-ur/10-preferences.xml b/AnkiDroid/src/main/res/values-ur/10-preferences.xml
index 4171301b394f..4e7918b04a75 100644
--- a/AnkiDroid/src/main/res/values-ur/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ur/10-preferences.xml
@@ -199,6 +199,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">تھرڈ پارٹی API ایپس</string>
     <string name="thirdparty_apps_summary">ان ایپلی کیشنز کی فہرست دیکھیں جو AnkiDroid API کا استعمال کرتی ہیں جیسے لغات، افادیت</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">جائزہ لینے والا</string>
     <string name="show_deck_title" maxLength="41">ڈیک ٹائٹل دکھائیں</string>
diff --git a/AnkiDroid/src/main/res/values-ur/18-standard-models.xml b/AnkiDroid/src/main/res/values-ur/18-standard-models.xml
index 7f2e437ddcf0..75bd6a8a2f43 100644
--- a/AnkiDroid/src/main/res/values-ur/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-ur/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">سامنے والا</string>
-    <string name="back_field_name" maxLength="28">پیچھے</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">پیچھے</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-uz/02-strings.xml b/AnkiDroid/src/main/res/values-uz/02-strings.xml
index 818be124790b..c1bcfffb8ba1 100644
--- a/AnkiDroid/src/main/res/values-uz/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-uz/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (from “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Any cards mapped to nothing will be deleted. If a note has no remaining cards, it will be lost. Are you sure you want to continue?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-uz/10-preferences.xml b/AnkiDroid/src/main/res/values-uz/10-preferences.xml
index 8d49177684a2..ff647bafaf11 100644
--- a/AnkiDroid/src/main/res/values-uz/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-uz/10-preferences.xml
@@ -199,6 +199,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-uz/18-standard-models.xml b/AnkiDroid/src/main/res/values-uz/18-standard-models.xml
index 59d64739d93d..a43ef550990e 100644
--- a/AnkiDroid/src/main/res/values-uz/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-uz/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Front</string>
-    <string name="back_field_name" maxLength="28">Back</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Back</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-ve/02-strings.xml b/AnkiDroid/src/main/res/values-ve/02-strings.xml
index 5e4fab69ad3c..fec7efe184db 100644
--- a/AnkiDroid/src/main/res/values-ve/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-ve/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (from “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Any cards mapped to nothing will be deleted. If a note has no remaining cards, it will be lost. Are you sure you want to continue?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-ve/10-preferences.xml b/AnkiDroid/src/main/res/values-ve/10-preferences.xml
index 8d49177684a2..ff647bafaf11 100644
--- a/AnkiDroid/src/main/res/values-ve/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-ve/10-preferences.xml
@@ -199,6 +199,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-ve/18-standard-models.xml b/AnkiDroid/src/main/res/values-ve/18-standard-models.xml
index 59d64739d93d..a43ef550990e 100644
--- a/AnkiDroid/src/main/res/values-ve/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-ve/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Front</string>
-    <string name="back_field_name" maxLength="28">Back</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Back</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-vi/02-strings.xml b/AnkiDroid/src/main/res/values-vi/02-strings.xml
index b8dd1735cb7a..aa183f6958cb 100644
--- a/AnkiDroid/src/main/res/values-vi/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-vi/02-strings.xml
@@ -103,6 +103,7 @@
     <string name="field_remapping">%1$s (từ \"%2$s\")</string>
     <string name="confirm_map_cards_to_nothing">Bất kỳ thẻ nào không được gán sẽ bị xoá. Nếu một ghi chú không có thẻ nào kèm theo, nó sẽ bị mất. Có chắc là bạn muốn tiếp tục?</string>
     <string name="missing_note_type">Không tìm thấy loại ghi chú nào</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Đã đạt đến giới hạn thời gian</string>
     <plurals name="timebox_reached">
@@ -318,10 +319,12 @@
         <item quantity="other">%d thẻ chưa được ẩn</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Đặt lại vị trí</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Ghi âm</string>
     <string name="stop_recording">Dừng</string>
     <string name="play_recording">Phát</string>
-    <string name="next_recording">Tiếp theo</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Tiếp theo</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Không thể xoá loại thẻ</string>
     <string name="orphan_note_message">Việc xóa loại thẻ này sẽ để lại một số ghi chú không có thẻ nào liên kết.</string>
diff --git a/AnkiDroid/src/main/res/values-vi/10-preferences.xml b/AnkiDroid/src/main/res/values-vi/10-preferences.xml
index 6db396590371..2949c1d3d42f 100644
--- a/AnkiDroid/src/main/res/values-vi/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-vi/10-preferences.xml
@@ -196,6 +196,9 @@
     <string name="reset">Thiết lập lại</string>
     <string name="thirdparty_apps_title" maxLength="41">Ứng dụng API của bên thứ ba</string>
     <string name="thirdparty_apps_summary">Xem danh sách các ứng dụng sử dụng AnkiDroid API như từ điển, tiện ích.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Người xem xét</string>
     <string name="show_deck_title" maxLength="41">Hiển thị tiêu đề bộ thẻ</string>
diff --git a/AnkiDroid/src/main/res/values-vi/18-standard-models.xml b/AnkiDroid/src/main/res/values-vi/18-standard-models.xml
index 2dcdfa9af868..2e7cb747a1a9 100644
--- a/AnkiDroid/src/main/res/values-vi/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-vi/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Mặt trước</string>
-    <string name="back_field_name" maxLength="28">Mặt sau</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Mặt sau</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-wo/02-strings.xml b/AnkiDroid/src/main/res/values-wo/02-strings.xml
index fb9a40012630..01844efbc801 100644
--- a/AnkiDroid/src/main/res/values-wo/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-wo/02-strings.xml
@@ -103,6 +103,7 @@
     <string name="field_remapping">%1$s (from “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Any cards mapped to nothing will be deleted. If a note has no remaining cards, it will be lost. Are you sure you want to continue?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -318,10 +319,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-wo/10-preferences.xml b/AnkiDroid/src/main/res/values-wo/10-preferences.xml
index 3f9dd4876545..4ab0154dd5d3 100644
--- a/AnkiDroid/src/main/res/values-wo/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-wo/10-preferences.xml
@@ -197,6 +197,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-wo/18-standard-models.xml b/AnkiDroid/src/main/res/values-wo/18-standard-models.xml
index 59d64739d93d..a43ef550990e 100644
--- a/AnkiDroid/src/main/res/values-wo/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-wo/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Front</string>
-    <string name="back_field_name" maxLength="28">Back</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Back</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-xh/02-strings.xml b/AnkiDroid/src/main/res/values-xh/02-strings.xml
index 5e4fab69ad3c..fec7efe184db 100644
--- a/AnkiDroid/src/main/res/values-xh/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-xh/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (from “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Any cards mapped to nothing will be deleted. If a note has no remaining cards, it will be lost. Are you sure you want to continue?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-xh/10-preferences.xml b/AnkiDroid/src/main/res/values-xh/10-preferences.xml
index 8d49177684a2..ff647bafaf11 100644
--- a/AnkiDroid/src/main/res/values-xh/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-xh/10-preferences.xml
@@ -199,6 +199,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-xh/18-standard-models.xml b/AnkiDroid/src/main/res/values-xh/18-standard-models.xml
index 59d64739d93d..a43ef550990e 100644
--- a/AnkiDroid/src/main/res/values-xh/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-xh/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Front</string>
-    <string name="back_field_name" maxLength="28">Back</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Back</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-yue/02-strings.xml b/AnkiDroid/src/main/res/values-yue/02-strings.xml
index 0e2cef23f173..ed53825430f4 100644
--- a/AnkiDroid/src/main/res/values-yue/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-yue/02-strings.xml
@@ -103,6 +103,7 @@
     <string name="field_remapping">%1$s (from “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Any cards mapped to nothing will be deleted. If a note has no remaining cards, it will be lost. Are you sure you want to continue?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -318,10 +319,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-yue/10-preferences.xml b/AnkiDroid/src/main/res/values-yue/10-preferences.xml
index 3f9dd4876545..4ab0154dd5d3 100644
--- a/AnkiDroid/src/main/res/values-yue/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-yue/10-preferences.xml
@@ -197,6 +197,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-yue/18-standard-models.xml b/AnkiDroid/src/main/res/values-yue/18-standard-models.xml
index 59d64739d93d..a43ef550990e 100644
--- a/AnkiDroid/src/main/res/values-yue/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-yue/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Front</string>
-    <string name="back_field_name" maxLength="28">Back</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Back</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml b/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml
index 236265707b74..c91a6eb845ca 100644
--- a/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml
@@ -103,6 +103,7 @@
     <string name="field_remapping">%1$s（来自「%2$s」）</string>
     <string name="confirm_map_cards_to_nothing">任何无法映射的卡片都会被删除。如果该笔记没有生成其他卡片，该笔记将会丢失。你确定要继续吗？</string>
     <string name="missing_note_type">找不到笔记类型</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">已到达指定时间</string>
     <plurals name="timebox_reached">
@@ -318,10 +319,12 @@
         <item quantity="other">取消遮盖了 %d 张卡片</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">更改位置</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">录制</string>
     <string name="stop_recording">停止</string>
     <string name="play_recording">播放</string>
-    <string name="next_recording">下一个录音</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">下一个录音</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">无法删除卡片类型</string>
     <string name="orphan_note_message">删除此卡片类型将留使一些附注没有任何卡片。</string>
diff --git a/AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml b/AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml
index fe1de8f707f9..6cb0a5fe3a69 100644
--- a/AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml
@@ -196,6 +196,9 @@
     <string name="reset">重置</string>
     <string name="thirdparty_apps_title" maxLength="41">第三方 API 应用</string>
     <string name="thirdparty_apps_summary">查看使用 AnkiDroid API 的应用程序清单，如字典、实用工具。</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">复习界面</string>
     <string name="show_deck_title" maxLength="41">显示牌组标题</string>
diff --git a/AnkiDroid/src/main/res/values-zh-rCN/18-standard-models.xml b/AnkiDroid/src/main/res/values-zh-rCN/18-standard-models.xml
index 65d3b400e047..6b9de1ac6386 100644
--- a/AnkiDroid/src/main/res/values-zh-rCN/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-zh-rCN/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">正面</string>
-    <string name="back_field_name" maxLength="28">背面</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">背面</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-zh-rTW/02-strings.xml b/AnkiDroid/src/main/res/values-zh-rTW/02-strings.xml
index 9c95128efcdd..6789b688f67f 100644
--- a/AnkiDroid/src/main/res/values-zh-rTW/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-zh-rTW/02-strings.xml
@@ -103,6 +103,7 @@
     <string name="field_remapping">%1$s (來自「%2$s」)</string>
     <string name="confirm_map_cards_to_nothing">空白卡片會被刪除，而筆記如果沒有在卡片上也會遺失。你確定要繼續嗎？</string>
     <string name="missing_note_type">未找到筆記類型</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">達到計時器限制！</string>
     <plurals name="timebox_reached">
@@ -318,10 +319,12 @@
         <item quantity="other">取消遮蓋了 %d 張卡片</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">變更位置</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">錄製</string>
     <string name="stop_recording">停止</string>
     <string name="play_recording">播放</string>
-    <string name="next_recording">下一個錄音</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">下一個錄音</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">無法刪除此卡類型</string>
     <string name="orphan_note_message">刪除此卡類型會使某些筆記本沒有任何卡片。</string>
diff --git a/AnkiDroid/src/main/res/values-zh-rTW/10-preferences.xml b/AnkiDroid/src/main/res/values-zh-rTW/10-preferences.xml
index f23c2837dac9..01d0a9c9fabb 100644
--- a/AnkiDroid/src/main/res/values-zh-rTW/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-zh-rTW/10-preferences.xml
@@ -196,6 +196,9 @@
     <string name="reset">重置</string>
     <string name="thirdparty_apps_title" maxLength="41">第三方 API 應用程式</string>
     <string name="thirdparty_apps_summary">查看一系列使用 AnkiDroid API 的應用程式，如字典，實用工具。</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">複習介面</string>
     <string name="show_deck_title" maxLength="41">顯示牌組標題</string>
diff --git a/AnkiDroid/src/main/res/values-zh-rTW/18-standard-models.xml b/AnkiDroid/src/main/res/values-zh-rTW/18-standard-models.xml
index 65d3b400e047..6b9de1ac6386 100644
--- a/AnkiDroid/src/main/res/values-zh-rTW/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-zh-rTW/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">正面</string>
-    <string name="back_field_name" maxLength="28">背面</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">背面</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-zu/02-strings.xml b/AnkiDroid/src/main/res/values-zu/02-strings.xml
index 5e4fab69ad3c..fec7efe184db 100644
--- a/AnkiDroid/src/main/res/values-zu/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-zu/02-strings.xml
@@ -104,6 +104,7 @@
     <string name="field_remapping">%1$s (from “%2$s”)</string>
     <string name="confirm_map_cards_to_nothing">Any cards mapped to nothing will be deleted. If a note has no remaining cards, it will be lost. Are you sure you want to continue?</string>
     <string name="missing_note_type">No note type found</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
@@ -324,10 +325,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
     <string name="start_recording">Record</string>
     <string name="stop_recording">Stop</string>
     <string name="play_recording">Play</string>
-    <string name="next_recording">Next</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot Delete Card Type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
diff --git a/AnkiDroid/src/main/res/values-zu/10-preferences.xml b/AnkiDroid/src/main/res/values-zu/10-preferences.xml
index 8d49177684a2..ff647bafaf11 100644
--- a/AnkiDroid/src/main/res/values-zu/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-zu/10-preferences.xml
@@ -199,6 +199,9 @@
     <string name="reset">Reset</string>
     <string name="thirdparty_apps_title" maxLength="41">Third-party API apps</string>
     <string name="thirdparty_apps_summary">See a list of applications which make use of the AnkiDroid API such as dictionaries, utilities.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">Reviewer</string>
     <string name="show_deck_title" maxLength="41">Show deck title</string>
diff --git a/AnkiDroid/src/main/res/values-zu/18-standard-models.xml b/AnkiDroid/src/main/res/values-zu/18-standard-models.xml
index 59d64739d93d..a43ef550990e 100644
--- a/AnkiDroid/src/main/res/values-zu/18-standard-models.xml
+++ b/AnkiDroid/src/main/res/values-zu/18-standard-models.xml
@@ -27,5 +27,5 @@
 <resources>
     <!--Fields-->
     <string name="front_field_name" maxLength="28">Front</string>
-    <string name="back_field_name" maxLength="28">Back</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Back</string>
 </resources>

From da5df851550a7650357fe6795a81b5d99d2fec19 Mon Sep 17 00:00:00 2001
From: devyk100 <devyk100@gmail.com>
Date: Sat, 22 Feb 2025 15:34:00 +0530
Subject: [PATCH 199/200] fix(deck is empty): "Deck is empty" should appear
 even when deck has empty subdecks. - Simplified the empty deck and its
 subdeck check by making a isDeckAndSubdeckEmpty function, and removing the
 old code based on the enum CompletedDeckStatus for custom deck study action.
 - Implemented the `isDeckAndSubdeckEmpty` function using Kotlin's inbuilt
 `iterable.all` check to iterate through all decks and subdeck trees - To make
 the `DeckNode` iterable, we implement the `Iterable<DeckNode>` class in
 DeckNode

---
 .../main/java/com/ichi2/anki/DeckPicker.kt    | 51 ++++---------------
 .../java/com/ichi2/libanki/sched/DeckNode.kt  |  8 ++-
 2 files changed, 17 insertions(+), 42 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt b/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
index a5c2de63091f..d7381c9fa911 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
@@ -2134,19 +2134,11 @@ open class DeckPicker :
             return
         }
 
-        when (queryCompletedDeckCustomStudyAction(did)) {
-            CompletedDeckStatus.LEARN_AHEAD_LIMIT_REACHED,
-            CompletedDeckStatus.REGULAR_DECK_NO_MORE_CARDS_TODAY,
-            CompletedDeckStatus.DYNAMIC_DECK_NO_LIMITS_REACHED,
-            CompletedDeckStatus.DAILY_STUDY_LIMIT_REACHED,
-            -> {
-                onDeckCompleted()
-            }
-            CompletedDeckStatus.EMPTY_REGULAR_DECK -> {
-                // If the deck is empty (& has no children) then show a message saying it's empty
-                showEmptyDeckSnackbar()
-                updateUi()
-            }
+        if (isDeckAndSubdeckEmpty(did)) {
+            showEmptyDeckSnackbar()
+            updateUi()
+        } else {
+            onDeckCompleted()
         }
     }
 
@@ -2638,38 +2630,15 @@ open class DeckPicker :
     }
 
     /**
-     * Returns how a user can 'custom study' a deck with no more pending cards
+     * Returns if the deck and its subdecks are all empty.
      *
      * @param did The id of a deck with no pending cards to review
      */
-    private suspend fun queryCompletedDeckCustomStudyAction(did: DeckId): CompletedDeckStatus =
-        when {
-            withCol { sched.hasCardsTodayAfterStudyAheadLimit() } -> CompletedDeckStatus.LEARN_AHEAD_LIMIT_REACHED
-            withCol { sched.newDue() || sched.revDue() } -> CompletedDeckStatus.LEARN_AHEAD_LIMIT_REACHED
-            withCol { decks.isFiltered(did) } -> CompletedDeckStatus.DYNAMIC_DECK_NO_LIMITS_REACHED
-            getNodeByDid(did).children.isEmpty() &&
-                withCol {
-                    decks.isEmpty(did)
-                } -> CompletedDeckStatus.EMPTY_REGULAR_DECK
-            else -> CompletedDeckStatus.REGULAR_DECK_NO_MORE_CARDS_TODAY
+    private suspend fun isDeckAndSubdeckEmpty(did: DeckId): Boolean {
+        val node = getNodeByDid(did)
+        return withCol {
+            node.all { decks.isEmpty(it.did) }
         }
-
-    /** Status for a deck with no current cards to review */
-    enum class CompletedDeckStatus {
-        /** No cards for today, but there would be if the user waited */
-        LEARN_AHEAD_LIMIT_REACHED,
-
-        /** No cards for today, but either the 'new' or 'review' limit was reached */
-        DAILY_STUDY_LIMIT_REACHED,
-
-        /** No cards are available, but the deck was dynamic */
-        DYNAMIC_DECK_NO_LIMITS_REACHED,
-
-        /** The deck contained no cards and had no child decks */
-        EMPTY_REGULAR_DECK,
-
-        /** The user has completed their studying for today, and there are future reviews */
-        REGULAR_DECK_NO_MORE_CARDS_TODAY,
     }
 
     override fun getApkgFileImportResultLauncher(): ActivityResultLauncher<Intent> = apkgFileImportResultLauncher
diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/sched/DeckNode.kt b/AnkiDroid/src/main/java/com/ichi2/libanki/sched/DeckNode.kt
index d526be019271..5b1cab976f79 100644
--- a/AnkiDroid/src/main/java/com/ichi2/libanki/sched/DeckNode.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/libanki/sched/DeckNode.kt
@@ -26,7 +26,7 @@ data class DeckNode(
     val node: DeckTreeNode,
     val fullDeckName: String,
     val parent: WeakReference<DeckNode>? = null,
-) {
+) : Iterable<DeckNode> {
     var collapsed = node.collapsed
     val revCount = node.reviewCount
     val newCount = node.newCount
@@ -90,6 +90,12 @@ data class DeckNode(
         }
     }
 
+    override fun iterator(): Iterator<DeckNode> =
+        sequence {
+            if (node.level > 0) yield(this@DeckNode)
+            for (child in children) yieldAll(child)
+        }.iterator()
+
     /** Convert the tree into a flat list, where matching decks and the children/parents
      * are included. Decks inside collapsed decks are not considered. */
     fun filterAndFlatten(filter: CharSequence?): List<DeckNode> {

From 3227906194dee43c417a684dabe3352c631c92c1 Mon Sep 17 00:00:00 2001
From: AnkiDroid Translations <ankidroid@ankidroid.org>
Date: Sun, 13 Apr 2025 09:37:53 +0000
Subject: [PATCH 200/200] Updated strings from Crowdin

---
 AnkiDroid/src/main/res/values-gl/01-core.xml  |  2 +-
 .../src/main/res/values-gl/02-strings.xml     | 62 ++++++------
 .../src/main/res/values-gl/03-dialogs.xml     | 94 +++++++++----------
 .../src/main/res/values-gl/04-network.xml     | 16 ++--
 .../src/main/res/values-gl/05-feedback.xml    | 12 +--
 .../src/main/res/values-gl/06-statistics.xml  |  2 +-
 .../src/main/res/values-gl/10-preferences.xml |  8 +-
 .../res/values-gl/20-search-preference.xml    |  4 +-
 .../src/main/res/values-zh-rCN/02-strings.xml |  6 +-
 .../main/res/values-zh-rCN/10-preferences.xml |  6 +-
 10 files changed, 106 insertions(+), 106 deletions(-)

diff --git a/AnkiDroid/src/main/res/values-gl/01-core.xml b/AnkiDroid/src/main/res/values-gl/01-core.xml
index d5903082ece3..a464cddf4457 100644
--- a/AnkiDroid/src/main/res/values-gl/01-core.xml
+++ b/AnkiDroid/src/main/res/values-gl/01-core.xml
@@ -117,7 +117,7 @@
     The user is taken to the "App Info" screen, and needs to click "Permissions" and
     grant AnkiDroid the \'Storage\' permission. This needs to be a fairly generic message as implementations
     of the permissions/app info screen will differ between devices. -->
-    <string name="startup_no_storage_permission">Concede a Ankidroid o permiso de \'Almacenamento\' para continuar</string>
+    <string name="startup_no_storage_permission">Concede a AnkiDroid o permiso de \'Almacenamento\' para continuar</string>
     <string name="rebuild_filtered_deck">Reconstruíndo baralla filtrada&#8230;</string>
     <string name="rebuild_cram_label" maxLength="28">Reconstruír</string>
     <string name="empty_cram_label" maxLength="28">Baleirar</string>
diff --git a/AnkiDroid/src/main/res/values-gl/02-strings.xml b/AnkiDroid/src/main/res/values-gl/02-strings.xml
index 625ba38d897b..5571a1034ed3 100644
--- a/AnkiDroid/src/main/res/values-gl/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-gl/02-strings.xml
@@ -47,11 +47,11 @@
     <!-- Navigation drawer strings -->
     <string name="drawer_open">Abrir a gabeta</string>
     <string name="drawer_close">Pechar a gabeta</string>
-    <string name="CardEditorCardDeck">Baralla de cartóns:</string>
+    <string name="CardEditorCardDeck">Baralla de tarxetas:</string>
     <string name="CardEditorNoteDeck">Baralla:</string>
     <string name="CardEditorModel">Tipo:</string>
     <string name="CardEditorTags">Etiquetas: %1$s</string>
-    <string name="CardEditorCards">Cartóns: %1$s</string>
+    <string name="CardEditorCards">Tarxetas: %1$s</string>
     <string name="edit_occlusions">Editar oclusións</string>
     <string name="tag_name">Nome da etiqueta</string>
     <string name="add_new_filter_tags">Engadir/Filtrar etiquetas</string>
@@ -75,9 +75,9 @@
     <string name="webview_crash_unknown">Erro descoñecido</string>
     <string name="webview_crash_unknwon_detailed">Isto foi causado por un erro interno no WebView</string>
     <string name="webview_crash_oom">Memoria insuficiente</string>
-    <string name="webview_crash_oom_details">O sistema terminou WebView. Isto adoita ocorrer cando a aplicación queda sen memoria, moitas veces debido ao tipo de letra ou ficheiros multimedia grandes.</string>
-    <string name="webview_crash_nonfatal">O renderizador de WebView quebrou. Causa: %s</string>
-    <string name="webview_crash_fatal">Erro fatal: o renderizador de WebView quebrou. Causa: %s</string>
+    <string name="webview_crash_oom_details">O sistema terminou o WebView. Isto adoita ocorrer cando a aplicación queda sen memoria, moitas veces debido ao tipo de letra ou ficheiros multimedia grandes.</string>
+    <string name="webview_crash_nonfatal">O renderizador do WebView quebrou. Causa: %s</string>
+    <string name="webview_crash_fatal">Erro fatal: o renderizador do WebView quebrou. Causa: %s</string>
     <string name="webview_crash_loop_dialog_title">Produciuse un erro ao representar o WebView</string>
     <string name="webview_crash_loop_dialog_content">O WebView do sistema fallou ao representar a tarxeta \'%1$s\'.\n%2$s</string>
     <string name="filter_by_flags" maxLength="41">Bandeiras</string>
@@ -102,13 +102,13 @@
     <string name="close">Pechar</string>
     <string name="select">Seleccionar</string>
     <string name="field_remapping">%1$s (de “%2$s”)</string>
-    <string name="confirm_map_cards_to_nothing">Eliminaranse os cartóns asignados a ren. Se unha nota non ten cartóns restantes, perderase. Tes a certeza de querer continuar?</string>
+    <string name="confirm_map_cards_to_nothing">Eliminaranse as tarxetas asignadas a ren. Se unha nota non ten tarxetas restantes, perderase. Tes a certeza de querer continuar?</string>
     <string name="missing_note_type">Non se atopou o tipo de nota</string>
-    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (baleiro)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Límite de tempo acadado</string>
     <plurals name="timebox_reached">
-        <item quantity="one">%1$d cartón estudado en %2$s</item>
+        <item quantity="one">%1$d tarxeta estudada en %2$s</item>
         <item quantity="other">%1$d cartóns estudados en %2$s</item>
     </plurals>
     <!-- minutes used in \'[studied in] x minutes\' context, causing inflexion in some languages -->
@@ -116,7 +116,7 @@
         <item quantity="one">%1$d minuto</item>
         <item quantity="other">%1$d minutos</item>
     </plurals>
-    <string name="fact_adder_intent_title" comment="Label of the \'Add Note\' window. This title can\'t be seen in AnkiDroid directly.">Cartón AnkiDroid</string>
+    <string name="fact_adder_intent_title" comment="Label of the \'Add Note\' window. This title can\'t be seen in AnkiDroid directly.">Tarxeta AnkiDroid</string>
     <string name="note_editor_copy_note" maxLength="28">Copiar nota</string>
     <string name="card_editor_reposition_card" comment="reposition a card in the new queue" maxLength="28">Reposicionar</string>
     <string name="card_editor_reset_card" maxLength="28">Reiniciar progreso</string>
@@ -128,7 +128,7 @@
     <string name="checks_action" maxLength="28">Comprobar</string>
     <string name="check_db" maxLength="28">Comprobar a base de datos</string>
     <string name="check_media" maxLength="28">Verificar multimedia</string>
-    <string name="empty_cards" maxLength="28">Cartóns baleiros</string>
+    <string name="empty_cards" maxLength="28">Tarxetas baleiras</string>
     <string name="unknown_type_field_warning">Escribe a resposta: campo descoñecido %s</string>
     <string name="delete_deck">Eliminando a baralla&#8230;</string>
     <string name="info_rate">Valora AnkiDroid</string>
@@ -151,7 +151,7 @@
     <string name="export_save_apkg_successful">Paquete Anki gardado correctamente</string>
     <string name="export_save_apkg_unsuccessful">Fallo ao gardar o paquete Anki</string>
     <string name="export_share_title">Enviar paquete Anki usando</string>
-    <string name="export_email_subject">Cartóns exportados por AnkiDroid: %s</string>
+    <string name="export_email_subject">Tarxetas exportadas por AnkiDroid: %s</string>
     <string name="export_email_text"><![CDATA[        Ola!
         <br/><br/>
         Esta é unha baralla de tarxetas Anki enviada desde AnkiDroid[1].
@@ -198,17 +198,17 @@
     <string name="white_board_image_save_failed">Fallo ao gardar a imaxe do encerado. %s</string>
     <string name="white_board_image_saved">Imaxe do encerado gardada en %s</string>
     <string name="title_whiteboard_editor" maxLength="28">Editor do encerado</string>
-    <string name="user_is_a_robot">Detected automated test. If you are a human, contact AnkiDroid support</string>
+    <string name="user_is_a_robot">Detectouse un test automático. Se es humano, contacta co soporte do AnkiDroid</string>
     <!-- JS api -->
-    <string name="api_version_developer_contact">This card uses unsupported AnkiDroid features. Contact developer %1$s, or view the wiki. %2$s</string>
-    <string name="invalid_json_data">Card provided invalid data. %s</string>
-    <string name="valid_js_api_version">Invalid AnkiDroid JS API version. Contact developer %s, or view wiki</string>
-    <string name="update_js_api_version">AnkiDroid JS API update available. Contact developer %s, or view wiki</string>
+    <string name="api_version_developer_contact">Esta tarxeta emprega funcionalidades non compatíbeis co AnkiDroid. Contacta co desenvolvedor %1$s, ou consulta a wiki. %2$s</string>
+    <string name="invalid_json_data">A tarxeta forneceu datos incorrectos. %s</string>
+    <string name="valid_js_api_version">Versión incorrecta da API AnkiDroid JS. Contacta co desenvolvedor %s, ou consulta a wiki</string>
+    <string name="update_js_api_version">Actualización da API AnkiDroid JS dispoñíbel. Contacta co desenvolvedor %s, ou consulta a wiki</string>
     <string name="reviewer_invalid_api_version_visit_documentation">Ver</string>
     <string name="anki_js_error_code">(Código de erro: %d)</string>
     <!-- About AnkiDroid screen -->
     <string name="about_ankidroid_successfully_copied_debug_info">Copiado ao portapapeis</string>
-    <string name="about_ankidroid_error_copy_debug_info">Error copying debug information to clipboard</string>
+    <string name="about_ankidroid_error_copy_debug_info">Erro ao copiar información de depuración ao portapapeis</string>
     <!-- Card Viewer -->
     <string name="card_viewer_could_not_find_image">Erro no contido da tarxeta: Fallo ao cargar ‘%s’</string>
     <!-- Deck Picker -->
@@ -230,14 +230,14 @@
     <string name="after_text">HTML despois da selección</string>
     <string name="add_toolbar_item">Crear elemento da barra de ferramentas</string>
     <string name="edit_toolbar_item">Editar elemento da barra de ferramentas</string>
-    <string name="toolbar_item_explain_edit_or_remove">Enter HTML to be inserted before and after the selected text\n\nLong press a toolbar item to edit or remove it</string>
+    <string name="toolbar_item_explain_edit_or_remove">Insire o HTML para introducir antes e despois do texto seleccionado\n\nMantén premido un botón da barra de ferramentas para editalo ou eliminalo</string>
     <string name="remove_toolbar_item">Eliminar elemento da barra de ferramentas?</string>
     <string name="note_editor_image_too_large">A imaxe é moi grande. Insire a imaxe manualmente</string>
     <string name="note_editor_video_too_large">O ficheiro de vídeo é moi grande. Insire o vídeo manualmente</string>
     <string name="note_editor_audio_too_large">O ficheiro de audio é moi grande. Insire o audio manualmente</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android backup in progress. Please try again</string>
-    <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">You may need to use iManager to allow AnkiDroid to add shortcuts</string>
-    <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Copia de seguranza do Android en progreso. Téntao de novo</string>
+    <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">Usa iManager para permitir que AnkiDroid engada atallos</string>
+    <string name="create_shortcut_failed" comment="home screen == launcher">A túa pantalla de inicio non permite que AnkiDroid engada atallos</string>
     <string name="create_shortcut_error">Erro ao engadir atallo: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Comezar frases con maiúscula</string>
     <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Barra ferramentas deslizábel</string>
@@ -259,10 +259,10 @@
     <string name="import_deck">Importar baralla</string>
     <string name="something_wrong">Algo saíu mal. Téntao de novo</string>
     <string name="download_failed">Fallo ao descargar</string>
-    <string name="deck_download_progress_message">You can use other apps while the download is running</string>
+    <string name="deck_download_progress_message">Podes utilizar outras aplicacións mentres a descarga está en curso</string>
     <string name="check_network">Comproba a túa conexión de rede</string>
     <string name="search_using_deck_name">Buscar usando o nome da baralla</string>
-    <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
+    <string name="external_storage_unavailable">Descarga interrompida, o almacenamento externo non está dispoñíbel</string>
     <string name="home" maxLength="28">Inicio</string>
     <!-- Reviewer actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
@@ -272,14 +272,14 @@
         <item quantity="other">%d tarxetas suspendidas.</item>
     </plurals>
     <!--  Note Editor Toggle Sticky  -->
-    <string name="note_editor_toggle_sticky">Make field %s sticky</string>
+    <string name="note_editor_toggle_sticky">Fixar o campo %s</string>
     <string name="scoped_storage_learn_more">Máis información</string>
     <string name="search_card_js_api_no_results">A busca non devolveu ningún resultado</string>
     <!--  JS Addons  -->
-    <string name="not_valid_js_addon_package">%s is not a valid JavaScript addon package</string>
+    <string name="not_valid_js_addon_package">%s non é un paquete válido de complementos JavaScript</string>
     <string name="could_not_create_dir">Non se puido crear o directorio %s</string>
-    <string name="malicious_archive_entry_outside">Malicious archive. Contains entry outside of the target dir: %s</string>
-    <string name="malicious_archive_exceeds_limit">Malicious archive. Size exceeds %1$s or contains more than %2$d files</string>
+    <string name="malicious_archive_entry_outside">Arquivo malicioso. Contén entradas fóra do directorio: %s</string>
+    <string name="malicious_archive_exceeds_limit">Arquivo malicioso. O tamaño excede %1$s ou contén máis de %2$d ficheiros</string>
     <string name="file_extract_exceeds_storage_space">O ficheiro extraido excede o espazo de almacenamento</string>
     <!--  Hierarchical Tags  -->
     <string name="expand_tag">Expandir etiqueta \'%s\'</string>
@@ -289,7 +289,7 @@
     <!-- App Intro -->
     <string name="intro_ankidroid_tagline_one">Estuda menos</string>
     <string name="intro_ankidroid_tagline_two">Lembra máis</string>
-    <string name="intro_short_ankidroid_explanation">Anki\'s card scheduler saves time by strengthening your weakest memories and preserving your strongest</string>
+    <string name="intro_short_ankidroid_explanation">O planificador de tarxetas Anki aforra tempo reforzando os teus recordos máis febles e preservando os máis fortes</string>
     <string name="intro_get_started" comment="Action to start AnkiDroid for the first time without syncing from AnkiWeb">Comeza agora</string>
     <string name="intro_sync_from_ankiweb">Sincronizar desde AnkiWeb</string>
     <!-- IntentHandler -->
@@ -304,7 +304,7 @@
     <string name="show_cards" comment="Label for toggle cards button in BrowserOptionsDialog">Tarxetas</string>
     <string name="show_notes" comment="Label for toggle notes button in BrowserOptionsDialog">Notas</string>
     <string name="toggle_cards_notes">Alternar tarxetas/notas</string>
-    <string name="truncate_content_help">Truncate the height of each row of the Browser to show only first 3 lines of content</string>
+    <string name="truncate_content_help">Trunca a altura de cada fila do Explorador, de forma que só amosa as 3 primeiras liñas de contido</string>
     <string name="browser_options_dialog_heading">Opcións do explorador</string>
     <string name="audio_saved">Gravación gardada</string>
     <string name="deleting_selected_notes">Eliminando as notas seleccionadas</string>
@@ -325,8 +325,8 @@
         <item quantity="other">%d tarxetas desagochadas</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposicionar</string>
-    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
-    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Seguinte</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Atrás</string>
     <string name="start_recording">Gravar</string>
     <string name="stop_recording">Deter</string>
     <string name="play_recording">Reproducir</string>
diff --git a/AnkiDroid/src/main/res/values-gl/03-dialogs.xml b/AnkiDroid/src/main/res/values-gl/03-dialogs.xml
index e595e28999e9..37bcfcbcb2de 100644
--- a/AnkiDroid/src/main/res/values-gl/03-dialogs.xml
+++ b/AnkiDroid/src/main/res/values-gl/03-dialogs.xml
@@ -49,17 +49,17 @@
     <string name="contextmenu_deckpicker_delete_deck" maxLength="28">Eliminar baralla</string>
     <string name="delete_deck_title">Eliminar baralla?</string>
     <plurals name="delete_deck_message">
-        <item quantity="one">Delete all cards in %1$s? It contains %2$d card</item>
-        <item quantity="other">Delete all cards in %1$s? It contains %2$d cards</item>
+        <item quantity="one">Eliminar todas as tarxetas en %1$s? Contén %2$d tarxeta</item>
+        <item quantity="other">Eliminar todas as tarxetas en %1$s? Contén %2$d tarxetas</item>
     </plurals>
     <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
     <string name="no_tts_available_message">Ningún idioma de síntese de voz dispoñible</string>
     <string name="tts_no_tts">Non fales</string>
     <string name="reposition_card_not_new_error">Only new cards can be repositioned</string>
-    <string name="reset_card_dialog_title">Reiniciar o progreso do cartón</string>
+    <string name="reset_card_dialog_title">Reiniciar o progreso da tarxeta</string>
     <plurals name="reset_cards_dialog_acknowledge">
-        <item quantity="one">%d card reset</item>
-        <item quantity="other">%d cards reset</item>
+        <item quantity="one">%d tarxeta reiniciada</item>
+        <item quantity="other">%d tarxetas reiniciadas</item>
     </plurals>
     <string name="answering_error_title">Erro na base de datos</string>
     <string name="answering_error_message">Writing to the collection failed. The database could be corrupt or there may not to be enough empty space on disk.\n\nIf this happens more often, try checking the database, repairing the collection or restoring it from a backup. Touch “options” for that.\n\Or it could be an AnkiDroid bug as well; please report the error so that we can check this.</string>
@@ -73,23 +73,23 @@
     <string name="custom_study_forgotten">Revisar os cartóns esquecidos nos últimos x días:</string>
     <string name="custom_study_ahead">Revisar con x días de adianto:</string>
     <string name="custom_study_preview">Vista previa dos novos cartóns engadidos nos últimos x días:</string>
-    <string name="custom_study_tags">Select x cards from the deck:</string>
-    <string name="storage_full_title">Storage full</string>
-    <string name="storage_almost_full_title">Storage almost full</string>
-    <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">No space</string>
+    <string name="custom_study_tags">Seleccionar x tarxetas da baralla:</string>
+    <string name="storage_full_title">Almacenamento cheo</string>
+    <string name="storage_almost_full_title">Almacenamento case cheo</string>
+    <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">Sen espazo</string>
     <string name="no_space_to_downgrade_content" tools:ignore="UnusedResources">AnkiDroid needs %s free storage space to continue. Please clear some space</string>
     <string name="restore_backup_title">Restaurar copia?</string>
     <string name="restore_backup">A túa colección será substituída cunha copia antiga. Perderase calquera progreso non gardado.</string>
-    <string name="restore_backup_choose_another">Choose another</string>
+    <string name="restore_backup_choose_another">Escoller outro</string>
     <string name="dialog_cancel">Cancelar</string>
     <string name="dialog_ok">Aceptar</string>
-    <string name="dialog_confirm" tools:ignore="UnusedResources">Confirm</string>
-    <string name="dialog_no">No</string>
+    <string name="dialog_confirm" tools:ignore="UnusedResources">Confirmar</string>
+    <string name="dialog_no">Non</string>
     <string name="dialog_yes">Si</string>
-    <string name="dialog_keep">Keep</string>
-    <string name="dialog_remove">Remove</string>
+    <string name="dialog_keep">Manter</string>
+    <string name="dialog_remove">Retirar</string>
     <string name="dialog_continue">Continuar</string>
-    <string name="dialog_processing">Processing&#8230;</string>
+    <string name="dialog_processing">Procesando&#8230;</string>
     <string name="dialog_positive_create" comment="Create a new collection, probably erasing the previous one, may be necessary in case of error.">Crear</string>
     <string name="dialog_positive_delete" maxLength="28">Eliminar</string>
     <!-- Currently unsued, should be useful in the future -->
@@ -97,17 +97,17 @@
     <string name="dialog_positive_overwrite">Substituír</string>
     <string name="dialog_positive_repair">Reparar</string>
     <string name="dialog_positive_replace">Substituír</string>
-    <string name="dialog_collection_path_not_dir">A ruta especificada non era un cartafol válido</string>
+    <string name="dialog_collection_path_not_dir">A ruta especificada non é un cartafol válido</string>
     <string name="dialog_invalid_custom_certificate">The provided text does not resolve to a valid PEM-encoded X509 certificate</string>
-    <string name="dialog_invalid_custom_certificate_title">Error parsing certificate</string>
-    <string name="dialog_updated_custom_certificate">Certificate updated</string>
+    <string name="dialog_invalid_custom_certificate_title">Erro na análise do certificado</string>
+    <string name="dialog_updated_custom_certificate">Certificado actualizado</string>
     <!-- Media checking -->
     <string name="check_media_title">Verificar multimedia?</string>
     <string name="check_media_warning">Isto pode levar moito tempo con coleccións grandes de medios</string>
     <string name="check_media_message">Verificando multimedia&#8230;</string>
-    <string name="check_media_adding_missing_tag">Adding tags&#8230;</string>
-    <string name="check_media_tags_added">Tags added</string>
-    <string name="delete_media_message">Deleting media&#8230;</string>
+    <string name="check_media_adding_missing_tag">Engadindo etiquetas&#8230;</string>
+    <string name="check_media_tags_added">Etiquetas engadidas</string>
+    <string name="delete_media_message">Eliminando multimedia&#8230;</string>
     <string name="delete_media_result_title">Deletion result</string>
     <plurals name="delete_media_result_message">
         <item quantity="one">%d file deleted</item>
@@ -118,7 +118,7 @@
     <string name="tags_dialog_option_new_cards">Novo</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Pendentes</string>
     <!-- Empty cards -->
-    <string name="emtpy_cards_finding">Buscando cartóns baleiros&#8230;</string>
+    <string name="emtpy_cards_finding">Buscando tarxetas baleiras&#8230;</string>
     <!-- Multimedia - Edit Field Activity -->
     <string name="multimedia_editor_audio_permission_refused">Could not obtain microphone permission.</string>
     <string name="multimedia_editor_failed">Failed to open Multimedia Editor</string>
@@ -156,29 +156,29 @@
     <string name="boot_service_failed_to_schedule_notifications">Failed to schedule reminders</string>
     <string name="boot_service_too_many_notifications">Too many reminders scheduled. Some will not appear</string>
     <!-- Locale Selection Dialog -->
-    <string name="locale_selection_dialog_title_new">Set Language</string>
+    <string name="locale_selection_dialog_title_new">Establecer Idioma</string>
     <string name="locale_selection_dialog_summary">Some multilingual keyboards, such as GBoard support changing language when editing text\n\nPlease request the “setImeHintLocales” feature from your keyboard manufacturer if your keyboard does not change language.</string>
     <!-- Help Dialog -->
-    <string name="help_title_using_ankidroid">Using AnkiDroid</string>
-    <string name="help_item_ankidroid_manual">AnkiDroid Manual</string>
-    <string name="help_item_anki_manual">Anki Manual</string>
+    <string name="help_title_using_ankidroid">Empregar o AnkiDroid</string>
+    <string name="help_item_ankidroid_manual">Manual do AnkiDroid</string>
+    <string name="help_item_anki_manual">Manual do Anki</string>
     <string name="help_item_ankidroid_faq">AnkiDroid FAQ</string>
     <string name="help_title_get_help">Get Help</string>
     <string name="help_item_mailing_list">Mailing List</string>
     <string name="help_item_reddit">Reddit</string>
     <string name="help_item_report_bug">Report a Bug</string>
-    <string name="help_title_support_ankidroid" maxLength="28">Support AnkiDroid</string>
-    <string name="help_item_support_opencollective_donate">Donate</string>
-    <string name="help_item_support_develop_ankidroid">Develop</string>
-    <string name="help_item_support_rate_ankidroid">Rate</string>
-    <string name="help_item_support_other_ankidroid">Other</string>
-    <string name="multimedia_editor_trans_translate">Translate</string>
-    <string name="help_title_community">Community</string>
-    <string name="help_item_anki_forums">Anki Forums</string>
+    <string name="help_title_support_ankidroid" maxLength="28">Apoiar o AnkiDroid</string>
+    <string name="help_item_support_opencollective_donate">Doar</string>
+    <string name="help_item_support_develop_ankidroid">Desenvolver</string>
+    <string name="help_item_support_rate_ankidroid">Avaliar</string>
+    <string name="help_item_support_other_ankidroid">Outros</string>
+    <string name="multimedia_editor_trans_translate">Traducir</string>
+    <string name="help_title_community">Comunidade</string>
+    <string name="help_item_anki_forums">Foro do Anki</string>
     <string name="help_item_discord">Discord</string>
     <string name="help_item_facebook">Facebook</string>
     <string name="help_item_twitter">Twitter</string>
-    <string name="help_title_privacy">Privacy</string>
+    <string name="help_title_privacy">Privacidade</string>
     <string name="help_item_ankidroid_privacy_policy">AnkiDroid Privacy Policy</string>
     <string name="help_item_ankiweb_privacy_policy">AnkiWeb Privacy Policy</string>
     <string name="help_item_ankiweb_terms_and_conditions">AnkiWeb Terms and Conditions</string>
@@ -198,15 +198,15 @@
     sched V2. For V1, it was counting the number of repetitions of cards in learning. This approximation is acceptable
     for the sake of simplicity and because V1 will leave.-->
     <string name="deck_picker_counts">Open the deck overview page containing the number of cards to see today.</string>
-    <string name="import_deck_package">Deck package (.apkg)</string>
-    <string name="import_collection_package">Collection package (.colpkg)</string>
-    <string name="import_csv">Text file (.txt, .csv)</string>
+    <string name="import_deck_package">Baralla (.apkg)</string>
+    <string name="import_collection_package">Colección (.colpkg)</string>
+    <string name="import_csv">Ficheiro de texto (.txt, .csv)</string>
     <!-- Deck selection dialog -->
-    <string name="cannot_create_subdeck_for_all_decks">You cannot create a subdeck for all decks</string>
+    <string name="cannot_create_subdeck_for_all_decks">Non podes crear unha subbaralla para todas as barallas</string>
     <!-- scoped storage -->
-    <string name="backup_your_collection">Backup your collection</string>
+    <string name="backup_your_collection">Copia de seguranza da colección</string>
     <string name="backup_collection_message">You haven\'t backed up your collection in a while. You should do this now to prevent data loss</string>
-    <string name="button_backup" maxLength="41">Backup</string>
+    <string name="button_backup" maxLength="41">Copia de seguranza</string>
     <string name="button_disable_reminder">Disable reminder</string>
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
@@ -236,18 +236,18 @@
     <!-- Instant Note Editor -->
     <string name="cloze_note_required">Cloze Type Note Required</string>
     <string name="cloze_not_found_message">No Cloze type note found, open the Note Editor or try again after adding a Cloze type note.</string>
-    <string name="open">Open</string>
+    <string name="open">Abrir</string>
     <string name="change_cloze_number">Change cloze number</string>
     <string name="cloze_number">Cloze number:</string>
     <string name="change_editor_mode">Change editor mode</string>
-    <string name="open_note_editor">Open note editor</string>
-    <string name="change_cloze_mode">Change cloze mode</string>
+    <string name="open_note_editor">Abrir editor de notas</string>
+    <string name="change_cloze_mode">Cambiar modo oclusión</string>
     <!-- Outdated WebView dialog -->
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
-    <string name="compress">Compress</string>
+    <string name="compress">Comprimir</string>
     <!-- Tts playback error dialog -->
-    <string name="tts_error_dialog_title">Language not supported</string>
+    <string name="tts_error_dialog_title">Lingua non compatíbel</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Change engine</string>
-    <string name="tts_error_dialog_supported_voices_button_text">Voice options</string>
+    <string name="tts_error_dialog_supported_voices_button_text">Opcións de voz</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-gl/04-network.xml b/AnkiDroid/src/main/res/values-gl/04-network.xml
index e618482f7ae4..faeb68dfa433 100644
--- a/AnkiDroid/src/main/res/values-gl/04-network.xml
+++ b/AnkiDroid/src/main/res/values-gl/04-network.xml
@@ -63,23 +63,23 @@
     <string name="logged_as">Conectado como</string>
     <string name="log_out">Saír</string>
     <string name="reset_password">Restablecer contrasinal</string>
-    <string name="lost_mail_instructions">Forgot Email?</string>
-    <string name="sign_in">Signing in</string>
+    <string name="lost_mail_instructions">Esqueciches o e-mail?</string>
+    <string name="sign_in">Accedendo</string>
     <!-- AndroidManifest.xml -->
     <string name="deckpreferences_title">Opcións para XXX</string>
     <string name="sync_title">Sincronización</string>
     <string name="sync_log_uploading_message">Sincronización completa dos datos locais</string>
     <string name="sync_database_acknowledge">Colección sincronizada</string>
-    <string name="col_synced_media_in_background">Collection synced. Media is being synced in the background.</string>
+    <string name="col_synced_media_in_background">Colección sincronizada. Os ficheiros multimedia estanse sincronizando en segundo plano.</string>
     <string name="sync_corrupt_database">Base de datos corrompida. Por favor corríxea antes de tentar sincronizar de novo.\n\nVer %s para máis información sobre como reparar a base de datos.</string>
     <!-- Please run ‘Check database’ before syncing -->
     <string name="sync_sanity_local">Local</string>
     <string name="sync_sanity_remote">Remoto</string>
-    <string name="one_way_sync_title" maxLength="41">One-way sync</string>
-    <string name="one_way_sync_confirmation">One way sync requested</string>
+    <string name="one_way_sync_title" maxLength="41">Sincronización unidireccional</string>
+    <string name="one_way_sync_confirmation">Sincronización unidireccional solicitada</string>
     <string name="full_sync_confirmation">O troco solicitado require subir a base de datos a próxima vez que sincronices a túa colección. Se tes revisións ou outros trocos agardando noutro dispositivo que aínda non foron sincronizados aquí, estes perderanse. Continuar?</string>
-    <string name="full_sync_confirmation_upgrade">Debido a un erro na versión anterior do AnkiDroid e recomendable realizar unha sincronización completa.</string>
+    <string name="full_sync_confirmation_upgrade">Debido a un fallo na versión anterior do AnkiDroid e recomendábel realizar unha sincronización completa.</string>
     <!-- Deck Picker Sync Icon -->
-    <string name="sync_menu_title_one_way_sync">Sync (one-way)</string>
-    <string name="sync_menu_title_no_account">Sync (log in)</string>
+    <string name="sync_menu_title_one_way_sync">Sincronización (unidireccional)</string>
+    <string name="sync_menu_title_no_account">Sincronización (acceder)</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-gl/05-feedback.xml b/AnkiDroid/src/main/res/values-gl/05-feedback.xml
index 413a12696c53..bf742603a2ce 100644
--- a/AnkiDroid/src/main/res/values-gl/05-feedback.xml
+++ b/AnkiDroid/src/main/res/values-gl/05-feedback.xml
@@ -48,12 +48,12 @@
     <string name="empty_string"></string>
     <string name="error_reporting_choice" maxLength="41">Modo de informe de erros</string>
     <string name="feedback_disclaimer">Aviso: Non recollemos información persoal como o enderezo de correo electrónico, teléfono, ou o IMEI do teléfono. Recollemos algunha información sobre o teu dispositivo como o fabricante, modelo e versión do Android, alén doutras informacións relacionadas coa natureza dos erros e dos pasos que levaron a eles.</string>
-    <string name="feedback_title">AnkiDroid Feedback</string>
-    <string name="feedback_default_text">Por favor, introduza os seus comentarios ou información sobre a natureza de calquera erro que esteas reportando.</string>
-    <string name="feedback_auto_toast_text">AnkiDroid atopou un problema; estase a enviar un informe aos programadores&#8230;</string>
-    <string name="feedback_for_manual_toast_text">An error report is being prepared for the developers&#8230;</string>
+    <string name="feedback_title">Suxerencias para o AnkDroid</string>
+    <string name="feedback_default_text">Por favor, introduce os teus comentarios ou información sobre o erro que esteas reportando.</string>
+    <string name="feedback_auto_toast_text">AnkiDroid atopou un problema; estase a enviar un informe aos desenvolvedores&#8230;</string>
+    <string name="feedback_for_manual_toast_text">Estase a enviar un informe da incidencia aos desenvolvedores&#8230;</string>
     <string name="feedback_copy_debug">Copiar a información de depuración</string>
     <string name="feedback_report">Informar</string>
-    <string name="feedback_report_automatically">Enviar informes de error automaticamente</string>
-    <string name="feedback_no_suitable_app_found">No suitable app found</string>
+    <string name="feedback_report_automatically">Enviar informes de erro automaticamente</string>
+    <string name="feedback_no_suitable_app_found">Non se encontrou unha aplicación axeitada</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-gl/06-statistics.xml b/AnkiDroid/src/main/res/values-gl/06-statistics.xml
index a50118f626c8..12161803473d 100644
--- a/AnkiDroid/src/main/res/values-gl/06-statistics.xml
+++ b/AnkiDroid/src/main/res/values-gl/06-statistics.xml
@@ -44,5 +44,5 @@
 ~ this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <resources>
-    <string name="open_statistics" comment="Description of the shortcut that opens the statistics page">Open statistics</string>
+    <string name="open_statistics" comment="Description of the shortcut that opens the statistics page">Abrir estatísticas</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-gl/10-preferences.xml b/AnkiDroid/src/main/res/values-gl/10-preferences.xml
index bbf95035899e..81dca7276317 100644
--- a/AnkiDroid/src/main/res/values-gl/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-gl/10-preferences.xml
@@ -58,7 +58,7 @@
     <string name="pref_cat_studying" maxLength="41">Studying</string>
     <string name="pref_cat_system_wide" maxLength="41">System-wide</string>
     <string name="pref_cat_reviewing" maxLength="41">Avaliación</string>
-    <string name="pref_cat_sync" comment="title of the sync preferences category" maxLength="41">Sync</string>
+    <string name="pref_cat_sync" comment="title of the sync preferences category" maxLength="41">Sincronización</string>
     <string name="pref_cat_scheduling" maxLength="41">Scheduling</string>
     <string name="pref_cat_whiteboard" maxLength="41">Encerado</string>
     <string name="pref_cat_appearance" maxLength="41">Appearance</string>
@@ -132,9 +132,9 @@
     <string name="automatic_sync_choice" maxLength="41">Sincronización automática</string>
     <string name="automatic_sync_choice_summ">Sincronizar autom. ao iniciar/saír da aplicación se pasaron máis de 10
         minutos dende a última sincronización.</string>
-    <string name="sync_media_always" comment="Option to always fetch media when syncing">Always</string>
+    <string name="sync_media_always" comment="Option to always fetch media when syncing">Sempre</string>
     <string name="sync_media_only_unmetered">Only on unmetered connections</string>
-    <string name="sync_media_never">Never</string>
+    <string name="sync_media_never">Nunca</string>
     <string name="sync_status_badge" maxLength="41">Display synchronization status</string>
     <string name="sync_status_badge_summ">Change the sync icon when changes can be uploaded</string>
     <string name="metered_sync_title" maxLength="41">Allow sync on metered connections</string>
@@ -221,7 +221,7 @@
         If not set, the default AnkiWeb server will be used instead.
         <a href="%s">Learn more</a>
         ]]></string>
-    <string name="custom_sync_server_base_url_title" maxLength="41">Sync url</string>
+    <string name="custom_sync_server_base_url_title" maxLength="41">URL de sincronización</string>
     <string name="custom_sync_certificate_title" maxLength="41">Custom root certificate (PEM)</string>
     <!-- Key Bindings -->
     <string name="keyboard">Keyboard</string>
diff --git a/AnkiDroid/src/main/res/values-gl/20-search-preference.xml b/AnkiDroid/src/main/res/values-gl/20-search-preference.xml
index 209a8cfe4f8a..eacc38a288f1 100644
--- a/AnkiDroid/src/main/res/values-gl/20-search-preference.xml
+++ b/AnkiDroid/src/main/res/values-gl/20-search-preference.xml
@@ -60,6 +60,6 @@
     the key names MUST NOT be changed due to this
 -->
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <string tools:ignore="UnusedResources" name="searchpreference_search" comment="By submitting this string, you license it under the MIT License">Search&#8230;</string>
-    <string tools:ignore="UnusedResources" name="searchpreference_clear_history" comment="By submitting this string, you license it under the MIT License">Clear history</string>
+    <string tools:ignore="UnusedResources" name="searchpreference_search" comment="By submitting this string, you license it under the MIT License">Buscar&#8230;</string>
+    <string tools:ignore="UnusedResources" name="searchpreference_clear_history" comment="By submitting this string, you license it under the MIT License">Limpar historial</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml b/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml
index c91a6eb845ca..97f099d6053b 100644
--- a/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml
+++ b/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml
@@ -103,7 +103,7 @@
     <string name="field_remapping">%1$s（来自「%2$s」）</string>
     <string name="confirm_map_cards_to_nothing">任何无法映射的卡片都会被删除。如果该笔记没有生成其他卡片，该笔记将会丢失。你确定要继续吗？</string>
     <string name="missing_note_type">找不到笔记类型</string>
-    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (empty)</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (空)</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">已到达指定时间</string>
     <plurals name="timebox_reached">
@@ -319,8 +319,8 @@
         <item quantity="other">取消遮盖了 %d 张卡片</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">更改位置</string>
-    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
-    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">下一个</string>
+    <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">返回</string>
     <string name="start_recording">录制</string>
     <string name="stop_recording">停止</string>
     <string name="play_recording">播放</string>
diff --git a/AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml b/AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml
index 6cb0a5fe3a69..624c7fdcf399 100644
--- a/AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml
+++ b/AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml
@@ -196,9 +196,9 @@
     <string name="reset">重置</string>
     <string name="thirdparty_apps_title" maxLength="41">第三方 API 应用</string>
     <string name="thirdparty_apps_summary">查看使用 AnkiDroid API 的应用程序清单，如字典、实用工具。</string>
-    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Reviews</string>
-    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
-    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">复习</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">预览</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">仅切换背面</string>
     <!-- Appearance settings -->
     <string name="pref_cat_reviewer" maxLength="41">复习界面</string>
     <string name="show_deck_title" maxLength="41">显示牌组标题</string>